@kipicore/dbcore 1.1.204 → 1.1.206

package/dist/constants/errorMessages.d.ts

@@ -1088,7 +1088,8 @@ export declare enum WORK_OFF_DAYS_ERROR_MESSAGES {
     GET_FAIL = "Unable to retrieve Work Off Days Data!",
     UPDATE_FAIL = "Unable to update Work Off Days Data!",
     DELETE_FAIL = "Unable to delete Work Off Days Data!",
-    NOT_FOUND = "Unable to find Work Off Days Data!"
+    NOT_FOUND = "Unable to find Work Off Days Data!",
+    DUPLICATE = "Work Off already exist!"
 }
 export declare enum ADVERTISEMENT_ERROR_MESSAGES {
     CREATE_FAIL = "Unable to save advertisement data!",

package/dist/constants/errorMessages.js

@@ -1205,6 +1205,7 @@ var WORK_OFF_DAYS_ERROR_MESSAGES;
     WORK_OFF_DAYS_ERROR_MESSAGES["UPDATE_FAIL"] = "Unable to update Work Off Days Data!";
     WORK_OFF_DAYS_ERROR_MESSAGES["DELETE_FAIL"] = "Unable to delete Work Off Days Data!";
     WORK_OFF_DAYS_ERROR_MESSAGES["NOT_FOUND"] = "Unable to find Work Off Days Data!";
+    WORK_OFF_DAYS_ERROR_MESSAGES["DUPLICATE"] = "Work Off already exist!";
 })(WORK_OFF_DAYS_ERROR_MESSAGES || (exports.WORK_OFF_DAYS_ERROR_MESSAGES = WORK_OFF_DAYS_ERROR_MESSAGES = {}));
 var ADVERTISEMENT_ERROR_MESSAGES;
 (function (ADVERTISEMENT_ERROR_MESSAGES) {

package/dist/interfaces/subjectHasPayFeeHistoryInterface.d.ts

@@ -5,5 +5,6 @@ export interface ISubjectHasPayFeeHistoryModelAttributes extends IDefaultAttribu
     userId: string;
     subjectId: string;
     feeCollectionId: string;
+    academicCalendarId?: string;
     amount: number;
 }

package/dist/models/psql/feeHistoryModel.js

@@ -91,11 +91,12 @@ class FeeHistoryModel extends sequelize_1.Model {
     }
     static addHooks(models) {
         const { FileStorageModel, FeesCollectionModel, InstituteEntityModel, UserHasSubjectFeeModel, SubjectHasPayFeeHistory } = models;
-        const subjectWiserFeePay = async (instituteId, feeCollectionId, paidFee, userId) => {
+        const subjectWiserFeePay = async (instituteId, feeCollectionId, paidFee, userId, academicCalendarId) => {
             const { InstituteEntityModel, UserHasSubjectFeeModel, FeesCollectionModel, SubjectHasPayFeeHistory } = models;
             const userInstituteMeta = await userInstituteMetaModel_1.default.findOne({
                 userId,
                 instituteId,
+                academicCalendarId,
                 status: app_1.USER_INSTITUTE_META_STATUS.ACCEPTED,
             });
             if (!userInstituteMeta)
@@ -106,7 +107,7 @@ class FeeHistoryModel extends sequelize_1.Model {
             });
             const subjectIds = subjects.map((subject) => subject.id);
             const fees = await UserHasSubjectFeeModel.findAll({
-                where: { subjectId: { [sequelize_1.Op.in]: subjectIds }, instituteId },
+                where: { subjectId: { [sequelize_1.Op.in]: subjectIds }, instituteId, academicCalendarId },
             });
             const feeCollection = await FeesCollectionModel.findByPk(feeCollectionId);
             if (!feeCollection)
@@ -120,6 +121,7 @@ class FeeHistoryModel extends sequelize_1.Model {
                 userId,
                 subjectId: distribution.subjectId,
                 feeCollectionId,
+                academicCalendarId,
                 amount: distribution.amount,
             })));
         };
@@ -153,7 +155,7 @@ class FeeHistoryModel extends sequelize_1.Model {
                 }
             }
             if ((!feeCollection.feeTypeId || feeCollection.feeTypeId.length === 0) && !feeCollection.bankAccountId) {
-                await subjectWiserFeePay(feeCollection.instituteId, feeCollection.feeCollectionId, feeCollection.paidFee, feeCollection.userId);
+                await subjectWiserFeePay(feeCollection.instituteId, feeCollection.feeCollectionId, feeCollection.paidFee, feeCollection.userId, feeCollection.academicCalendarId);
             }
         });
     }

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

@@ -8,6 +8,7 @@ declare class SubjectHasPayFeeHistory extends Model<ISubjectHasPayFeeHistoryMode
     subjectId: string;
     feeCollectionId: string;
     amount: number;
+    academicCalendarId: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/subjectHasPayFeeHistoryModel.js

@@ -101,6 +101,11 @@ SubjectHasPayFeeHistory.init({
         type: sequelize_1.DataTypes.UUID,
         allowNull: false,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
     amount: {
         type: sequelize_1.DataTypes.FLOAT,
         allowNull: false,

package/package.json

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