@churchsoln/dbms 1.0.3 → 1.0.5

package/Dockerfile

@@ -9,6 +9,7 @@ RUN apk update && \
 
 # Set registry and timeout 
 RUN npm config set registry https://registry.npmmirror.com 
+RUN npm rebuild bcrypt --build-from-source
 RUN npm install --legacy-peer-deps --force --timeout=60000 
 RUN npm cache clean --force
 
@@ -17,5 +18,5 @@ RUN npm cache clean --force
 RUN apk del make gcc g++ python3 && \
     rm -rf /var/cache/apk/* && \
     npm cache clean --force
-EXPOSE 5000
+EXPOSE 5007
 CMD [ "npm", "run", "start" ]

package/config/errorMsgs.js

@@ -1,6 +1,7 @@
 module.exports = {
     success: "Success",
     churchCreated: "Church created successfully",
+    churchUpdated: "Church updated successfully",
     churchAlreadyExists: "Church already exists",
     migrationInitiated: "Migration initiated successfully",
     seedInitiated: "Seed initiated successfully",

package/controllers/church.js

@@ -1,6 +1,7 @@
 const { churchService } = require("../services");
 const errorCodes = require("../config/errorCodes");
 const response = require("../utils/response");
+const errorMsgs = require("../config/errorMsgs");
 class ChurchController {
     async onboardChurch(req, res) {
         try {
@@ -31,13 +32,28 @@ class ChurchController {
 
     async updateChurchById(req, res) {
         try {
-            const result = await churchService.updateChurchByIdService({ ...req.params, ...req.query });
+            const result = await churchService.updateChurchByIdService({ ...req.params, ...req.body });
             response.success(req, res, result.code, result.data, result.message);
         } catch (err) {
             response.error(req, res, errorCodes.HTTP_INTERNAL_SERVER_ERROR, err);
         }
     }
-
+    async uploadFile(req, res) {
+        try {
+            const file = req.files[0];
+            let file_folder = "documents";
+            if (file?.mimetype?.includes("image")) file_folder = "images";
+            else if (file?.mimetype?.includes("video")) file_folder = "videos";
+            else file_folder = "documents";
+            const responseData = {
+                url: `${process.env.BASE_URL}/dbms/api/uploads/${file_folder}/${file?.filename}`,
+                original_name: file?.originalname,
+            };
+            response.success(req, res, errorCodes.HTTP_OK, responseData, errorMsgs.success);
+        } catch (err) {
+            response.error(req, res, errorCodes.HTTP_INTERNAL_SERVER_ERROR, err);
+        }
+    }
     async addChurchPermission(req, res) {
         try {
             const result = await churchService.addChurchPermissionService({

package/deployment/nginx/nginx.local.conf

@@ -11,11 +11,11 @@ http {
     keepalive_timeout  65;
 
     upstream frontend {
-        server host.docker.internal:5200;
+        server host.docker.internal:5010;
     }
 
     upstream backend {
-        server host.docker.internal:6000;
+        server host.docker.internal:5009;
     }
 
     # Redirect HTTP to HTTPS

package/migrations/church/20240918170621-create-church.js

@@ -0,0 +1,39 @@
+"use strict";
+
+module.exports = {
+    up: async (queryInterface, DataTypes) => {
+        await queryInterface
+            .createTable(
+                "Church",
+                {
+                    id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+                    name: { 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 },
+                    status: { type: DataTypes.BOOLEAN, defaultValue: true },
+                    createdAt: {
+                        type: DataTypes.DATE,
+                        defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+                    },
+                    updatedAt: {
+                        type: DataTypes.DATE,
+                        defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+                    },
+                },
+                { timestamps: false }
+            );
+    },
+    down: async (queryInterface) => {
+        await queryInterface.dropTable("Church");
+    },
+};

package/migrations/church/20240918170622-create-group.js

@@ -0,0 +1,61 @@
+"use strict";
+
+module.exports = {
+    up: async (queryInterface, DataTypes) => {
+        await queryInterface
+            .createTable(
+                "Group",
+                {
+                    id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+                    name: { type: DataTypes.STRING },
+                    description: { type: DataTypes.TEXT },
+                    isInclude: { type: DataTypes.BOOLEAN, defaultValue: false },
+                    isPrivate: { type: DataTypes.BOOLEAN, defaultValue: false },
+                    maxMembers: { type: DataTypes.INTEGER, defaultValue: 50 },
+                    profileUrl: { type: DataTypes.STRING },
+                    status: { type: DataTypes.BOOLEAN, defaultValue: true },
+                    createdAt: {
+                        type: DataTypes.DATE,
+                        defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+                    },
+                    updatedAt: {
+                        type: DataTypes.DATE,
+                        defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+                    },
+                    createdBy: { type: DataTypes.INTEGER },
+                    updatedBy: { type: DataTypes.INTEGER },
+                    deletedAt: { type: DataTypes.DATE },
+                    deletedBy: { type: DataTypes.INTEGER },
+                },
+                { timestamps: false }
+            )
+            .then(() =>
+                queryInterface.addConstraint("Group", {
+                    fields: ["createdBy"],
+                    type: "foreign key",
+                    name: "Group_CreatedBy_Fkey",
+                    references: {
+                        table: "User",
+                        field: "id",
+                    },
+                    onDelete: "cascade",
+                    onUpdate: "cascade",
+                })
+            ).then(() =>
+                queryInterface.addConstraint("Group", {
+                    fields: ["updatedBy"],
+                    type: "foreign key",
+                    name: "Group_UpdatedBy_Fkey",
+                    references: {
+                        table: "User",
+                        field: "id",
+                    },
+                    onDelete: "cascade",
+                    onUpdate: "cascade",
+                })
+            );
+    },
+    down: async (queryInterface) => {
+        await queryInterface.dropTable("Group");
+    },
+};

package/migrations/church/20240918170623-create-groupMembers.js

@@ -0,0 +1,75 @@
+"use strict";
+
+module.exports = {
+    up: async (queryInterface, DataTypes) => {
+        await queryInterface
+            .createTable(
+                "GroupMembers",
+                {
+                    id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+                    userId: { type: DataTypes.INTEGER },
+                    groupId: { type: DataTypes.INTEGER },
+                    isAdmin: { type: DataTypes.BOOLEAN, defaultValue: false },
+                    status: { type: DataTypes.BOOLEAN, defaultValue: true },
+                    createdAt: {
+                        type: DataTypes.DATE,
+                        defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+                    },
+                    updatedAt: {
+                        type: DataTypes.DATE,
+                        defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+                    },
+                    createdBy: { type: DataTypes.INTEGER },
+                    updatedBy: { type: DataTypes.INTEGER },
+                }
+            ).then(() =>
+                queryInterface.addConstraint("GroupMembers", {
+                    fields: ["userId"],
+                    type: "foreign key",
+                    name: "GroupMembers_UserId_Fkey",
+                    references: {
+                        table: "User",
+                        field: "id",
+                    },
+                    onDelete: "cascade",
+                    onUpdate: "cascade",
+                })
+            ).then(() =>
+                queryInterface.addConstraint("GroupMembers", {
+                    fields: ["groupId"],
+                    type: "foreign key",
+                    name: "GroupMembers_GroupId_Fkey",
+                    references: {
+                        table: "Group",
+                        field: "id",
+                    },
+                    onDelete: "cascade",
+                    onUpdate: "cascade",
+                })
+            ).then(() =>
+                queryInterface.addConstraint("GroupMembers", {
+                    fields: ["createdBy"],
+                    type: "foreign key",
+                    name: "GroupMembers_CreatedBy_Fkey",
+                    references: {
+                        table: "User",
+                        field: "id",
+                    },
+                    onDelete: "cascade",
+                    onUpdate: "cascade",
+                })
+            ).then(() =>
+                queryInterface.addConstraint("GroupMembers", {
+                    fields: ["updatedBy"],
+                    type: "foreign key",
+                    name: "GroupMembers_UpdatedBy_Fkey",
+                    references: {
+                        table: "User",
+                        field: "id",
+                    },
+                    onDelete: "cascade",
+                    onUpdate: "cascade",
+                })
+            )
+    }
+}

package/migrations/common/20240918170624-update-church.js

@@ -0,0 +1,23 @@
+"use strict";
+
+module.exports = {
+    up: async (queryInterface, DataTypes) => {
+        return Promise.all([
+            queryInterface.removeColumn("Church", "profile_image"),
+            queryInterface.removeColumn("Church", "registration_agency"),
+            queryInterface.removeColumn("Church", "charitable_reg_no"),
+            queryInterface.removeColumn("Church", "currency"),
+            queryInterface.removeColumn("Church", "postalCode"),
+            queryInterface.removeColumn("Church", "country"),
+            queryInterface.removeConstraint("Church", "church_provinceId_fk").then(() =>
+                queryInterface.removeColumn("Church", "provinceId")
+            ),
+            queryInterface.removeConstraint("Church", "church_cityId_fk").then(() =>
+                queryInterface.removeColumn("Church", "cityId")
+            ),
+            queryInterface.removeColumn("Church", "address"),
+        ]);
+    },
+
+    down: async (queryInterface) => {},
+};

package/models/church/church.js

@@ -0,0 +1,47 @@
+const { ONBOARD_STATUS } = require("../../constants");
+
+module.exports = (sequelize, DataTypes) => {
+    const church = sequelize.define(
+        "Church",
+        {
+            id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+            name: { 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 },
+            status: { type: DataTypes.BOOLEAN },
+            createdAt: { type: DataTypes.DATE },
+            updatedAt: { type: DataTypes.DATE },
+        },
+        { freezeTableName: true, timestamps: false }
+    );
+    church.selectedFields = [
+        "id",
+        "name",
+        "address",
+        "cityId",
+        "provinceId",
+        "country",
+        "postalCode",
+        "email",
+        "phoneNumber",
+        "contactPerson",
+        "currency",
+        "charitable_reg_no",
+        "registration_agency",
+        "profile_image",
+        "status",
+        "createdAt",
+        "updatedAt",
+    ];
+    return church;
+};

package/models/church/group.js

@@ -0,0 +1,74 @@
+module.exports = (sequelize, DataTypes) => {
+    const group = sequelize.define(
+        "Group",
+        {
+            id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+            name: { type: DataTypes.STRING },
+            description: { type: DataTypes.TEXT },
+            isInclude: { type: DataTypes.BOOLEAN, defaultValue: false },
+            isPrivate: { type: DataTypes.BOOLEAN, defaultValue: false },
+            maxMembers: { type: DataTypes.INTEGER, defaultValue: 50 },
+            profileUrl: { type: DataTypes.STRING },
+            status: { type: DataTypes.BOOLEAN, defaultValue: true },
+            createdAt: {
+                type: DataTypes.DATE,
+                defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+            },
+            updatedAt: {
+                type: DataTypes.DATE,
+                defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+            },
+            createdBy: { 
+                type: DataTypes.INTEGER,
+                set(createdBy) {
+                    this.setDataValue("createdBy", createdBy?.id || createdBy);
+                }, 
+            },
+            updatedBy: { 
+                type: DataTypes.INTEGER,
+                set(updatedBy) {
+                    this.setDataValue("updatedBy", updatedBy?.id || updatedBy);
+                },  
+            },
+            deletedAt: { type: DataTypes.DATE },
+            deletedBy: { 
+                type: DataTypes.INTEGER,
+                set(deletedBy) {
+                    this.setDataValue("deletedBy", deletedBy?.id || deletedBy);
+                }, 
+            },
+        },
+        { freezeTableName: true, timestamps: false }
+    );
+    group.associate = function (models) {
+        group.belongsTo(models.user, {
+            foreignKey: "createdBy",
+            as: "createdBy",
+        });
+        group.belongsTo(models.user, {
+            foreignKey: "updatedBy",
+            as: "updatedBy",
+        });
+        group.belongsTo(models.user, {
+            foreignKey: "deletedBy",
+            as: "deletedBy",
+        });
+    };
+    group.selectedFields = [
+        "id",
+        "name",
+        "description",
+        "isInclude",
+        "isPrivate",
+        "maxMembers",
+        "profileUrl",
+        "status",
+        "createdAt",
+        "updatedAt",
+        "createdBy",
+        "updatedBy",
+        "deletedAt",
+        "deletedBy",
+    ];
+    return group;
+};

package/models/church/groupMembers.js

@@ -0,0 +1,72 @@
+module.exports = (sequelize, DataTypes) => {
+    const groupMembers = sequelize.define(
+        "GroupMembers",
+        {
+            id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+            userId: {
+                type: DataTypes.INTEGER,
+                set(userId) {
+                    this.setDataValue("userId", userId?.id || userId);
+                },
+            },
+            groupId: {
+                type: DataTypes.INTEGER,
+                set(groupId) {
+                    this.setDataValue("groupId", groupId?.id || groupId);
+                },
+            },
+            isAdmin: { type: DataTypes.BOOLEAN, defaultValue: false },
+            status: { type: DataTypes.BOOLEAN, defaultValue: true },
+            createdAt: {
+                type: DataTypes.DATE,
+                defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+            },
+            updatedAt: {
+                type: DataTypes.DATE,
+                defaultValue: DataTypes.literal("CURRENT_TIMESTAMP"),
+            },
+            createdBy: {
+                type: DataTypes.INTEGER,
+                set(createdBy) {
+                    this.setDataValue("createdBy", createdBy?.id || createdBy);
+                },
+            },
+            updatedBy: {
+                type: DataTypes.INTEGER,
+                set(updatedBy) {
+                    this.setDataValue("updatedBy", updatedBy?.id || updatedBy);
+                },
+            },
+        },
+        { freezeTableName: true, timestamps: false }
+    );
+    groupMembers.associate = function (models) {
+        groupMembers.belongsTo(models.user, {
+            foreignKey: "userId",
+            as: "user",
+        });
+        groupMembers.belongsTo(models.group, {
+            foreignKey: "groupId",
+            as: "group",
+        });
+        groupMembers.belongsTo(models.user, {
+            foreignKey: "createdBy",
+            as: "createdBy",
+        });
+        groupMembers.belongsTo(models.user, {
+            foreignKey: "updatedBy",
+            as: "updatedBy",
+        });
+    };
+    groupMembers.selectedFields = [
+        "id",
+        "userId",
+        "groupId",
+        "isAdmin",
+        "status",
+        "createdAt",
+        "updatedAt",
+        "createdBy",
+        "updatedBy",
+    ];
+}

package/models/common/church.js

@@ -7,18 +7,9 @@ module.exports = (sequelize, DataTypes) => {
             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 },
             subscriptionPlanId: { type: DataTypes.INTEGER },
@@ -43,25 +34,14 @@ module.exports = (sequelize, DataTypes) => {
             foreignKey: "subscriptionPlanId",
             as: "subscriptionPlan",
         });
-        church.belongsTo(models.city, { foreignKey: "cityId", as: "city" });
-        church.belongsTo(models.province, { foreignKey: "provinceId", as: "province" });
     };
     church.selectedFields = [
         "id",
         "name",
         "connectionUrl",
-        "address",
-        "cityId",
-        "provinceId",
-        "country",
-        "postalCode",
         "email",
         "phoneNumber",
         "contactPerson",
-        "currency",
-        "charitable_reg_no",
-        "registration_agency",
-        "profile_image",
         "registeredAt",
         "subscribedAt",
         "subscriptionPlanId",

package/models/common/churchPermission.js

@@ -21,6 +21,6 @@ module.exports = (sequelize, DataTypes) => {
             as: "church",
         });
     };
-    churchPermission.selectedFields = ["id", "churchId", "permissionId"];
+    churchPermission.selectedFields = ["id", "churchId", "permissionId", "createdAt"];
     return churchPermission;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@churchsoln/dbms",
-    "version": "1.0.3",
+    "version": "1.0.5",
     "main": "index.js",
     "scripts": {
         "prestart": "node db-setup.js",
@@ -25,6 +25,7 @@
         "joi": "^17.1.1",
         "jsonwebtoken": "^9.0.2",
         "morgan": "^1.10.0",
+        "multer": "^1.4.4",
         "mysql2": "^3.12.0",
         "nodemon": "^3.1.4",
         "pg": "^8.8.0",

package/public/swagger/church.json

@@ -7,7 +7,7 @@
     },
     "servers": [
         {
-            "url": "http://localhost:5000/dbms/api/v1",
+            "url": "http://localhost:5007/dbms/api/v1",
             "description": "Local"
         },
         {
@@ -47,20 +47,9 @@
                             },
                             "example": {
                                 "name": "Xavier",
-                                "address": "Address",
-                                "cityId": 1,
-                                "provinceId": 1,
-                                "country": "Country",
-                                "postalCode": "123",
                                 "email": "email",
                                 "phoneNumber": "1234",
                                 "contactPerson": "string",
-                                "currency": "dollar",
-                                "charitable_reg_no": "123",
-                                "registration_agency": "agency",
-                                "profileImage": "http://image.com",
-                                "registeredAt": "2023-08-01",
-                                "subscribedAt": "2023-08-01",
                                 "subscriptionPlanId": 1,
                                 "churchAdminDetails": {
                                     "firstName": "Jose",
@@ -136,8 +125,8 @@
             },
             "patch": {
                 "tags": ["Church API's"],
-                "summary": "Activate/Deactivate Church by id",
-                "operationId": "Activate/Deactivate Church by id",
+                "summary": "Update Church by id",
+                "operationId": "Update Church by id",
                 "parameters": [
                     {
                         "name": "id",
@@ -150,19 +139,50 @@
                             "format": "int32",
                             "example": 1
                         }
-                    },
-                    {
-                        "name": "status",
-                        "in": "query",
-                        "required": true,
-                        "style": "form",
-                        "explode": true,
-                        "schema": {
-                            "type": "boolean",
-                            "example": true
-                        }
                     }
                 ],
+                "requestBody": {
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/UpdateChurchDataRequest"
+                            },
+                            "example": {
+                                "name": "Xavier",
+                                "email": "email",
+                                "phoneNumber": "1234",
+                                "contactPerson": "string",
+                                "subscriptionPlanId": 1,
+                                "status": true
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "OK"
+                    }
+                },
+                "deprecated": false
+            }
+        },
+        "/church/upload-file": {
+            "post": {
+                "tags": ["Church API's"],
+                "summary": "Upload file",
+                "operationId": "Upload file",
+                "parameters": [],
+                "requestBody": {
+                    "content": {
+                        "multipart/form-data": {
+                            "schema": {
+                                "$ref": "#/components/schemas/UploadFileDataRequest"
+                            },
+                            "encoding": {}
+                        }
+                    },
+                    "required": false
+                },
                 "responses": {
                     "200": {
                         "description": "OK"
@@ -197,7 +217,7 @@
                                 "$ref": "#/components/schemas/AddChurchPermissionDataRequest"
                             },
                             "example": {
-                                "permissionId": 1
+                                "permissionId": [1]
                             }
                         }
                     },
@@ -312,20 +332,9 @@
                 "title": "OnboardNewDataRequest",
                 "required": [
                     "name",
-                    "address",
-                    "cityId",
-                    "provinceId",
-                    "country",
-                    "postalCode",
                     "email",
                     "phoneNumber",
                     "contactPerson",
-                    "currency",
-                    "charitable_reg_no",
-                    "registration_agency",
-                    "profile_image",
-                    "registeredAt",
-                    "subscribedAt",
                     "subscriptionPlanId",
                     "churchAdminDetails"
                 ],
@@ -334,23 +343,6 @@
                     "name": {
                         "type": "string"
                     },
-                    "address": {
-                        "type": "string"
-                    },
-                    "cityId": {
-                        "type": "integer",
-                        "format": "int32"
-                    },
-                    "provinceId": {
-                        "type": "integer",
-                        "format": "int32"
-                    },
-                    "country": {
-                        "type": "string"
-                    },
-                    "postalCode": {
-                        "type": "string"
-                    },
                     "email": {
                         "type": "string"
                     },
@@ -360,24 +352,6 @@
                     "contactPerson": {
                         "type": "string"
                     },
-                    "currency": {
-                        "type": "string"
-                    },
-                    "charitable_reg_no": {
-                        "type": "string"
-                    },
-                    "registration_agency": {
-                        "type": "string"
-                    },
-                    "profile_image": {
-                        "type": "string"
-                    },
-                    "registeredAt": {
-                        "type": "string"
-                    },
-                    "subscribedAt": {
-                        "type": "string"
-                    },
                     "subscriptionPlanId": {
                         "type": "integer",
                         "format": "int32"
@@ -389,20 +363,9 @@
                 },
                 "example": {
                     "name": "Xavier",
-                    "address": "Address",
-                    "cityId": 1,
-                    "provinceId": 1,
-                    "country": "Country",
-                    "postalCode": "123",
                     "email": "email",
                     "phoneNumber": "1234",
                     "contactPerson": "string",
-                    "currenncy": "dollar",
-                    "charitable_reg_no": "123",
-                    "registration_agency": "agency",
-                    "profileImage": "http://image.com",
-                    "registeredAt": "2023-08-01",
-                    "subscribedAt": "2023-08-01",
                     "subscriptionPlanId": 1,
                     "churchAdminDetails": {
                         "firstName": "Jose",
@@ -413,6 +376,40 @@
                     }
                 }
             },
+            "UpdateChurchDataRequest": {
+                "title": "UpdateChurchDataRequest",
+                "required": [],
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "email": {
+                        "type": "string"
+                    },
+                    "phoneNumber": {
+                        "type": "string"
+                    },
+                    "contactPerson": {
+                        "type": "string"
+                    },
+                    "subscriptionPlanId": {
+                        "type": "integer",
+                        "format": "int32"
+                    },
+                    "status": {
+                        "type": "boolean"
+                    }
+                },
+                "example": {
+                    "name": "Xavier",
+                    "email": "email",
+                    "phoneNumber": "1234",
+                    "contactPerson": "string",
+                    "subscriptionPlanId": 1,
+                    "status": true
+                }
+            },
             "ChurchAdminDataRequest": {
                 "title": "ChurchAdminDataRequest",
                 "required": ["firstName", "lastName", "email", "phone", "password"],
@@ -465,8 +462,21 @@
                 "type": "object",
                 "properties": {
                     "permissionId": {
-                        "type": "integer",
-                        "format": "int32"
+                        "type": "array",
+                        "items": {
+                            "type": "number"
+                        }
+                    }
+                }
+            },
+            "UploadFileDataRequest": {
+                "title": "UploadFileDataRequest",
+                "required": ["file"],
+                "type": "object",
+                "properties": {
+                    "file": {
+                        "type": "string",
+                        "format": "binary"
                     }
                 }
             }

package/public/swagger/master.json

@@ -7,7 +7,7 @@
     },
     "servers": [
         {
-            "url": "http://localhost:5000/dbms/api/v1",
+            "url": "http://localhost:5007/dbms/api/v1",
             "description": "Local"
         },
         {

package/public/swagger/migration.json

@@ -7,7 +7,7 @@
     },
     "servers": [
         {
-            "url": "http://localhost:5000/dbms/api/v1",
+            "url": "http://localhost:5007/dbms/api/v1",
             "description": "Local"
         },
         {

package/public/swagger/seed.json

@@ -7,7 +7,7 @@
     },
     "servers": [
         {
-            "url": "http://localhost:5000/dbms/api/v1",
+            "url": "http://localhost:5007/dbms/api/v1",
             "description": "Local"
         },
         {

package/redis/config.js

@@ -1,4 +1,5 @@
+require('dotenv').config()
 module.exports = {
-    host: "redis1",
-    port: 6379,
+    host: process.env.REDIS_HOST,
+    port: process.env.REDIS_PORT,
 };

package/routes/v1/church.js

@@ -3,6 +3,7 @@ const router = express.Router();
 const { ChurchController } = require("../../controllers");
 const validators = require("../../validators");
 const verifyToken = require("../../utils/verifyToken");
+const docUpload = require("../../utils/docUpload");
 
 // Church API's
 router.post("", verifyToken, validators.onboardChurch, ChurchController.onboardChurch);
@@ -19,7 +20,7 @@ router.patch(
     validators.updateChurch,
     ChurchController.updateChurchById
 );
-
+router.post("/upload-file", verifyToken, docUpload, ChurchController.uploadFile);
 // Church Permissions
 router.post(
     "/:churchId/permission",

package/seeders/common/20241005153047-permission.js

@@ -16,6 +16,7 @@ module.exports = {
             { name: "Accounts", status: true },
             { name: "Donations", status: true },
             { name: "Transfer Type", status: true },
+            { name: "Groups", status: true },
         ];
 
         for (const permission of permissions) {

package/services/church.js

@@ -26,6 +26,8 @@ class ChurchService {
             const churchData = await commonDb.church.create(
                 {
                     ...params,
+                    registeredAt: new Date(),
+                    subscribedAt: new Date(),
                     connectionUrl: process.env.CHURCH_SHADOW_DATABASE_URL.replace(
                         "church_shadow",
                         name.toLowerCase()
@@ -67,6 +69,7 @@ class ChurchService {
                         roleId: ROLES.CHURCH_ADMIN,
                         churchId: churchData.id,
                     });
+                    await churchDb.church.create(params)
                     console.log(`Church onboarding completed for church: ${name}`);
                 }
             });
@@ -81,9 +84,14 @@ class ChurchService {
             const { search = null } = params;
             const searchCondition = !!search ? { name: { [Op.like]: `%${search}%` } } : {};
             const data = await commonDb.church.findAll({
-                where: { status: true, ...searchCondition },
+                where: { ...searchCondition },
                 attributes: commonDb.church.selectedFields,
-                raw: true,
+                include: {
+                    model: commonDb.subscriptionPlan,
+                    as: "subscriptionPlan",
+                    attributes: commonDb.subscriptionPlan.selectedFields,
+                    required: false,
+                },
             });
             return { code: errorCodes.HTTP_OK, message: errorMsgs.success, data };
         } catch (err) {
@@ -107,10 +115,12 @@ class ChurchService {
 
     async updateChurchByIdService(params) {
         try {
-            const { id, status } = params;
-            await commonDb.church.update({ status }, { where: { id } });
-            const message = status ? errorMsgs.activated : errorMsgs.deactivated;
-            return { code: errorCodes.HTTP_OK, message };
+            const { id, ...restParams } = params;
+            if(restParams.subscriptionPlanId) {
+                restParams.subscribedAt = new Date();
+            }
+            await commonDb.church.update(restParams, { where: { id } });
+            return { code: errorCodes.HTTP_OK, message: errorMsgs.churchUpdated };
         } catch (err) {
             return { code: errorCodes.HTTP_INTERNAL_SERVER_ERROR, message: err };
         }
@@ -118,7 +128,7 @@ class ChurchService {
 
     async addChurchPermissionService(params) {
         try {
-            const { churchId, permissionId } = params;
+            const { churchId, permissionId = [] } = params;
             const existingChurch = await commonDb.church.findOne({
                 where: { id: churchId },
                 raw: true,
@@ -126,26 +136,28 @@ class ChurchService {
             if (!existingChurch) {
                 return { code: errorCodes.HTTP_BAD_REQUEST, message: errorMsgs.invalidChurchId };
             }
-            const existingPermission = await commonDb.permission.findOne({
+            const existingPermission = await commonDb.permission.findAll({
                 where: { id: permissionId },
                 raw: true,
             });
-            if (!existingPermission) {
+            if (existingPermission.length !== permissionId.length) {
                 return {
                     code: errorCodes.HTTP_BAD_REQUEST,
                     message: errorMsgs.invalidPermissionId,
                 };
             }
-            const existingChurchPermission = await commonDb.churchPermission.findOne({
+            const existingChurchPermission = await commonDb.churchPermission.findAll({
                 where: { churchId, permissionId },
                 raw: true,
             });
-            if (existingChurchPermission) {
-                return { code: errorCodes.HTTP_CONFLICT, message: errorMsgs.permissionExists };
+            const excludedPermissions = permissionId.filter(
+                (x) => !existingChurchPermission.map((y) => y.permissionId).includes(x)
+            );
+            if(excludedPermissions.length) {
+                const queries = excludedPermissions.map((x) => commonDb.churchPermission.create({ churchId, permissionId: x }))
+                await Promise.all(queries);
             }
-            const response = await commonDb.churchPermission.create({ churchId, permissionId });
-            const data = response.get({ plain: true });
-            return { code: errorCodes.HTTP_OK, message: errorMsgs.success, data };
+            return { code: errorCodes.HTTP_OK, message: errorMsgs.success };
         } catch (err) {
             return { code: errorCodes.HTTP_INTERNAL_SERVER_ERROR, message: err };
         }

package/utils/docUpload.js

@@ -0,0 +1,51 @@
+const multer = require("multer");
+const path = require("path");
+const response = require("./response");
+const errorCodes = require("../config/errorCodes");
+const docUpload = async (req, res, next) => {
+    const storage = multer.diskStorage({
+        destination: function (req, file, cb) {
+            let file_folder = "documents";
+            if (file.mimetype.includes("image")) file_folder = "images";
+            else if (file.mimetype.includes("video")) file_folder = "videos";
+            else file_folder = "documents";
+            cb(null, `/app/uploads/${file_folder}`);
+        },
+        filename: function (req, file, cb) {
+            const filename =
+                file.fieldname +
+                "-" +
+                Date.now() +
+                path.extname(file.originalname).toLocaleLowerCase();
+            cb(null, filename);
+        },
+    });
+    const filter = (req, res, file, cb) => {
+        if (
+            file.mimetype.includes("pdf") ||
+            file.mimetype.includes("image") ||
+            file.mimetype.includes("video")
+        ) {
+            cb(null, true);
+        } else {
+            return cb(new Error("Only images/pdf/videos are allowed"));
+        }
+    };
+    req.files = {};
+    multer({
+        storage,
+        fileFilter: (req, file, cb) => filter(req, res, file, cb),
+        limits: { fileSize: 20 * 1024 * 1024 },
+    }).any()(req, res, (err) => {
+        console.log(err)
+        if (err)
+            response.invalid(
+                req,
+                res,
+                errorCodes.HTTP_BAD_REQUEST,
+                "Only images/videos under 20 MB each are permitted."
+            );
+        else next();
+    });
+};
+module.exports = docUpload;

package/validators/church.js

@@ -6,20 +6,9 @@ const schemas = {
             .max(20)
             .regex(/^[a-zA-Z]+$/)
             .required(),
-        address: BaseJoi.string().required(),
-        cityId: BaseJoi.number().required(),
-        provinceId: BaseJoi.number().required(),
-        country: BaseJoi.string().required(),
-        postalCode: BaseJoi.string().required(),
         email: BaseJoi.string().required(),
         phoneNumber: BaseJoi.string().required(),
-        contactPerson: BaseJoi.string().required(),
-        currency: BaseJoi.string().required(),
-        charitable_reg_no: BaseJoi.string().required(),
-        registration_agency: BaseJoi.string().required(),
-        profileImage: BaseJoi.string().required(),
-        registeredAt: BaseJoi.string().required(),
-        subscribedAt: BaseJoi.string().required(),
+        contactPerson: BaseJoi.string().optional().allow(null),
         subscriptionPlanId: BaseJoi.number().required(),
         churchAdminDetails: BaseJoi.object({
             firstName: BaseJoi.string().required(),
@@ -30,11 +19,17 @@ const schemas = {
         }).required(),
     }),
     updateChurch: BaseJoi.object({
-        status: BaseJoi.boolean().required(),
+        id: BaseJoi.number().required(),
+        name: BaseJoi.string().optional(),
+        email: BaseJoi.string().optional(),
+        phoneNumber: BaseJoi.string().optional(),
+        contactPerson: BaseJoi.string().optional(),
+        subscriptionPlanId: BaseJoi.number().optional(),
+        status: BaseJoi.boolean().optional(),
     }),
     addChurchPermission: BaseJoi.object({
         churchId: BaseJoi.number().required(),
-        permissionId: BaseJoi.number().required(),
+        permissionId: BaseJoi.array().items(BaseJoi.number().required()),
     }),
     getByChurchId: BaseJoi.object({
         churchId: BaseJoi.number().required(),
@@ -54,14 +49,14 @@ const options = {
         abortEarly: false,
         convert: true,
         allowUnknown: false,
-        stripUnknown: true,
+        stripUnknown: false,
     },
     array: {
         abortEarly: false,
         convert: true,
-        allowUnknown: true,
+        allowUnknown: false,
         stripUnknown: {
-            objects: true,
+            objects: false,
         },
     },
 };
@@ -79,7 +74,7 @@ const updateChurch = async (req, res, next) => {
     const { updateChurch } = schemas;
     const { basic } = options;
     try {
-        await updateChurch.validateAsync({ ...req.params, ...req.query }, basic);
+        await updateChurch.validateAsync({ ...req.params, ...req.body }, basic);
         next();
     } catch (err) {
         throwError(req, res, err);

package/deployment/docker-compose copy.yml

@@ -1,81 +0,0 @@
-version: '3'
-services:
-  churchsoln_backend:
-    container_name: churchsoln_backend
-    build:
-      context: ./churchsoln_backend
-      dockerfile: Dockerfile
-    restart: always
-    ports:
-      - "5009:5009"
-    depends_on:
-      - postgres-backend
-    env_file: ./churchsoln_backend/.env
-    volumes:
-      - ./churchsoln_backend/:/app
-      - image-volume:/app/uploads/images
-      - document-volume:/app/uploads/documents
-      - video-volume:/app/uploads/videos
-    networks:
-      - app-network
-  churchsoln_dbms:
-    container_name: churchsoln_dbms
-    build:
-      context: ./churchsoln_dbms
-      dockerfile: Dockerfile
-    restart: always
-    ports:
-      - "5007:5007"
-    depends_on:
-      - postgres
-      - redis1
-    env_file: ./churchsoln_dbms/.env
-    volumes:
-      - ./churchsoln_dbms/:/app
-      - image-volume:/app/uploads/images
-      - document-volume:/app/uploads/documents
-      - video-volume:/app/uploads/videos
-    networks:
-      - app-network
-
-  postgres:
-    image: postgres:15
-    container_name: postgres
-    env_file: ../.env
-    restart: always
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-    networks:
-      - app-network
-
-  pgadmin1:
-    image: dpage/pgadmin4
-    container_name: pgadmin1
-    env_file: ../.env
-    ports:
-      - "5008:80"
-    depends_on:
-      - postgres
-    networks:
-      - app-network
-
-  redis1:
-    image: redis:latest
-    container_name: redis1
-    ports:
-      - "6379:6379"
-    volumes:
-      - redis-data:/data
-    networks:
-      - app-network
-
-networks:
-  app-network:
-    driver: bridge
-
-volumes:
-  pgdata:
-  redis-data:
-  image-volume:
-  document-volume:
-  video-volume: