@churchsoln/dbms 1.0.27 → 1.0.30

package/migrations/common/20240815170620-create-church.js

@@ -11,20 +11,12 @@ module.exports = {
                     id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
                     name: { type: DataTypes.STRING },
                     connectionUrl: { type: DataTypes.STRING },
-                    address: { type: DataTypes.STRING },
-                    cityId: { type: DataTypes.INTEGER },
-                    provinceId: { type: DataTypes.INTEGER },
-                    country: { type: DataTypes.STRING },
-                    postalCode: { type: DataTypes.STRING },
                     email: { type: DataTypes.STRING },
                     phoneNumber: { type: DataTypes.STRING },
                     contactPerson: { type: DataTypes.STRING },
-                    currency: { type: DataTypes.STRING },
-                    charitable_reg_no: { type: DataTypes.STRING },
-                    registration_agency: { type: DataTypes.STRING },
-                    profile_image: { type: DataTypes.STRING },
                     registeredAt: { type: DataTypes.DATEONLY },
                     subscribedAt: { type: DataTypes.DATEONLY },
+                    expiresAt: { type: DataTypes.DATEONLY },
                     subscriptionPlanId: { type: DataTypes.INTEGER },
                     dbCreationStatus: {
                         type: DataTypes.STRING,
@@ -56,26 +48,6 @@ module.exports = {
                     onDelete: "cascade",
                     onUpdate: "cascade",
                 })
-            )
-            .then(() =>
-                queryInterface.addConstraint("Church", {
-                    fields: ["cityId"],
-                    type: "foreign key",
-                    name: "church_cityId_fk",
-                    references: { table: "City", field: "id" },
-                    onDelete: "cascade",
-                    onUpdate: "cascade",
-                })
-            )
-            .then(() =>
-                queryInterface.addConstraint("Church", {
-                    fields: ["provinceId"],
-                    type: "foreign key",
-                    name: "church_provinceId_fk",
-                    references: { table: "Province", field: "id" },
-                    onDelete: "cascade",
-                    onUpdate: "cascade",
-                })
             );
     },
     down: async (queryInterface) => {

package/models/church/church.js

@@ -7,8 +7,18 @@ module.exports = (sequelize, DataTypes) => {
             id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
             name: { type: DataTypes.STRING },
             address: { type: DataTypes.STRING },
-            cityId: { type: DataTypes.INTEGER },
-            provinceId: { type: DataTypes.INTEGER },
+            cityId: { 
+                type: DataTypes.INTEGER, 
+                set(cityId) {
+                    this.setDataValue("cityId", cityId?.id || cityId);
+                }
+            },
+            provinceId: { 
+                type: DataTypes.INTEGER, 
+                set(provinceId) {
+                    this.setDataValue("provinceId", provinceId?.id || provinceId);
+                }
+            },
             country: { type: DataTypes.STRING },
             postalCode: { type: DataTypes.STRING },
             email: { type: DataTypes.STRING },
@@ -25,6 +35,10 @@ module.exports = (sequelize, DataTypes) => {
         },
         { freezeTableName: true, timestamps: false }
     );
+    church.associate = function (models) {
+        church.belongsTo(models.province, { foreignKey: "provinceId", as: "province" });
+        church.belongsTo(models.city, { foreignKey: "cityId", as: "city" });
+    }
     church.selectedFields = [
         "id",
         "name",

package/models/{common → church}/city.js

@@ -4,6 +4,7 @@ module.exports = (sequelize, DataTypes) => {
         {
             id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
             provinceId: { type: DataTypes.INTEGER },
+            provinceCode: { type: DataTypes.STRING },
             name: { type: DataTypes.STRING },
             status: { type: DataTypes.BOOLEAN },
             createdAt: { type: DataTypes.DATE },
@@ -17,6 +18,6 @@ module.exports = (sequelize, DataTypes) => {
             as: "province",
         });
     };
-    city.selectedFields = ["id", "name"];
+    city.selectedFields = ["id", "name", "provinceCode"];
     return city;
 };

package/models/church/member.js

@@ -0,0 +1,171 @@
+const { MEMBER_STATUS, GENDER, RELATIONSHIP } = require("../../constants");
+
+module.exports = (sequelize, DataTypes) => {
+    const member = sequelize.define(
+        "Member",
+        {
+            id: {
+                type: DataTypes.INTEGER,
+                primaryKey: true,
+                autoIncrement: true,
+            },
+
+            // Foreign Key to memberships
+            membershipId: {
+                type: DataTypes.INTEGER,
+                set(membershipId) {
+                    this.setDataValue("membershipId", membershipId?.id || membershipId);
+                },
+            },
+
+            // Basic Identity
+            title: { type: DataTypes.STRING },
+            firstName: { type: DataTypes.STRING, allowNull: false },
+            middleName: { type: DataTypes.STRING },
+            lastName: { type: DataTypes.STRING, allowNull: false },
+            maidenName: { type: DataTypes.STRING },
+            suffix: { type: DataTypes.STRING },
+            salutation: { type: DataTypes.STRING },
+            preferredName: { type: DataTypes.STRING },
+            profileImage: { type: DataTypes.STRING },
+
+            // Contact Info
+            address: { type: DataTypes.TEXT },
+            cityId: { 
+                type: DataTypes.INTEGER,
+                set(cityId) {
+                    this.setDataValue("cityId", cityId?.id || cityId);
+                },
+            },
+            provinceId: { 
+                type: DataTypes.INTEGER,
+                set(provinceId) {
+                    this.setDataValue("provinceId", provinceId?.id || provinceId);
+                },
+            },
+            zipCode: { type: DataTypes.STRING },
+            homePhone: { type: DataTypes.STRING },
+            cellPhone: { type: DataTypes.STRING },
+            workPhone: { type: DataTypes.STRING },
+            email: { type: DataTypes.STRING, validate: { isEmail: true } },
+
+            // Other Personal Info
+            occupation: { type: DataTypes.STRING },
+            employer: { type: DataTypes.STRING },
+            schoolGrade: { type: DataTypes.STRING },
+            emergencyContact: { type: DataTypes.STRING },
+            emergencyPhone: { type: DataTypes.STRING },
+            geographicArea: { type: DataTypes.STRING },
+
+            // Membership Status
+            memberStatus: {
+                type: DataTypes.STRING,
+                defaultValue: MEMBER_STATUS.ACTIVE,
+                validate: {
+                    isIn: [
+                        [
+                            MEMBER_STATUS.ACTIVE,
+                            MEMBER_STATUS.INACTIVE,
+                            MEMBER_STATUS.DECEASED,
+                            MEMBER_STATUS.PROSPECT,
+                            MEMBER_STATUS.REGULAR_ATTENDEE,
+                            MEMBER_STATUS.SINGLE_MEMBER,
+                            MEMBER_STATUS.VISITOR,
+                        ],
+                    ],
+                },
+            },
+
+            envNumber: { type: DataTypes.STRING },
+            gender: {
+                type: DataTypes.STRING,
+                validate: {
+                    isIn: [Object.values(GENDER)],
+                },
+            },
+            relationship: { 
+                type: DataTypes.STRING,
+                validate: {
+                    isIn: [Object.values(RELATIONSHIP)],
+                },
+            },
+
+            // Dates
+            birthDate: { type: DataTypes.DATE },
+            weddingDate: { type: DataTypes.DATE },
+            baptizedDate: { type: DataTypes.DATE },
+            confessionDate: { type: DataTypes.DATE },
+
+            // Additional
+            notes: { type: DataTypes.TEXT },
+            otp: { type: DataTypes.INTEGER },
+
+            // Flags
+            enabledProfile: {
+                type: DataTypes.BOOLEAN,
+                defaultValue: true,
+            },
+            includeInDirectory: {
+                type: DataTypes.BOOLEAN,
+                defaultValue: true,
+            },
+            emailStatement: {
+                type: DataTypes.BOOLEAN,
+                defaultValue: false,
+            },
+
+            // Metadata
+            createdAt: { type: DataTypes.DATE },
+            updatedAt: { type: DataTypes.DATE },
+        },
+        { freezeTableName: true, timestamps: false }
+    );
+    member.associate = function (models) {
+        member.belongsTo(models.membership, { foreignKey: "membershipId", as: "membership" });
+        member.belongsTo(models.province, { foreignKey: "provinceId", as: "province" });
+        member.belongsTo(models.city, { foreignKey: "cityId", as: "city" });
+    }
+    member.selectedFields = [
+        "id",
+        "membershipId",
+        "title",
+        "firstName",
+        "middleName",
+        "lastName",
+        "maidenName",
+        "suffix",
+        "salutation",
+        "preferredName",
+        "profileImage",
+        "address",
+        "cityId",
+        "provinceId",
+        "zipCode",
+        "homePhone",
+        "cellPhone",
+        "workPhone",
+        "email",
+        "occupation",
+        "employer",
+        "schoolGrade",
+        "emergencyContact",
+        "emergencyPhone",
+        "geographicArea",
+        "memberStatus",
+        "envNumber",
+        "gender",
+        "relationship",
+        "birthDate",
+        "weddingDate",
+        "baptizedDate",
+        "confessionDate",
+        "notes",
+        "otp",
+        "enabledProfile",
+        "includeInDirectory",
+        "emailStatement",
+        "createdAt",
+        "updatedAt",
+    ];
+    return member;
+}

package/models/church/membership.js

@@ -0,0 +1,81 @@
+const { MEMBER_STATUS } = require("../../constants");
+
+module.exports = (sequelize, DataTypes) => {
+    const membership = sequelize.define(
+        "Membership",
+        {
+            id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+
+            // Family Profile Fields
+            directoryName: { type: DataTypes.STRING },
+            salutation: { type: DataTypes.STRING },
+            mailingName: { type: DataTypes.STRING },
+            address: { type: DataTypes.TEXT },
+            cityId: { 
+                type: DataTypes.INTEGER, 
+                set(cityId) {
+                    this.setDataValue("cityId", cityId?.id || cityId);
+                }
+            },
+            provinceId: { 
+                type: DataTypes.INTEGER, 
+                set(provinceId) {
+                    this.setDataValue("provinceId", provinceId?.id || provinceId);
+                }
+            },
+            zipCode: { type: DataTypes.STRING },
+            memberStatus: {
+                type: DataTypes.STRING,
+                defaultValue: MEMBER_STATUS.ACTIVE,
+                validate: {
+                    isIn: [[MEMBER_STATUS.ACTIVE, MEMBER_STATUS.INACTIVE, MEMBER_STATUS.VISITOR]],
+                },
+            },
+            phone: { type: DataTypes.STRING },
+            email: {
+                type: DataTypes.STRING,
+                validate: { isEmail: true },
+            },
+            geographicArea: { type: DataTypes.STRING },
+            notes: { type: DataTypes.TEXT },
+
+            // Mailing List & Settings Flags
+            enabledProfile: { type: DataTypes.BOOLEAN, defaultValue: true },
+            includeInDirectory: { type: DataTypes.BOOLEAN, defaultValue: true },
+            isOrganization: { type: DataTypes.BOOLEAN, defaultValue: false },
+            emailStatement: { type: DataTypes.BOOLEAN, defaultValue: false },
+
+            // Metadata
+            createdAt: { type: DataTypes.DATE },
+            updatedAt: { type: DataTypes.DATE },
+        },
+        { freezeTableName: true, timestamps: false }
+    );
+    membership.associate = function (models) {
+        membership.belongsTo(models.province, { foreignKey: "provinceId", as: "province" });
+        membership.belongsTo(models.city, { foreignKey: "cityId", as: "city" });
+    }
+    membership.selectedFields = [
+        "id",
+        "directoryName",
+        "salutation",
+        "mailingName",
+        "address",
+        "cityId",
+        "provinceId",
+        "zipCode",
+        "memberStatus",
+        "phone",
+        "email",
+        "geographicArea",
+        "notes",
+        "enabledProfile",
+        "includeInDirectory",
+        "isOrganization",
+        "emailStatement",
+        "createdAt",
+        "updatedAt",
+    ];
+    return membership;
+}
+    

package/models/{common → church}/province.js

@@ -3,6 +3,8 @@ module.exports = (sequelize, DataTypes) => {
         "Province",
         {
             id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+            country: { type: DataTypes.STRING },
+            code: { type: DataTypes.STRING },
             name: { type: DataTypes.STRING },
             status: { type: DataTypes.BOOLEAN },
             createdAt: { type: DataTypes.DATE },
@@ -16,6 +18,6 @@ module.exports = (sequelize, DataTypes) => {
             as: "city",
         });
     };
-    province.selectedFields = ["id", "name"];
+    province.selectedFields = ["id", "name", "code", "country"];
     return province;
 };