@kipicore/dbcore 1.1.217 → 1.1.219

package/dist/models/psql/studentFeeHistoryModel.js

@@ -31,14 +31,14 @@ class StudentFeeHistoryModel extends sequelize_1.Model {
             foreignKey: { name: 'bankAccountId', field: 'bank_account_id', allowNull: true },
             as: 'studentFeeHistoryHasAccount',
         });
-        StudentFeeHistoryModel.belongsTo(StudentFeeHistoryModel, {
-            foreignKey: { name: 'parentHistoryId', field: 'parent_history_id', allowNull: true },
-            as: 'studentOldFeeHistory',
-        });
-        StudentFeeHistoryModel.hasMany(StudentFeeHistoryModel, {
-            foreignKey: { name: 'parentHistoryId', field: 'parent_history_id', allowNull: true },
-            as: 'feeHistoryHasOldFee',
-        });
+        // StudentFeeHistoryModel.belongsTo(StudentFeeHistoryModel, {
+        //     foreignKey: { name: 'parentHistoryId', field: 'parent_history_id', allowNull: true },
+        //     as: 'studentOldFeeHistory',
+        // });
+        // StudentFeeHistoryModel.hasMany(StudentFeeHistoryModel, {
+        //     foreignKey: { name: 'parentHistoryId', field: 'parent_history_id', allowNull: true },
+        //     as: 'feeHistoryHasOldFee',
+        // });
         StudentFeeHistoryModel.belongsTo(InstituteModel, {
             foreignKey: { name: 'instituteId', field: 'institute_id' },
             as: 'studentFeeHistoryInstitute',

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

@@ -23,6 +23,5 @@ export declare class StudentFeeTypeCollectionModel extends Model<IStudentFeeType
     readonly updatedAt: Date;
     readonly deletedAt: string;
     static associate(models: any): void;
-    static addHooks(models: any): void;
 }
 export default StudentFeeTypeCollectionModel;

package/dist/models/psql/studentFeeTypeCollectionModel.js

@@ -15,14 +15,14 @@ class StudentFeeTypeCollectionModel extends sequelize_1.Model {
             foreignKey: { name: 'studentFeeCollectionId', field: 'student_fee_collection_id', allowNull: true },
             as: 'collectionHasFeeType',
         });
-        StudentFeeTypeCollectionModel.belongsTo(StudentFeeTypeCollectionModel, {
-            foreignKey: { name: 'oldId', field: 'old_id', allowNull: true },
-            as: 'oldFeeTypeCollection',
-        });
-        StudentFeeTypeCollectionModel.hasMany(StudentFeeTypeCollectionModel, {
-            foreignKey: { name: 'oldId', field: 'old_id', allowNull: true },
-            as: 'feeTypeHasOldCollection',
-        });
+        // StudentFeeTypeCollectionModel.belongsTo(StudentFeeTypeCollectionModel, {
+        //     foreignKey: { name: 'oldId', field: 'old_id', allowNull: true },
+        //     as: 'oldFeeTypeCollection',
+        // });
+        // StudentFeeTypeCollectionModel.hasMany(StudentFeeTypeCollectionModel, {
+        //     foreignKey: { name: 'oldId', field: 'old_id', allowNull: true },
+        //     as: 'feeTypeHasOldCollection',
+        // });
         StudentFeeTypeCollectionModel.belongsTo(InstituteModel, {
             foreignKey: { name: 'instituteId', field: 'institute_id' },
             as: 'feeTypeCollectionInstitute',
@@ -86,9 +86,6 @@ class StudentFeeTypeCollectionModel extends sequelize_1.Model {
             as: 'deletedByUser',
         });
     }
