ojamoto_models 1.0.6 → 1.0.8

package/config/config.js

@@ -17,36 +17,36 @@ module.exports = {
     },
     define: {
       underscored: true,
-      Charset: "utf8mb4",
-      Collate: "utf8mb4_general_ci",
+      charset: "utf8mb4",
+      collate: "utf8mb4_general_ci",
     },
   },
 
-  // production: {
-  //   username: process.env.AWS_DB_USERNAME,
-  //   password: process.env.AWS_DB_PASSWORD,
-  //   database: process.env.AWS_DB_NAME,
-  //   host: process.env.AWS_DB_HOST,
-  //   dialect: "mysql",
-  //   dialectOptions: {
-  //     ssl: {
-  //       require: true,
-  //       rejectUnauthorized: false,
-  //       ca: fs.readFileSync(
-  //         path.join(__dirname, "../certificates/global-bundle.pem"),
-  //       ),
-  //     },
-  //   },
-  //   pool: {
-  //     max: 5,
-  //     min: 0,
-  //     acquire: 30000,
-  //     idle: 10000,
-  //   },
-  //   define: {
-  //     underscored: true,
-  //     Charset: "utf8mb4",
-  //     Collate: "utf8mb4_general_ci",
-  //   },
-  // },
+  production: {
+    username: process.env.AWS_DB_USERNAME,
+    password: process.env.AWS_DB_PASSWORD,
+    database: process.env.AWS_DB_NAME,
+    host: process.env.AWS_DB_HOST,
+    dialect: "mysql",
+    dialectOptions: {
+      ssl: {
+        require: true,
+        rejectUnauthorized: false,
+        ca: fs.readFileSync(
+          path.join(__dirname, "../certificates/global-bundle.pem"),
+        ),
+      },
+    },
+    pool: {
+      max: 5,
+      min: 0,
+      acquire: 30000,
+      idle: 10000,
+    },
+    define: {
+      underscored: true,
+      charset: "utf8mb4",
+      collate: "utf8mb4_general_ci",
+    },
+  },
 };

package/migrations/2026000041-update-status-on-escrow.js

@@ -0,0 +1,30 @@
+"use strict";
+
+const { ESCROW_STATUS } = require("../services/constants");
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.changeColumn("escrows", "status", {
+      type: Sequelize.ENUM(...Object.values(ESCROW_STATUS)),
+      allowNull: false,
+      defaultValue: ESCROW_STATUS.PENDING,
+    });
+  },
+
+  async down(queryInterface, Sequelize) {
+    await queryInterface.changeColumn("escrows", "status", {
+      type: Sequelize.ENUM(
+        "PENDING",
+        "FUNDED",
+        "ACCEPTED",
+        "IN_PROGRESS",
+        "DELIVERED",
+        "COMPLETED",
+        "DISPUTED",
+        "CANCELLED",
+      ),
+      allowNull: false,
+      defaultValue: "PENDING",
+    });
+  },
+};

package/migrations/2026000042-create-platform-wallet.js

@@ -0,0 +1,46 @@
+"use strict";
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.createTable("platform_wallets", {
+      platform_wallet_id: {
+        type: Sequelize.INTEGER,
+        primaryKey: true,
+        autoIncrement: true,
+        allowNull: false,
+      },
+      available_balance: {
+        type: Sequelize.DECIMAL(15, 2),
+        allowNull: false,
+        defaultValue: 0.0,
+      },
+      currency: {
+        type: Sequelize.STRING(3),
+        allowNull: false,
+        defaultValue: "NGN",
+      },
+      created_at: {
+        type: Sequelize.DATE,
+        allowNull: false,
+      },
+      updated_at: {
+        type: Sequelize.DATE,
+        allowNull: false,
+      },
+    });
+
+    // Seed the single platform wallet row
+    await queryInterface.bulkInsert("platform_wallets", [
+      {
+        available_balance: 0.0,
+        currency: "NGN",
+        created_at: new Date(),
+        updated_at: new Date(),
+      },
+    ]);
+  },
+
+  async down(queryInterface) {
+    await queryInterface.dropTable("platform_wallets");
+  },
+};

package/migrations/2026000043-create-platform-income.js

