ojamoto_models 1.0.15 → 1.0.17

package/migrations/2026000056-add-source-to-platform-income.js

@@ -0,0 +1,29 @@
+("use strict");
+
+const { PLATFORM_INCOME_SOURCE } = require("../services/constants");
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.addColumn("platform_incomes", "source", {
+      type: Sequelize.STRING(20),
+      allowNull: true,
+      after: "currency",
+      comment:
+        "Where this income came from: ESCROW_FEE | SUBSCRIPTION | WITHDRAWAL_FEE",
+    });
+
+    await queryInterface.sequelize.query(
+      `UPDATE platform_incomes SET source = :source WHERE source IS NULL`,
+      { replacements: { source: PLATFORM_INCOME_SOURCE.ESCROW_FEE } },
+    );
+
+    await queryInterface.changeColumn("platform_incomes", "source", {
+      type: Sequelize.STRING(20),
+      allowNull: false,
+    });
+  },
+
+  async down(queryInterface) {
+    await queryInterface.removeColumn("platform_incomes", "source");
+  },
+};

package/migrations/2026000057-update-escrowId-to-accept-null-platform-income.js

@@ -0,0 +1,17 @@
+"use strict";
+
+module.exports = {
+  async up(queryInterface) {
+    await queryInterface.sequelize.query(`
+      ALTER TABLE platform_incomes
+      MODIFY COLUMN escrow_id INT NULL;
+    `);
+  },
+
+  async down(queryInterface) {
+    await queryInterface.sequelize.query(`
+      ALTER TABLE platform_incomes
+      MODIFY COLUMN escrow_id INT NOT NULL;
+    `);
+  },
+};

package/migrations/2026000058-add-google-auth-to-user.js

@@ -0,0 +1,34 @@
+("use strict");
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.addColumn("users", "google_id", {
+      type: Sequelize.STRING(255),
+      allowNull: true,
+      unique: true,
+      after: "totp_secret",
+    });
+
+    await queryInterface.addColumn("users", "auth_provider", {
+      type: Sequelize.ENUM("LOCAL", "GOOGLE"),
+      allowNull: false,
+      defaultValue: "LOCAL",
+      after: "google_id",
+    });
+
+    await queryInterface.changeColumn("users", "password_hash", {
+      type: Sequelize.STRING(255),
+      allowNull: true, // Google-only accounts never set one
+      after: "auth_provider",
+    });
+  },
+
+  async down(queryInterface) {
+    await queryInterface.removeColumn("users", "google_id");
+    await queryInterface.removeColumn("users", "auth_provider");
+    await queryInterface.changeColumn("users", "password_hash", {
+      type: Sequelize.STRING(255),
+      allowNull: false,
+    });
+  },
+};

package/models/PlatformIncome.js

@@ -1,6 +1,7 @@
 "use strict";
 
 const { Model, DataTypes } = require("sequelize");
+const { PLATFORM_INCOME_SOURCE } = require("../services/constants");
 
 module.exports = (sequelize) => {
   class PlatformIncome extends Model {
@@ -32,8 +33,8 @@ module.exports = (sequelize) => {
       },
       escrow_id: {
         type: DataTypes.INTEGER,
-        allowNull: false,
-        unique: true, // one fee record per escrow — prevents double-crediting the same escrow
+        allowNull: true,
+        unique: true, // enforces uniqueness only among non-null values — multiple NULLs (non-escrow income) are allowed
         references: { model: "escrows", key: "escrow_id" },
         onDelete: "RESTRICT",
       },
@@ -48,6 +49,13 @@ module.exports = (sequelize) => {
         allowNull: false,
         defaultValue: "NGN",
       },
+      source: {
+        type: DataTypes.STRING(20),
+        allowNull: false,
+        validate: { isIn: [Object.values(PLATFORM_INCOME_SOURCE)] },
+        comment:
+          "Where this income came from: ESCROW_FEE | SUBSCRIPTION | WITHDRAWAL_FEE",
+      },
     },
     {
       sequelize,

package/models/User.js

@@ -166,7 +166,7 @@ module.exports = (sequelize) => {
       },
       password_hash: {
         type: DataTypes.STRING(255),
-        allowNull: false,
+        allowNull: true, // Google-only accounts never set one
       },
       transaction_pin_hash: {
         type: DataTypes.STRING(255),
@@ -230,6 +230,16 @@ module.exports = (sequelize) => {
         type: DataTypes.STRING,
         allowNull: true,
       },
+      google_id: {
+        type: DataTypes.STRING(255),
+        allowNull: true,
+        unique: true,
+      },
+      auth_provider: {
+        type: DataTypes.ENUM("LOCAL", "GOOGLE"),
+        allowNull: false,
+        defaultValue: "LOCAL",
+      },
     },
     {
       sequelize,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ojamoto_models",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "main": "index.js",
   "scripts": {
     "migrate:up": "npx sequelize-cli db:migrate",

package/services/constants.js

@@ -270,6 +270,14 @@ module.exports = {
     SMS: "SMS",
   },
 
+  WITHDRAWAL_FEE_FOR_BUYERS: 50,
+
+  PLATFORM_INCOME_SOURCE: {
+    ESCROW_FEE: "ESCROW_FEE",
+    SUBSCRIPTION: "SUBSCRIPTION",
+    WITHDRAWAL_FEE: "WITHDRAWAL_FEE",
+  },
+
   ////////////////////////////////////////////////////
 
   // - Generic status IDs (legacy support) ──────────────────────────────────