-    static addHooks(models) {
-        StudentFeeTypeCollectionModel.beforeCreate(async (feeCollection) => { });
-    }
 }
 exports.StudentFeeTypeCollectionModel = StudentFeeTypeCollectionModel;
 StudentFeeTypeCollectionModel.init({

package/dist/models/psql/testimonialModel.js

@@ -64,8 +64,9 @@ class TestimonialModel extends sequelize_1.Model {
     static addHooks(models) {
         const { InstituteModel, UserModel, InstituteEntityModel } = models;
         const beforeCreateOrUpdateHook = async (testimonial) => {
+            let institute = null;
             if (testimonial.instituteId) {
-                const institute = await InstituteModel.findByPk(testimonial.instituteId);
+                institute = await InstituteModel.findByPk(testimonial.instituteId);
                 if (!institute) {
                     throw new Error(errorMessages_1.INSTITUTE_ERROR_MESSAGES.NOT_FOUND);
                 }
@@ -80,11 +81,18 @@ class TestimonialModel extends sequelize_1.Model {
             }
             testimonial.class = `${(0, utils_1.fromSnakeCaseToNormalText)(testimonial.userType)}`;
             if (testimonial.userId && testimonial.instituteId && testimonial.userType !== app_1.USER_TYPES.PARENTS) {
-                const meta = await userInstituteMetaModel_1.default.findOne({
+                const userInstituteMetaWhere = {
                     userId: testimonial.userId,
                     instituteId: testimonial.instituteId,
-                    status: app_1.USER_INSTITUTE_META_STATUS.ACCEPTED,
-                });
+                    status: { $in: [app_1.USER_INSTITUTE_META_STATUS.ACCEPTED] },
+                };
+                if (testimonial.academicCalendarId)
+                    userInstituteMetaWhere.academicCalendarId = testimonial.academicCalendarId;
+                if (institute?.type !== null || institute?.subType !== null) {
+                    userInstituteMetaWhere.status = { $in: [app_1.USER_INSTITUTE_META_STATUS.ACCEPTED, app_1.USER_INSTITUTE_META_STATUS.PENDING] };
+                    // userInstituteMetaWhere.details = BOOLEAN_STATUS.YES;
+                }
+                const meta = await userInstituteMetaModel_1.default.findOne(userInstituteMetaWhere);
                 if (!meta) {
                     throw new Error(errorMessages_1.USER_INSTITUTE_META_ERROR_MESSAGES.NOT_FOUND);
                 }
@@ -97,10 +105,7 @@ class TestimonialModel extends sequelize_1.Model {
                         association: 'entityType',
                         required: true,
                         where: {
-                            [sequelize_1.Op.or]: [
-                                { title: { [sequelize_1.Op.iLike]: 'STANDARD' } },
-                                { title: { [sequelize_1.Op.iLike]: 'MEDIUM' } },
-                            ],
+                            [sequelize_1.Op.or]: [{ title: { [sequelize_1.Op.iLike]: 'STANDARD' } }, { title: { [sequelize_1.Op.iLike]: 'MEDIUM' } }],
                         },
                     },
                 });

package/dist/models/psql/userHasPenaltyModel.js

@@ -71,20 +71,20 @@ class UserHasPenaltyModel extends sequelize_1.Model {
             },
             as: 'userHPenaltyUser',
         });
-        UserHasPenaltyModel.belongsTo(StudentFeeCollectionModel, {
-            foreignKey: {
-                name: 'studentFeeCollectionId',
-                field: 'student_fee_collection_id',
-            },
-            as: 'userHPenaltyStudentFee',
-        });
-        StudentFeeCollectionModel.hasMany(UserHasPenaltyModel, {
-            foreignKey: {
-                name: 'studentFeeCollectionId',
-                field: 'student_fee_collection_id',
-            },
-            as: 'studentFeeUHPenalty',
-        });
+        // UserHasPenaltyModel.belongsTo(StudentFeeCollectionModel, {
+        //     foreignKey: {
+        //         name: 'studentFeeCollectionId',
+        //         field: 'student_fee_collection_id',
+        //     },
+        //     as: 'userHPenaltyStudentFee',
+        // });
+        // StudentFeeCollectionModel.hasMany(UserHasPenaltyModel, {
+        //     foreignKey: {
+        //         name: 'studentFeeCollectionId',
+        //         field: 'student_fee_collection_id',
+        //     },
+        //     as: 'studentFeeUHPenalty',
+        // });
         UserHasPenaltyModel.belongsTo(PenaltiesModel, {
             foreignKey: {
                 name: 'penaltyId',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kipicore/dbcore",
-    "version": "1.1.217",
+    "version": "1.1.219",
     "description": "Reusable DB core package with Postgres, MongoDB, models, services, interfaces, and types",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",