@@ -0,0 +1,48 @@
+"use strict";
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.createTable("platform_incomes", {
+      platform_income_id: {
+        type: Sequelize.INTEGER,
+        primaryKey: true,
+        autoIncrement: true,
+        allowNull: false,
+      },
+      platform_wallet_id: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        references: { model: "platform_wallets", key: "platform_wallet_id" },
+        onDelete: "RESTRICT",
+        onUpdate: "CASCADE",
+      },
+      escrow_id: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        unique: true,
+        references: { model: "escrows", key: "escrow_id" },
+        onDelete: "RESTRICT",
+        onUpdate: "CASCADE",
+      },
+      amount: {
+        type: Sequelize.DECIMAL(15, 2),
+        allowNull: false,
+      },
+      currency: {
+        type: Sequelize.STRING(3),
+        allowNull: false,
+        defaultValue: "NGN",
+      },
+      created_at: {
+        type: Sequelize.DATE,
+        allowNull: false,
+      },
+    });
+
+    await queryInterface.addIndex("platform_incomes", ["platform_wallet_id"]);
+  },
+
+  async down(queryInterface) {
+    await queryInterface.dropTable("platform_incomes");
+  },
+};

package/migrations/2026000044-add-field-to-admin-users.js

@@ -0,0 +1,29 @@
+"use strict";
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    const tableDescription = await queryInterface.describeTable("admin_users");
+
+    if (!tableDescription.country_calling_code) {
+      await queryInterface.addColumn("admin_users", "country_calling_code", {
+        type: Sequelize.STRING,
+        allowNull: true,
+        after: "phone",
+      });
+    }
+
+    await queryInterface.changeColumn("admin_users", "phone", {
+      type: Sequelize.STRING(10),
+      allowNull: false,
+    });
+  },
+
+  down: async (queryInterface) => {
+    await queryInterface.changeColumn("admin_users", "phone", {
+      type: Sequelize.STRING(20),
+      allowNull: false,
+    });
+
+    await queryInterface.removeColumn("admin_users", "country_calling_code");
+  },
+};

package/models/AdminUser.js

@@ -71,10 +71,14 @@ module.exports = (sequelize) => {
         validate: { isEmail: true },
       },
       phone: {
-        type: DataTypes.STRING(20),
+        type: DataTypes.STRING(10),
         allowNull: false,
         unique: true,
       },
+      country_calling_code: {
+        type: DataTypes.STRING(3),
+        allowNull: false,
+      },
       password_hash: {
         type: DataTypes.STRING(255),
         allowNull: false,

package/models/PlatformIncome.js

@@ -0,0 +1,64 @@
+"use strict";
+
+const { Model, DataTypes } = require("sequelize");
+
+module.exports = (sequelize) => {
+  class PlatformIncome extends Model {
+    static associate(models) {
+      PlatformIncome.belongsTo(models.Escrow, {
+        foreignKey: "escrow_id",
+        as: "escrow",
+      });
+
+      PlatformIncome.belongsTo(models.PlatformWallet, {
+        foreignKey: "platform_wallet_id",
+        as: "platformWallet",
+      });
+    }
+  }
+
+  PlatformIncome.init(
+    {
+      platform_income_id: {
+        type: DataTypes.INTEGER,
+        primaryKey: true,
+        autoIncrement: true,
+      },
+      platform_wallet_id: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+        references: { model: "platform_wallets", key: "platform_wallet_id" },
+        onDelete: "RESTRICT",
+      },
+      escrow_id: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+        unique: true, // one fee record per escrow — prevents double-crediting the same escrow
+        references: { model: "escrows", key: "escrow_id" },
+        onDelete: "RESTRICT",
+      },
+      amount: {
+        type: DataTypes.DECIMAL(15, 2),
+        allowNull: false,
+        comment:
+          "The platform_fee earned from this specific escrow — immutable record",
+      },
+      currency: {
+        type: DataTypes.STRING(3),
+        allowNull: false,
+        defaultValue: "NGN",
+      },
+    },
+    {
+      sequelize,
+      modelName: "PlatformIncome",
+      tableName: "platform_incomes",
+      timestamps: true,
+      createdAt: "created_at",
+      updatedAt: false,
+    },
+  );
+
+  PlatformIncome.removeAttribute("id");
+  return PlatformIncome;
+};

package/models/PlatformWallet.js

@@ -0,0 +1,45 @@
+"use strict";
+
+const { Model, DataTypes } = require("sequelize");
+
+module.exports = (sequelize) => {
+  class PlatformWallet extends Model {
+    static associate(models) {
+      PlatformWallet.hasMany(models.PlatformIncome, {
+        foreignKey: "platform_wallet_id",
+        as: "incomeRecords",
+      });
+    }
+  }
+
+  PlatformWallet.init(
+    {
+      platform_wallet_id: {
+        type: DataTypes.INTEGER,
+        primaryKey: true,
+        autoIncrement: true,
+      },
+      available_balance: {
+        type: DataTypes.DECIMAL(15, 2),
+        allowNull: false,
+        defaultValue: 0.0,
+      },
+      currency: {
+        type: DataTypes.STRING(3),
+        allowNull: false,
+        defaultValue: "NGN",
+      },
+    },
+    {
+      sequelize,
+      modelName: "PlatformWallet",
+      tableName: "platform_wallets",
+      timestamps: true,
+      createdAt: "created_at",
+      updatedAt: "updated_at",
+    },
+  );
+
+  PlatformWallet.removeAttribute("id");
+  return PlatformWallet;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ojamoto_models",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "main": "index.js",
   "scripts": {
     "migrate:up": "npx sequelize-cli db:migrate",
@@ -22,6 +22,8 @@
   "homepage": "https://github.com/ojamoto/ojamoto_models#readme",
   "description": "",
   "dependencies": {
+    "bcrypt": "^6.0.0",
+    "crypto": "^1.0.1",
     "dotenv": "^17.4.2",
     "mysql2": "^3.23.2",
     "sequelize": "^6.37.8",

package/seeders/2026000001-seed-super-admin.js

@@ -0,0 +1,61 @@
+"use strict";
+
+const bcrypt = require("bcrypt");
+const crypto = require("crypto");
+const { ADMIN_ROLE, ADMIN_STATUS } = require("../services/constants");
+
+module.exports = {
+  async up(queryInterface) {
+    const email = process.env.SUPER_ADMIN_EMAIL;
+    const tempPassword = process.env.SUPER_ADMIN_TEMP_PASSWORD;
+
+    if (!email || !tempPassword) {
+      throw new Error(
+        "SUPER_ADMIN_EMAIL and SUPER_ADMIN_TEMP_PASSWORD must be set in your environment before running this seeder",
+      );
+    }
+
+    const existing = await queryInterface.sequelize.query(
+      `SELECT admin_id FROM admin_users WHERE email = :email LIMIT 1`,
+      {
+        replacements: { email },
+        type: queryInterface.sequelize.QueryTypes.SELECT,
+      },
+    );
+
+    if (existing.length > 0) {
+      console.log("Super admin already exists — skipping seed");
+      return;
+    }
+
+    const password_hash = await bcrypt.hash(tempPassword, 12);
+
+    await queryInterface.bulkInsert("admin_users", [
+      {
+        uuid: crypto.randomUUID(),
+        first_name: process.env.SUPER_ADMIN_FIRST_NAME || "Super",
+        last_name: process.env.SUPER_ADMIN_LAST_NAME || "Admin",
+        email,
+        phone: process.env.SUPER_ADMIN_PHONE || "8085202397",
+        country_calling_code:
+          process.env.SUPER_ADMIN_COUNTRY_CALLING_CODE || "234",
+        password_hash,
+        must_change_password: true,
+        role: ADMIN_ROLE.SUPER_ADMIN,
+        status: ADMIN_STATUS.ACTIVE,
+        two_factor_enabled: true,
+        totp_secret: null,
+        created_by: null,
+        created_at: new Date(),
+        updated_at: new Date(),
+      },
+    ]);
+  },
+
+  async down(queryInterface) {
+    const email = process.env.SUPER_ADMIN_EMAIL;
+    if (!email) return;
+
+    await queryInterface.bulkDelete("admin_users", { email });
+  },
+};

package/services/constants.js

@@ -118,6 +118,7 @@ module.exports = {
     COMPLETED: "COMPLETED",
     DISPUTED: "DISPUTED",
     CANCELLED: "CANCELLED",
+    REJECTED: "REJECTED",
   },
 
   // - disputes.reason ──────────────────────────────────────────────────────