@churchsoln/dbms 1.0.47 → 1.0.49

package/workers/db-create.js

@@ -1,37 +1,37 @@
-const { Worker } = require("bullmq");
-const redisConfig = require("../redis/config");
-const commonDb = require("../models/common");
-const churchManager = require("../utils/churchManager");
-const { WORKERS, ONBOARD_STATUS } = require("../constants");
-new Worker(
-    WORKERS.DB_CREATE,
-    async (job) => {
-        const { churchId, name } = job.data;
-        try {
-            await commonDb.sequelize.authenticate();
-            await commonDb.church.update(
-                { dbCreationStatus: ONBOARD_STATUS.DB_CREATION_IN_PROGRESS },
-                { where: { id: churchId } }
-            );
-            await commonDb.sequelize.query(`CREATE DATABASE "${name}" TEMPLATE template0`);
-            await commonDb.church.update(
-                { dbCreationStatus: ONBOARD_STATUS.DB_CREATION_COMPLETED },
-                { where: { id: churchId } }
-            );
-            console.log(`Database "${name}" created successfully.`);
-            return true;
-        } catch (error) {
-            if (error.original && error.original.code === "42P04") {
-                console.log(`Database "${name}" already exists.`);
-            } else {
-                console.error("Error creating database:", error.message);
-            }
-            await commonDb.church.update(
-                { dbCreationStatus: ONBOARD_STATUS.DB_CREATION_FAILED },
-                { where: { id: churchId } }
-            );
-            return false;
-        }
-    },
-    { connection: redisConfig }
-);
+const { Worker } = require("bullmq");
+const redisConfig = require("../redis/config");
+const commonDb = require("../models/common");
+const churchManager = require("../utils/churchManager");
+const { WORKERS, ONBOARD_STATUS } = require("../constants");
+new Worker(
+    WORKERS.DB_CREATE,
+    async (job) => {
+        const { churchId, name } = job.data;
+        try {
+            await commonDb.sequelize.authenticate();
+            await commonDb.church.update(
+                { dbCreationStatus: ONBOARD_STATUS.DB_CREATION_IN_PROGRESS },
+                { where: { id: churchId } }
+            );
+            await commonDb.sequelize.query(`CREATE DATABASE "${name}" TEMPLATE template0`);
+            await commonDb.church.update(
+                { dbCreationStatus: ONBOARD_STATUS.DB_CREATION_COMPLETED },
+                { where: { id: churchId } }
+            );
+            console.log(`Database "${name}" created successfully.`);
+            return true;
+        } catch (error) {
+            if (error.original && error.original.code === "42P04") {
+                console.log(`Database "${name}" already exists.`);
+            } else {
+                console.error("Error creating database:", error.message);
+            }
+            await commonDb.church.update(
+                { dbCreationStatus: ONBOARD_STATUS.DB_CREATION_FAILED },
+                { where: { id: churchId } }
+            );
+            return false;
+        }
+    },
+    { connection: redisConfig }
+);

package/workers/index.js

@@ -1,4 +1,4 @@
-require("./db-create");
-require("./migrations");
-require("./seed");
-require("./master");
+require("./db-create");
+require("./migrations");
+require("./seed");
+require("./master");

package/workers/master.js

