@kipicore/dbcore 1.1.32 → 1.1.34

package/dist/models/psql/greetingsModel.js

@@ -1,17 +1,75 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const sequelize_1 = require("sequelize");
 const index_1 = require("./index");
 const app_1 = require("../../constants/app");
-const userModel_1 = __importDefault(require("./userModel"));
-const instituteModel_1 = __importDefault(require("./instituteModel"));
 const errorMessages_1 = require("../../constants/errorMessages");
-const fileStorageModel_1 = __importDefault(require("./fileStorageModel"));
 class GreetingsModel extends sequelize_1.Model {
+    static associate(models) {
+        const { UserModel, InstituteModel, FileStorageModel } = models;
+        GreetingsModel.belongsTo(UserModel, {
+            foreignKey: {
+                name: 'createdBy',
+                allowNull: true,
+                field: 'created_by',
+            },
+            as: 'createdByUser',
+        });
+        GreetingsModel.belongsTo(UserModel, {
+            foreignKey: {
+                name: 'updatedBy',
+                allowNull: true,
+                field: 'updated_by',
+            },
+            as: 'updatedByUser',
+        });
+        GreetingsModel.belongsTo(UserModel, {
+            foreignKey: {
+                name: 'deletedBy',
+                allowNull: true,
+                field: 'deleted_by',
+            },
+            as: 'deletedByUser',
+        });
+        GreetingsModel.belongsTo(InstituteModel, {
+            foreignKey: 'instituteId',
+            as: 'greetingsInstitute',
+        });
+        InstituteModel.hasMany(GreetingsModel, {
+            foreignKey: 'instituteId',
+            as: 'instituteHasGreetings',
+        });
+        GreetingsModel.belongsTo(FileStorageModel, {
+            foreignKey: {
+                name: 'image',
+                allowNull: true,
+            },
+            as: 'greetingsImage',
+        });
+        FileStorageModel.hasMany(GreetingsModel, {
+            foreignKey: {
+                name: 'image',
+                allowNull: true,
+            },
+            as: 'imageHasGreetings',
+        });
+    }
+    static addHooks(models) {
+        const beforeCreateOrUpdateHook = async (greetings) => {
+            if (greetings.instituteId) {
+                const institute = await models.InstituteModel.findByPk(greetings.instituteId);
+                if (!institute) {
+                    throw new Error(errorMessages_1.INSTITUTE_ERROR_MESSAGES.NOT_FOUND);
+                }
+            }
+        };
+        GreetingsModel.beforeCreate(beforeCreateOrUpdateHook);
+        GreetingsModel.beforeBulkUpdate(async (options) => {
+            await beforeCreateOrUpdateHook(options.attributes);
+        });
+    }
 }
