@churchsoln/dbms 1.0.27 → 1.0.29

package/public/swagger/master.json

@@ -324,319 +324,6 @@
                 "deprecated": false
             }
         },
-        "/master/province": {
-            "post": {
-                "tags": ["Province CRUD API's"],
-                "summary": "Add Province",
-                "operationId": "Add Province",
-                "parameters": [],
-                "requestBody": {
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/MasterDataRequest"
-                            },
-                            "example": {
-                                "name": "Label"
-                            }
-                        }
-                    },
-                    "required": true
-                },
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "deprecated": false
-            },
-            "get": {
-                "tags": ["Province CRUD API's"],
-                "summary": "Get All Provinces with search",
-                "operationId": "Get All Provinces with search",
-                "parameters": [
-                    {
-                        "name": "search",
-                        "in": "query",
-                        "required": false,
-                        "style": "form",
-                        "explode": true,
-                        "schema": {
-                            "type": "string",
-                            "example": ""
-                        }
-                    }
-                ],
-                "requestBody": {},
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "deprecated": false
-            }
-        },
-        "/master/province/{id}": {
-            "get": {
-                "tags": ["Province CRUD API's"],
-                "summary": "Get Province by id",
-                "operationId": "Get Province by id",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "style": "form",
-                        "explode": true,
-                        "schema": {
-                            "type": "integer",
-                            "format": "int32",
-                            "example": 1
-                        }
-                    }
-                ],
-                "requestBody": {},
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "deprecated": false
-            },
-            "patch": {
-                "tags": ["Province CRUD API's"],
-                "summary": "Update Province by id",
-                "operationId": "Update Province by id",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "style": "form",
-                        "explode": true,
-                        "schema": {
-                            "type": "integer",
-                            "format": "int32",
-                            "example": 1
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/MasterDataRequest"
-                            },
-                            "example": {
-                                "name": "Label"
-                            }
-                        }
-                    },
-                    "required": true
-                },
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "deprecated": false
-            },
-            "delete": {
-                "tags": ["Province CRUD API's"],
-                "summary": "Delete Province by id",
-                "operationId": "Delete Province by id",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "style": "form",
-                        "explode": true,
-                        "schema": {
-                            "type": "integer",
-                            "format": "int32",
-                            "example": 1
-                        }
-                    }
-                ],
-                "requestBody": {},
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "deprecated": false
-            }
-        },
-        "/master/city": {
-            "post": {
-                "tags": ["City CRUD API's"],
-                "summary": "Add City",
-                "operationId": "Add City",
-                "parameters": [
-                    {
-                        "name": "provinceId",
-                        "in": "query",
-                        "required": true,
-                        "style": "form",
-                        "explode": true,
-                        "schema": {
-                            "type": "integer",
-                            "format": "int32",
-                            "example": 1
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/MasterDataRequest"
-                            },
-                            "example": {
-                                "name": "Label"
-                            }
-                        }
-                    },
-                    "required": true
-                },
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "deprecated": false
-            },
-            "get": {
-                "tags": ["City CRUD API's"],
-                "summary": "Get all cities by province id with search",
-                "operationId": "Get all cities by province id with search",
-                "parameters": [
-                    {
-                        "name": "provinceId",
-                        "in": "query",
-                        "required": false,
-                        "style": "form",
-                        "explode": true,
-                        "schema": {
-                            "type": "integer",
-                            "format": "int32",
-                            "example": 1
-                        }
-                    },
-                    {
-                        "name": "search",
-                        "in": "query",
-                        "required": false,
-                        "style": "form",
-                        "explode": true,
-                        "schema": {
-                            "type": "string",
-                            "example": ""
-                        }
-                    }
-                ],
-                "requestBody": {},
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "deprecated": false
-            }
-        },
-        "/master/city/{id}": {
-            "get": {
-                "tags": ["City CRUD API's"],
-                "summary": "Get City by id",
-                "operationId": "Get City by id",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "style": "form",
-                        "explode": true,
-                        "schema": {
-                            "type": "integer",
-                            "format": "int32",
-                            "example": 1
-                        }
-                    }
-                ],
-                "requestBody": {},
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "deprecated": false
-            },
-            "patch": {
-                "tags": ["City CRUD API's"],
-                "summary": "Update City by id",
-                "operationId": "Update City by id",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "style": "form",
-                        "explode": true,
-                        "schema": {
-                            "type": "integer",
-                            "format": "int32",
-                            "example": 1
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/MasterDataRequest"
-                            },
-                            "example": {
-                                "name": "Label"
-                            }
-                        }
-                    },
-                    "required": true
-                },
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "deprecated": false
-            },
-            "delete": {
-                "tags": ["City CRUD API's"],
-                "summary": "Delete City by id",
-                "operationId": "Delete City by id",
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "required": true,
-                        "style": "form",
-                        "explode": true,
-                        "schema": {
-                            "type": "integer",
-                            "format": "int32",
-                            "example": 1
-                        }
-                    }
-                ],
-                "requestBody": {},
-                "responses": {
-                    "200": {
-                        "description": "OK"
-                    }
-                },
-                "deprecated": false
-            }
-        },
         "/master/permission": {
             "post": {
                 "tags": ["Permission API's"],

package/routes/v1/master.js

@@ -38,30 +38,6 @@ router.get("/role/:id", verifyToken, validators.getById, MasterController.roleBy
 router.patch("/role/:id", verifyToken, validators.updateById, MasterController.updateRoleById);
 router.delete("/role/:id", verifyToken, validators.getById, MasterController.deleteRoleById);
 
-// Province API's
-router.get("/province", MasterController.allProvinces);
-router.post("/province", verifyToken, validators.addMaster, MasterController.addProvince);
-router.get("/province/:id", verifyToken, validators.getById, MasterController.provinceById);
-router.patch(
-    "/province/:id",
-    verifyToken,
-    validators.updateById,
-    MasterController.updateProvinceById
-);
-router.delete(
-    "/province/:id",
-    verifyToken,
-    validators.getById,
-    MasterController.deleteProvinceById
-);
-
-// City API's
-router.get("/city", validators.allCities, MasterController.allCities);
-router.post("/city", verifyToken, validators.addCity, MasterController.addCity);
-router.get("/city/:id", verifyToken, validators.getById, MasterController.cityById);
-router.patch("/city/:id", verifyToken, validators.updateById, MasterController.updateCityById);
-router.delete("/city/:id", verifyToken, validators.getById, MasterController.deleteCityById);
-
 // Permission API's
 router.post(
     "/permission",

package/seeders/church/20241005124245-province.js

@@ -0,0 +1,101 @@
+"use strict";
+
+module.exports = {
+    up: async (queryInterface, Sequelize) => {
+        const provinces = [
+            { country: "US", code: "AL", name: "Alabama" },
+            { country: "US", code: "AK", name: "Alaska" },
+            { country: "US", code: "AZ", name: "Arizona" },
+            { country: "US", code: "AR", name: "Arkansas" },
+            { country: "US", code: "CA", name: "California" },
+            { country: "US", code: "CO", name: "Colorado" },
+            { country: "US", code: "CT", name: "Connecticut" },
+            { country: "US", code: "DE", name: "Delaware" },
+            { country: "US", code: "FL", name: "Florida" },
+            { country: "US", code: "GA", name: "Georgia" },
+            { country: "US", code: "HI", name: "Hawaii" },
+            { country: "US", code: "ID", name: "Idaho" },
+            { country: "US", code: "IL", name: "Illinois" },
+            { country: "US", code: "IN", name: "Indiana" },
+            { country: "US", code: "IA", name: "Iowa" },
+            { country: "US", code: "KS", name: "Kansas" },
+            { country: "US", code: "KY", name: "Kentucky" },
+            { country: "US", code: "LA", name: "Louisiana" },
+            { country: "US", code: "ME", name: "Maine" },
+            { country: "US", code: "MD", name: "Maryland" },
+            { country: "US", code: "MA", name: "Massachusetts" },
+            { country: "US", code: "MI", name: "Michigan" },
+            { country: "US", code: "MN", name: "Minnesota" },
+            { country: "US", code: "MS", name: "Mississippi" },
+            { country: "US", code: "MO", name: "Missouri" },
+            { country: "US", code: "MT", name: "Montana" },
+            { country: "US", code: "NE", name: "Nebraska" },
+            { country: "US", code: "NV", name: "Nevada" },
+            { country: "US", code: "NH", name: "New Hampshire" },
+            { country: "US", code: "NJ", name: "New Jersey" },
+            { country: "US", code: "NM", name: "New Mexico" },
+            { country: "US", code: "NY", name: "New York" },
+            { country: "US", code: "NC", name: "North Carolina" },
+            { country: "US", code: "ND", name: "North Dakota" },
+            { country: "US", code: "OH", name: "Ohio" },
+            { country: "US", code: "OK", name: "Oklahoma" },
+            { country: "US", code: "OR", name: "Oregon" },
+            { country: "US", code: "PA", name: "Pennsylvania" },
+            { country: "US", code: "RI", name: "Rhode Island" },
+            { country: "US", code: "SC", name: "South Carolina" },
+            { country: "US", code: "SD", name: "South Dakota" },
+            { country: "US", code: "TN", name: "Tennessee" },
+            { country: "US", code: "TX", name: "Texas" },
+            { country: "US", code: "UT", name: "Utah" },
+            { country: "US", code: "VT", name: "Vermont" },
+            { country: "US", code: "VA", name: "Virginia" },
+            { country: "US", code: "WA", name: "Washington" },
+            { country: "US", code: "WV", name: "West Virginia" },
+            { country: "US", code: "WI", name: "Wisconsin" },
+            { country: "US", code: "WY", name: "Wyoming" },
+            { country: "CA", code: "AB", name: "Alberta" },
+            { country: "CA", code: "BC", name: "British Columbia" },
+            { country: "CA", code: "MB", name: "Manitoba" },
+            { country: "CA", code: "NB", name: "New Brunswick" },
+            { country: "CA", code: "NL", name: "Newfoundland and Labrador" },
+            { country: "CA", code: "NS", name: "Nova Scotia" },
+            { country: "CA", code: "NT", name: "Northwest Territories" },
+            { country: "CA", code: "NU", name: "Nunavut" },
+            { country: "CA", code: "ON", name: "Ontario" },
+            { country: "CA", code: "PE", name: "Prince Edward Island" },
+            { country: "CA", code: "QC", name: "Quebec" },
+            { country: "CA", code: "SK", name: "Saskatchewan" },
+            { country: "CA", code: "YT", name: "Yukon" },
+        ];
+
+        for (const province of provinces) {
+            const existingProvince = await queryInterface.rawSelect(
+                "Province",
+                {
+                    where: { code: province.code },
+                },
+                ["id"]
+            );
+
+            if (existingProvince) {
+                await queryInterface.bulkUpdate(
+                    "Province",
+                    { country: province.country, name: province.name },
+                    { code: province.code }
+                );
+            } else {
+                await queryInterface.bulkInsert("Province", [province], {});
+            }
+        }
+    },
+
+    down: async (queryInterface, Sequelize) => {
+        await queryInterface.bulkDelete(
+            "Province",
+            {
+                code: provinces.map((province) => province.code),
+            },
+            {}
+        );
+    },
+};

package/seeders/church/20241005124547-city.js

@@ -0,0 +1,87 @@
+"use strict";
+
+module.exports = {
+    up: async (queryInterface, Sequelize) => {
+        const citiesList = [
+            { city: "Toronto", provinceCode: "ON" },
+            { city: "Ottawa", provinceCode: "ON" },
+            { city: "Mississauga", provinceCode: "ON" },
+            { city: "Brampton", provinceCode: "ON" },
+            { city: "Hamilton", provinceCode: "ON" },
+            { city: "London", provinceCode: "ON" },
+            { city: "Kitchener", provinceCode: "ON" },
+            { city: "Windsor", provinceCode: "ON" },
+            { city: "Markham", provinceCode: "ON" },
+            { city: "Vaughan", provinceCode: "ON" },
+            { city: "Montreal", provinceCode: "QC" },
+            { city: "Quebec City", provinceCode: "QC" },
+            { city: "Laval", provinceCode: "QC" },
+            { city: "Gatineau", provinceCode: "QC" },
+            { city: "Longueuil", provinceCode: "QC" },
+            { city: "Vancouver", provinceCode: "BC" },
+            { city: "Surrey", provinceCode: "BC" },
+            { city: "Burnaby", provinceCode: "BC" },
+            { city: "Richmond", provinceCode: "BC" },
+            { city: "Victoria", provinceCode: "BC" },
+            { city: "Calgary", provinceCode: "AB" },
+            { city: "Edmonton", provinceCode: "AB" },
+            { city: "Red Deer", provinceCode: "AB" },
+            { city: "Lethbridge", provinceCode: "AB" },
+            { city: "Winnipeg", provinceCode: "MB" },
+            { city: "Saskatoon", provinceCode: "SK" },
+            { city: "Regina", provinceCode: "SK" },
+            { city: "Halifax", provinceCode: "NS" },
+            { city: "St. Johns", provinceCode: "NL" },
+            { city: "Charlottetown", provinceCode: "PE" },
+            { city: "Fredericton", provinceCode: "NB" },
+            { city: "Whitehorse", provinceCode: "YT" },
+            { city: "Yellowknife", provinceCode: "NT" },
+            { city: "Iqaluit", provinceCode: "NU" },
+        ];
+        const provinces = await queryInterface.sequelize.query(
+            `SELECT id, code FROM "Province" WHERE code IN (${citiesList
+                .map(({ provinceCode }) => `'${provinceCode}'`)
+                .join(", ")});`,
+            { type: Sequelize.QueryTypes.SELECT }
+        );
+        process.stdout.write('provinces')
+        const provinceMap = provinces.reduce((acc, province) => {
+            acc[province.code] = province.id;
+            return acc;
+        }, {});
+        const cities = citiesList.map((city) => ({
+            name: city.city,
+            provinceId: provinceMap[city.provinceCode],
+            provinceCode: city.provinceCode,
+        }));
+
+        for (const city of cities) {
+            const existingCity = await queryInterface.rawSelect(
+                "City",
+                {
+                    where: { name: city.name, provinceCode: city.provinceCode },
+                },
+                ["id"]
+            );
+            if (existingCity) {
+                await queryInterface.bulkUpdate(
+                    "City",
+                    { name: city.name, provinceCode: city.provinceCode, provinceId: city.provinceId },
+                    { id: existingCity }
+                );
+            } else {
+                await queryInterface.bulkInsert("City", [city], {});
+            }
+        }
+    },
+
+    down: async (queryInterface, Sequelize) => {
+        await queryInterface.bulkDelete(
+            "City",
+            {
+                name: cities.map((city) => city.name),
+            },
+            {}
+        );
+    },
+};

package/services/church.js

@@ -91,9 +91,7 @@ class ChurchService {
                     const churchDb = await churchManager.getChurchDbConnectionById(churchData.id);
                     await churchDb.user.create({
                         ...churchAdminDetails,
-                        username: churchAdminDetails.email,
                         status: true,
-                        isUserAuthenticated: true,
                         roleId: ROLES.CHURCH_ADMIN,
                         churchId: churchData.id,
                     });