@@ -1,50 +1,50 @@
-const { Worker } = require("bullmq");
-const redisConfig = require("../redis/config");
-const { WORKERS, QUEUES } = require("../constants");
-const {
-    dbCreateQueue,
-    dbCreateQueueEvents,
-    migrationsQueue,
-    migrationsQueueEvents,
-    seedQueue,
-    seedQueueEvents,
-} = require("../queues/index");
-const waitForJobCompletion = async (queueEvents, jobId) => {
-    return new Promise((resolve, reject) => {
-        queueEvents.on("completed", (event) => {
-            if (event.jobId === jobId) {
-                resolve();
-            }
-        });
-
-        queueEvents.on("failed", (event) => {
-            if (event.jobId === jobId) {
-                reject(new Error(`Job ${jobId} failed`));
-            }
-        });
-    });
-};
-
-new Worker(
-    WORKERS.MASTER,
-    async (job) => {
-        const jobs = job.data;
-        try {
-            for (const job of jobs) {
-                const { queue, queueEvents } = {
-                    [QUEUES.DB_CREATE]: { queue: dbCreateQueue, queueEvents: dbCreateQueueEvents },
-                    [QUEUES.MIGRATION]: {
-                        queue: migrationsQueue,
-                        queueEvents: migrationsQueueEvents,
-                    },
-                    [QUEUES.SEED]: { queue: seedQueue, queueEvents: seedQueueEvents },
-                }[job.queue];
-                const currentJob = await queue.add(job.queue, job.data);
-                await waitForJobCompletion(queueEvents, currentJob.id);
-            }
-        } catch (error) {
-            console.error("Error while processing master job: ", error.message);
-        }
-    },
-    { connection: redisConfig }
-);
+const { Worker } = require("bullmq");
+const redisConfig = require("../redis/config");
+const { WORKERS, QUEUES } = require("../constants");
+const {
+    dbCreateQueue,
+    dbCreateQueueEvents,
+    migrationsQueue,
+    migrationsQueueEvents,
+    seedQueue,
+    seedQueueEvents,
+} = require("../queues/index");
+const waitForJobCompletion = async (queueEvents, jobId) => {
+    return new Promise((resolve, reject) => {
+        queueEvents.on("completed", (event) => {
+            if (event.jobId === jobId) {
+                resolve();
+            }
+        });
+
+        queueEvents.on("failed", (event) => {
+            if (event.jobId === jobId) {
+                reject(new Error(`Job ${jobId} failed`));
+            }
+        });
+    });
+};
+
+new Worker(
+    WORKERS.MASTER,
+    async (job) => {
+        const jobs = job.data;
+        try {
+            for (const job of jobs) {
+                const { queue, queueEvents } = {
+                    [QUEUES.DB_CREATE]: { queue: dbCreateQueue, queueEvents: dbCreateQueueEvents },
+                    [QUEUES.MIGRATION]: {
+                        queue: migrationsQueue,
+                        queueEvents: migrationsQueueEvents,
+                    },
+                    [QUEUES.SEED]: { queue: seedQueue, queueEvents: seedQueueEvents },
+                }[job.queue];
+                const currentJob = await queue.add(job.queue, job.data);
+                await waitForJobCompletion(queueEvents, currentJob.id);
+            }
+        } catch (error) {
+            console.error("Error while processing master job: ", error.message);
+        }
+    },
+    { connection: redisConfig }
+);

package/workers/migrations.js

@@ -1,63 +1,63 @@
-const { Worker } = require("bullmq");
-const redisConfig = require("../redis/config");
-const commonDb = require("../models/common");
-const { exec } = require("child_process");
-const { WORKERS, ONBOARD_STATUS } = require("../constants");
-
-const migrateDb = async (churchData) => {
-    return new Promise(async (resolve, reject) => {
-        const { id, connectionUrl, name } = churchData;
-        console.log(`Applying migrations for church: ${name}`);
-        await commonDb.church.update(
-            { migrationStatus: ONBOARD_STATUS.MIGRATION_IN_PROGRESS },
-            { where: { id } }
-        );
-        exec(
-            `npx sequelize-cli db:migrate --url ${connectionUrl} --migrations-path ./migrations/church`,
-            async (error, stdout, stderr) => {
-                if (error) {
-                    console.error(`Error applying migrations for church: ${name}`, error.message);
-                    await commonDb.church.update(
-                        { migrationStatus: ONBOARD_STATUS.MIGRATION_FAILED },
-                        { where: { id } }
-                    );
-                    reject(error);
-                }
-                console.log(`Migrations applied for church: ${name}`);
-                await commonDb.church.update(
-                    { migrationStatus: ONBOARD_STATUS.MIGRATION_COMPLETED },
-                    { where: { id } }
-                );
-                resolve();
-            }
-        );
-    });
-};
-new Worker(
-    WORKERS.MIGRATION,
-    async (job) => {
-        const { churchId } = job.data;
-        try {
-            if (churchId) {
-                const churchData = await commonDb.church.findOne({
-                    where: { id: churchId },
-                    attributes: commonDb.church.selectedFields,
-                    raw: true,
-                });
-                await migrateDb(churchData);
-                return true;
-            } else {
-                const allChurchData = await commonDb.church.findAll({
-                    attributes: commonDb.church.selectedFields,
-                    raw: true,
-                });
-                await Promise.all(allChurchData.map((church) => migrateDb(church)));
-                return;
-            }
-        } catch (error) {
-            console.error("Error applying migrations:", error.message);
-            return false;
-        }
-    },
-    { connection: redisConfig }
-);
+const { Worker } = require("bullmq");
+const redisConfig = require("../redis/config");
+const commonDb = require("../models/common");
+const { exec } = require("child_process");
+const { WORKERS, ONBOARD_STATUS } = require("../constants");
+
+const migrateDb = async (churchData) => {
+    return new Promise(async (resolve, reject) => {
+        const { id, connectionUrl, name } = churchData;
+        console.log(`Applying migrations for church: ${name}`);
+        await commonDb.church.update(
+            { migrationStatus: ONBOARD_STATUS.MIGRATION_IN_PROGRESS },
+            { where: { id } }
+        );
+        exec(
+            `npx sequelize-cli db:migrate --url ${connectionUrl} --migrations-path ./migrations/church`,
+            async (error, stdout, stderr) => {
+                if (error) {
+                    console.error(`Error applying migrations for church: ${name}`, error.message);
+                    await commonDb.church.update(
+                        { migrationStatus: ONBOARD_STATUS.MIGRATION_FAILED },
+                        { where: { id } }
+                    );
+                    reject(error);
+                }
+                console.log(`Migrations applied for church: ${name}`);
+                await commonDb.church.update(
+                    { migrationStatus: ONBOARD_STATUS.MIGRATION_COMPLETED },
+                    { where: { id } }
+                );
+                resolve();
+            }
+        );
+    });
+};
+new Worker(
+    WORKERS.MIGRATION,
+    async (job) => {
+        const { churchId } = job.data;
+        try {
+            if (churchId) {
+                const churchData = await commonDb.church.findOne({
+                    where: { id: churchId },
+                    attributes: commonDb.church.selectedFields,
+                    raw: true,
+                });
+                await migrateDb(churchData);
+                return true;
+            } else {
+                const allChurchData = await commonDb.church.findAll({
+                    attributes: commonDb.church.selectedFields,
+                    raw: true,
+                });
+                await Promise.all(allChurchData.map((church) => migrateDb(church)));
+                return;
+            }
+        } catch (error) {
+            console.error("Error applying migrations:", error.message);
+            return false;
+        }
+    },
+    { connection: redisConfig }
+);

package/workers/seed.js

@@ -1,85 +1,85 @@
-const { Worker } = require("bullmq");
-const redisConfig = require("../redis/config");
-const commonDb = require("../models/common");
-const { exec } = require("child_process");
-const { WORKERS, ONBOARD_STATUS } = require("../constants");
-
-const seedDb = async (seedData) => {
-    return new Promise(async (resolve, reject) => {
-        const { id, connectionUrl, name, isCommonDb = false } = seedData;
-        console.log(
-            `Applying seed for ${isCommonDb ? "common" : "church"} db: ${!isCommonDb ? name : ""}`
-        );
-        if (!isCommonDb) {
-            await commonDb.church.update(
-                { seedStatus: ONBOARD_STATUS.SEED_IN_PROGRESS },
-                { where: { id } }
-            );
-        }
-        exec(
-            `DEBUG=sequelize:* npx sequelize-cli db:seed:all --url ${connectionUrl} --seeders-path ${
-                isCommonDb ? "./seeders/common" : "./seeders/church"
-            }`,
-            async (error, stdout, stderr) => {
-                if (error) {
-                    console.error(
-                        `Error applying seed for ${isCommonDb ? "common" : "church"} db: ${
-                            !isCommonDb ? name : ""
-                        }`,
-                        error.message
-                    );
-                    if (!isCommonDb) {
-                        await commonDb.church.update(
-                            { seedStatus: ONBOARD_STATUS.SEED_FAILED },
-                            { where: { id } }
-                        );
-                    }
-                    reject(error);
-                }
-                console.log(
-                    `Seed applied for ${isCommonDb ? "common" : "church"} db: ${
-                        !isCommonDb ? name : ""
-                    }`
-                );
-                if (!isCommonDb) {
-                    await commonDb.church.update(
-                        { seedStatus: ONBOARD_STATUS.SEED_COMPLETED },
-                        { where: { id } }
-                    );
-                }
-                resolve();
-            }
-        );
-    });
-};
-new Worker(
-    WORKERS.SEED,
-    async (job) => {
-        try {
-            const { churchId, isCommonDb = false } = job.data;
-            if (isCommonDb) {
-                await seedDb({ isCommonDb, connectionUrl: commonDb.config.url });
-            }
-            if (churchId && !isCommonDb) {
-                const churchData = await commonDb.church.findOne({
-                    where: { id: churchId },
-                    attributes: commonDb.church.selectedFields,
-                    raw: true,
-                });
-                await seedDb(churchData);
-            }
-            if (!churchId && !isCommonDb) {
-                const allChurchData = await commonDb.church.findAll({
-                    attributes: commonDb.church.selectedFields,
-                    raw: true,
-                });
-                await Promise.all(allChurchData.map((church) => seedDb(church)));
-            }
-            return true;
-        } catch (error) {
-            console.error("Error applying seed:", error.message);
-            return false;
-        }
-    },
-    { connection: redisConfig }
-);
+const { Worker } = require("bullmq");
+const redisConfig = require("../redis/config");
+const commonDb = require("../models/common");
+const { exec } = require("child_process");
+const { WORKERS, ONBOARD_STATUS } = require("../constants");
+
+const seedDb = async (seedData) => {
+    return new Promise(async (resolve, reject) => {
+        const { id, connectionUrl, name, isCommonDb = false } = seedData;
+        console.log(
+            `Applying seed for ${isCommonDb ? "common" : "church"} db: ${!isCommonDb ? name : ""}`
+        );
+        if (!isCommonDb) {
+            await commonDb.church.update(
+                { seedStatus: ONBOARD_STATUS.SEED_IN_PROGRESS },
+                { where: { id } }
+            );
+        }
+        exec(
+            `DEBUG=sequelize:* npx sequelize-cli db:seed:all --url ${connectionUrl} --seeders-path ${
+                isCommonDb ? "./seeders/common" : "./seeders/church"
+            }`,
+            async (error, stdout, stderr) => {
+                if (error) {
+                    console.error(
+                        `Error applying seed for ${isCommonDb ? "common" : "church"} db: ${
+                            !isCommonDb ? name : ""
+                        }`,
+                        error.message
+                    );
+                    if (!isCommonDb) {
+                        await commonDb.church.update(
+                            { seedStatus: ONBOARD_STATUS.SEED_FAILED },
+                            { where: { id } }
+                        );
+                    }
+                    reject(error);
+                }
+                console.log(
+                    `Seed applied for ${isCommonDb ? "common" : "church"} db: ${
+                        !isCommonDb ? name : ""
+                    }`
+                );
+                if (!isCommonDb) {
+                    await commonDb.church.update(
+                        { seedStatus: ONBOARD_STATUS.SEED_COMPLETED },
+                        { where: { id } }
+                    );
+                }
+                resolve();
+            }
+        );
+    });
+};
+new Worker(
+    WORKERS.SEED,
+    async (job) => {
+        try {
+            const { churchId, isCommonDb = false } = job.data;
+            if (isCommonDb) {
+                await seedDb({ isCommonDb, connectionUrl: commonDb.config.url });
+            }
+            if (churchId && !isCommonDb) {
+                const churchData = await commonDb.church.findOne({
+                    where: { id: churchId },
+                    attributes: commonDb.church.selectedFields,
+                    raw: true,
+                });
+                await seedDb(churchData);
+            }
+            if (!churchId && !isCommonDb) {
+                const allChurchData = await commonDb.church.findAll({
+                    attributes: commonDb.church.selectedFields,
+                    raw: true,
+                });
+                await Promise.all(allChurchData.map((church) => seedDb(church)));
+            }
+            return true;
+        } catch (error) {
+            console.error("Error applying seed:", error.message);
+            return false;
+        }
+    },
+    { connection: redisConfig }
+);