+exports.default = GreetingsModel;
 GreetingsModel.init({
     id: {
         type: sequelize_1.DataTypes.UUID,
@@ -56,63 +114,3 @@ GreetingsModel.init({
     timestamps: true,
     sequelize: index_1.sequelize,
 });
-// Associations
-GreetingsModel.belongsTo(userModel_1.default, {
-    foreignKey: {
-        name: 'createdBy',
-        allowNull: true,
-        field: 'created_by',
-    },
-    as: 'createdByUser',
-});
-GreetingsModel.belongsTo(userModel_1.default, {
-    foreignKey: {
-        name: 'updatedBy',
-        allowNull: true,
-        field: 'updated_by',
-    },
-    as: 'updatedByUser',
-});
-GreetingsModel.belongsTo(userModel_1.default, {
-    foreignKey: {
-        name: 'deletedBy',
-        allowNull: true,
-        field: 'deleted_by',
-    },
-    as: 'deletedByUser',
-});
-GreetingsModel.belongsTo(instituteModel_1.default, {
-    foreignKey: 'instituteId',
-    as: 'greetingsInstitute',
-});
-instituteModel_1.default.hasMany(GreetingsModel, {
-    foreignKey: 'instituteId',
-    as: 'instituteHasGreetings',
-});
-GreetingsModel.belongsTo(fileStorageModel_1.default, {
-    foreignKey: {
-        name: 'image',
-        allowNull: true,
-    },
-    as: 'greetingsImage',
-});
-fileStorageModel_1.default.hasMany(GreetingsModel, {
-    foreignKey: {
-        name: 'image',
-        allowNull: true,
-    },
-    as: 'imageHasGreetings',
-});
-const beforeCreateOrUpdateHook = async (greetings) => {
-    if (greetings.instituteId) {
-        const institute = await instituteModel_1.default.findByPk(greetings.instituteId);
-        if (!institute) {
-            throw new Error(errorMessages_1.INSTITUTE_ERROR_MESSAGES.NOT_FOUND);
-        }
-    }
-};
-GreetingsModel.beforeCreate(beforeCreateOrUpdateHook);
-GreetingsModel.beforeBulkUpdate(async (options) => {
-    await beforeCreateOrUpdateHook(options.attributes);
-});
-exports.default = GreetingsModel;

package/dist/models/psql/homeWorkModel.d.ts

@@ -18,5 +18,6 @@ declare class HomeWorkModel extends Model<IHomeWorkModelAttributes, THomeWorkMod
     readonly createdAt: Date;
     readonly deletedAt: string;
     readonly updatedAt: Date;
+    static associate(models: any): void;
 }
 export default HomeWorkModel;

package/dist/models/psql/homeWorkModel.js

@@ -1,16 +1,48 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const sequelize_1 = require("sequelize");
-const app_1 = require("../../constants/app");
-const instituteModel_1 = __importDefault(require("./instituteModel"));
-const batchModel_1 = __importDefault(require("./batchModel"));
 const index_1 = require("./index");
-const userModel_1 = __importDefault(require("./userModel"));
-const instituteEntityModel_1 = __importDefault(require("./instituteEntityModel"));
+const app_1 = require("../../constants/app");
 class HomeWorkModel extends sequelize_1.Model {
+    static associate(models) {
+        const { UserModel, BatchModel, InstituteModel, InstituteEntityModel } = models;
+        HomeWorkModel.belongsTo(UserModel, {
+            foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' },
+            as: 'createdByUser',
+        });
+        HomeWorkModel.belongsTo(UserModel, {
+            foreignKey: { name: 'updatedBy', allowNull: true, field: 'updated_by' },
+            as: 'updatedByUser',
+        });
+        HomeWorkModel.belongsTo(UserModel, {
+            foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
+            as: 'deletedByUser',
+        });
+        HomeWorkModel.belongsTo(BatchModel, {
+            foreignKey: { name: 'batchId' },
+            as: 'batch',
+        });
+        BatchModel.hasMany(HomeWorkModel, {
+            foreignKey: { name: 'batchId' },
+            as: 'homework',
+        });
+        HomeWorkModel.belongsTo(InstituteModel, {
+            foreignKey: { name: 'instituteId' },
+            as: 'institute',
+        });
+        InstituteModel.hasMany(HomeWorkModel, {
+            foreignKey: { name: 'instituteId' },
+            as: 'homework_institute',
+        });
+        InstituteEntityModel.hasMany(HomeWorkModel, {
+            foreignKey: { name: 'subjectId', field: 'subject_id' },
+            as: 'subjectHomeWorkList',
+        });
+        HomeWorkModel.belongsTo(InstituteEntityModel, {
+            foreignKey: { name: 'subjectId', field: 'subject_id' },
+            as: 'homeWorkSubject',
+        });
+    }
 }
 HomeWorkModel.init({
     id: {
@@ -63,66 +95,4 @@ HomeWorkModel.init({
     timestamps: true,
     sequelize: index_1.sequelize,
 });
-HomeWorkModel.belongsTo(userModel_1.default, {
-    foreignKey: {
-        name: 'createdBy',
-        allowNull: true,
-        field: 'created_by',
-    },
-    as: 'createdByUser',
-});
-HomeWorkModel.belongsTo(userModel_1.default, {
-    foreignKey: {
-        name: 'updatedBy',
-        allowNull: true,
-        field: 'updated_by',
-    },
-    as: 'updatedByUser',
-});
-HomeWorkModel.belongsTo(userModel_1.default, {
-    foreignKey: {
-        name: 'deletedBy',
-        allowNull: true,
-        field: 'deleted_by',
-    },
-    as: 'deletedByUser',
-});
-HomeWorkModel.belongsTo(batchModel_1.default, {
-    foreignKey: {
-        name: 'batchId',
-    },
-    as: 'batch',
-});
-batchModel_1.default.hasMany(HomeWorkModel, {
-    foreignKey: {
-        name: 'batchId',
-    },
-    as: 'homework',
-});
-HomeWorkModel.belongsTo(instituteModel_1.default, {
-    foreignKey: {
-        name: 'instituteId',
-    },
-    as: 'institute',
-});
-instituteModel_1.default.hasMany(HomeWorkModel, {
-    foreignKey: {
-        name: 'instituteId',
-    },
-    as: 'homework_institute',
-});
-instituteEntityModel_1.default.hasMany(HomeWorkModel, {
-    foreignKey: {
-        name: 'subjectId',
-        field: 'subject_id',
-    },
-    as: 'subjectHomeWorkList',
-});
-HomeWorkModel.belongsTo(instituteEntityModel_1.default, {
-    foreignKey: {
-        name: 'subjectId',
-        field: 'subject_id',
-    },
-    as: 'homeWorkSubject',
-});
 exports.default = HomeWorkModel;

package/dist/models/psql/index.js

@@ -27,20 +27,21 @@ const sequelize = new sequelize_1.Sequelize(database, username, password, {
     dialectOptions,
 });
 exports.sequelize = sequelize;
-// add all models
 // Load models
 fs_1.default.readdirSync(__dirname)
-    .filter(file => file.indexOf('.') !== 0 && file !== 'index' && file.slice(-3) === '.js')
+    .filter(file => file.indexOf('.') !== 0 && (file !== 'index') && file.slice(-3) === '.js')
     .forEach(file => {
     const modelDefiner = require(path_1.default.join(__dirname, file));
-    const model = modelDefiner.default ? modelDefiner.default(sequelize) : modelDefiner(sequelize);
-    db[model.name] = model;
+    db[modelDefiner.default.name] = modelDefiner.default;
 });
-// Run associations
+// Run associate
 Object.keys(db).forEach(modelName => {
-    if (typeof db[modelName].associate === 'function') {
+    if (db[modelName].associate && typeof db[modelName].associate === 'function') {
         db[modelName].associate(db);
     }
+    if (db[modelName].addHooks && typeof db[modelName].addHooks === 'function') {
+        db[modelName].addHooks(db);
+    }
 });
 sequelize.addHook('beforeBulkDestroy', async (options) => {
     const userId = options.userId; // Pass the user ID through options

package/dist/models/psql/instituteEntityModel.d.ts

@@ -21,5 +21,6 @@ declare class InstituteEntityModel extends Model<IInstituteEntityAttributes, TIn
     readonly createdAt: Date;
     readonly deletedAt: string;
     readonly updatedAt: Date;
+    static associate(models: any): void;
 }
 export default InstituteEntityModel;

package/dist/models/psql/instituteEntityModel.js

@@ -1,15 +1,68 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const sequelize_1 = require("sequelize");
 const index_1 = require("./index");
 const app_1 = require("../../constants/app");
-const userModel_1 = __importDefault(require("./userModel"));
-const instituteEntityTypeModel_1 = __importDefault(require("./instituteEntityTypeModel"));
-const instituteModel_1 = __importDefault(require("./instituteModel"));
 class InstituteEntityModel extends sequelize_1.Model {
+    static associate(models) {
+        const { UserModel, InstituteEntityTypeModel, InstituteModel } = models;
+        InstituteEntityModel.belongsTo(UserModel, {
+            foreignKey: {
+                name: 'createdBy',
+                allowNull: true,
+                field: 'created_by',
+            },
+            as: 'createdByUser',
+        });
+        InstituteEntityModel.belongsTo(UserModel, {
+            foreignKey: {
+                name: 'updatedBy',
+                allowNull: true,
+                field: 'updated_by',
+            },
+            as: 'updatedByUser',
+        });
+        InstituteEntityModel.belongsTo(UserModel, {
+            foreignKey: {
+                name: 'deletedBy',
+                allowNull: true,
+                field: 'deleted_by',
+            },
+            as: 'deletedByUser',
+        });
+        InstituteEntityModel.hasMany(InstituteEntityModel, {
+            foreignKey: {
+                name: 'entityId',
+                allowNull: true,
+                field: 'entity_id',
+            },
+            as: 'entities',
+        });
+        InstituteEntityModel.belongsTo(InstituteEntityTypeModel, {
+            foreignKey: {
+                name: 'entityTypeId',
+                allowNull: false,
+                field: 'entity_type_id',
+            },
+            as: 'entityType',
+        });
+        InstituteEntityModel.belongsTo(InstituteModel, {
+            foreignKey: {
+                name: 'instituteId',
+                allowNull: true,
+                field: 'institute_id',
+            },
+            as: 'institute',
+        });
+        InstituteModel.hasMany(InstituteEntityModel, {
+            foreignKey: {
+                name: 'instituteId',
+                allowNull: true,
+                field: 'institute_id',
+            },
+            as: 'instituteEntities',
+        });
+    }
 }
 InstituteEntityModel.init({
     id: {
@@ -72,60 +125,4 @@ InstituteEntityModel.init({
     timestamps: true,
     sequelize: index_1.sequelize,
 });
-InstituteEntityModel.belongsTo(userModel_1.default, {
-    foreignKey: {
-        name: 'createdBy',
-        allowNull: true,
-        field: 'created_by',
-    },
-    as: 'createdByUser',
-});
-InstituteEntityModel.belongsTo(userModel_1.default, {
-    foreignKey: {
-        name: 'updatedBy',
-        allowNull: true,
-        field: 'updated_by',
-    },
-    as: 'updatedByUser',
-});
-InstituteEntityModel.belongsTo(userModel_1.default, {
-    foreignKey: {
-        name: 'deletedBy',
-        allowNull: true,
-        field: 'deleted_by',
-    },
-    as: 'deletedByUser',
-});
-InstituteEntityModel.hasMany(InstituteEntityModel, {
-    foreignKey: {
-        name: 'entityId',
-        allowNull: true,
-        field: 'entity_id',
-    },
-    as: 'entities',
-});
-InstituteEntityModel.belongsTo(instituteEntityTypeModel_1.default, {
-    foreignKey: {
-        name: 'entityTypeId',
-        allowNull: false,
-        field: 'entity_type_id',
-    },
-    as: 'entityType',
-});
-InstituteEntityModel.belongsTo(instituteModel_1.default, {
-    foreignKey: {
-        name: 'instituteId',
-        allowNull: true,
-        field: 'institute_id',
-    },
-    as: 'institute',
-});
-instituteModel_1.default.hasMany(InstituteEntityModel, {
-    foreignKey: {
-        name: 'instituteId',
-        allowNull: true,
-        field: 'institute_id',
-    },
-    as: 'instituteEntities',
-});
 exports.default = InstituteEntityModel;

package/dist/models/psql/instituteEntityTypeModel.d.ts

@@ -15,5 +15,6 @@ declare class InstituteEntityTypeModel extends Model<IInstituteEntityTypeAttribu
     readonly createdAt: Date;
     readonly deletedAt: string;
     readonly updatedAt: Date;
+    static associate(models: any): void;
 }
 export default InstituteEntityTypeModel;

package/dist/models/psql/instituteEntityTypeModel.js

@@ -1,13 +1,24 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const sequelize_1 = require("sequelize");
 const index_1 = require("./index");
 const app_1 = require("../../constants/app");
-const userModel_1 = __importDefault(require("./userModel"));
 class InstituteEntityTypeModel extends sequelize_1.Model {
+    static associate(models) {
+        const { UserModel } = models;
+        InstituteEntityTypeModel.belongsTo(UserModel, {
+            foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' },
+            as: 'createdByUser',
+        });
+        InstituteEntityTypeModel.belongsTo(UserModel, {
+            foreignKey: { name: 'updatedBy', allowNull: true, field: 'updated_by' },
+            as: 'updatedByUser',
+        });
+        InstituteEntityTypeModel.belongsTo(UserModel, {
+            foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
+            as: 'deletedByUser',
+        });
+    }
 }
 InstituteEntityTypeModel.init({
     id: {
@@ -47,28 +58,4 @@ InstituteEntityTypeModel.init({
     timestamps: true,
     sequelize: index_1.sequelize,
 });
-InstituteEntityTypeModel.belongsTo(userModel_1.default, {
-    foreignKey: {
-        name: 'createdBy',
-        allowNull: true,
-        field: 'created_by',
-    },
-    as: 'createdByUser',
-});
-InstituteEntityTypeModel.belongsTo(userModel_1.default, {
-    foreignKey: {
-        name: 'updatedBy',
-        allowNull: true,
-        field: 'updated_by',
-    },
-    as: 'updatedByUser',
-});
-InstituteEntityTypeModel.belongsTo(userModel_1.default, {
-    foreignKey: {
-        name: 'deletedBy',
-        allowNull: true,
-        field: 'deleted_by',
-    },
-    as: 'deletedByUser',
-});
 exports.default = InstituteEntityTypeModel;

package/dist/models/psql/instituteModel.d.ts

@@ -40,5 +40,6 @@ declare class InstituteModel extends Model<IInstituteAttributes, TInstituteCreat
     readonly createdAt: Date;
     readonly deletedAt: string;
     readonly updatedAt: Date;
+    static associate(models: any): void;
 }
 export default InstituteModel;