@churchsoln/dbms 1.0.30 → 1.0.32

package/constants/index.js

@@ -67,6 +67,11 @@ const RELATIONSHIP = {
     OTHER: "Other",
 };
 
+const CODE_LENGTH = {
+    OTP: 4,
+    ENV_NUMBER: 5,
+};
+
 module.exports = {
     ROLES,
     TRANSFER_STATUS,
@@ -78,4 +83,5 @@ module.exports = {
     MEMBER_STATUS,
     GENDER,
     RELATIONSHIP,
+    CODE_LENGTH
 };

package/migrations/church/20221227151615-create-user.js

@@ -7,6 +7,7 @@ module.exports = {
             // Link to the individual profile
             memberId: {
                 type: DataTypes.INTEGER,
+                unique: true,
                 references: {
                     model: "Member",
                     key: "id",

package/models/church/member.js

@@ -121,6 +121,7 @@ module.exports = (sequelize, DataTypes) => {
         { freezeTableName: true, timestamps: false }
     );
     member.associate = function (models) {
+        member.hasOne(models.user, { foreignKey: "memberId", as: "user" });
         member.belongsTo(models.membership, { foreignKey: "membershipId", as: "membership" });
         member.belongsTo(models.province, { foreignKey: "provinceId", as: "province" });
         member.belongsTo(models.city, { foreignKey: "cityId", as: "city" });

package/models/church/membership.js

@@ -52,6 +52,7 @@ module.exports = (sequelize, DataTypes) => {
         { freezeTableName: true, timestamps: false }
     );
     membership.associate = function (models) {
+        membership.hasMany(models.member, { foreignKey: "membershipId", as: "member" });
         membership.belongsTo(models.province, { foreignKey: "provinceId", as: "province" });
         membership.belongsTo(models.city, { foreignKey: "cityId", as: "city" });
     }

package/models/church/user.js

@@ -58,7 +58,6 @@ module.exports = (sequelize, DataTypes) => {
         "id",
         "memberId",
         "username",
-        "password",
         "email",
         "roleId",
         "subRoleId",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@churchsoln/dbms",
-    "version": "1.0.30",
+    "version": "1.0.32",
     "main": "index.js",
     "scripts": {
         "prestart": "node db-setup.js",

package/services/church.js

@@ -4,10 +4,11 @@ const errorCodes = require("../config/errorCodes");
 const errorMsgs = require("../config/errorMsgs");
 const { masterQueue, masterQueueEvents } = require("../queues");
 const churchManager = require("../utils/churchManager");
-const { QUEUES, ROLES, AUTH_DATA, SUBSCRIPTION_PLAN_ID } = require("../constants");
+const { QUEUES, ROLES, AUTH_DATA, SUBSCRIPTION_PLAN_ID, CODE_LENGTH } = require("../constants");
 const bcrypt = require("bcrypt");
 const cryptr = require("../utils/crypto");
 const jwt = require("jsonwebtoken");
+const utils = require("../utils");
 
 class ChurchService {
     async onboardChurch(params) {
@@ -89,7 +90,10 @@ class ChurchService {
             masterQueueEvents.on("completed", async (event) => {
                 if (event.jobId === jobData.id) {
                     const churchDb = await churchManager.getChurchDbConnectionById(churchData.id);
-                    const member = await churchDb.member.create({ ...churchAdminDetails })
+                    const member = await churchDb.member.create({ 
+                        ...churchAdminDetails,
+                        envNumber: utils.generateCode(CODE_LENGTH.ENV_NUMBER) 
+                    })
                     await churchDb.user.create({
                         ...churchAdminDetails,
                         status: true,