@kipicore/dbcore 1.1.473 → 1.1.474

package/dist/constants/app.d.ts

@@ -536,7 +536,9 @@ export declare enum PARENTS_CHILDREN_CURRENT {
 export declare enum USER_PAYOUT_TYPE {
     PERCENTAGE = "PERCENTAGE",
     HOURLY = "HOURLY",
-    MONTHLY = "MONTHLY"
+    MONTHLY = "MONTHLY",
+    ANNUAL = "ANNUAL",
+    NONE = "NONE"
 }
 export declare enum QDC_NAME {
     LAKSHMI_VIKAS_SANKUL_ANR02 = "LAKSHMI_VIKAS_SANKUL_ANR02"

package/dist/constants/app.js

@@ -649,6 +649,8 @@ var USER_PAYOUT_TYPE;
     USER_PAYOUT_TYPE["PERCENTAGE"] = "PERCENTAGE";
     USER_PAYOUT_TYPE["HOURLY"] = "HOURLY";
     USER_PAYOUT_TYPE["MONTHLY"] = "MONTHLY";
+    USER_PAYOUT_TYPE["ANNUAL"] = "ANNUAL";
+    USER_PAYOUT_TYPE["NONE"] = "NONE";
 })(USER_PAYOUT_TYPE || (exports.USER_PAYOUT_TYPE = USER_PAYOUT_TYPE = {}));
 var QDC_NAME;
 (function (QDC_NAME) {

package/dist/db/psql/migrations/20260425000005-create_user_payouts.d.ts

@@ -0,0 +1,2 @@
+export function up(queryInterface: any, Sequelize: any): Promise<void>;
+export function down(queryInterface: any, Sequelize: any): Promise<void>;

package/dist/db/psql/migrations/20260425000005-create_user_payouts.js

@@ -0,0 +1,32 @@
+'use strict';
+module.exports = {
+    up: async (queryInterface, Sequelize) => {
+        const transaction = await queryInterface.sequelize.transaction();
+        try {
+            await queryInterface.changeColumn('user_payouts', 'type', {
+                type: Sequelize.STRING,
+                allowNull: false,
+                defaultValue: 'NONE',
+            }, { transaction });
+            await transaction.commit();
+        }
+        catch (error) {
+            await transaction.rollback();
+            throw error;
+        }
+    },
+    down: async (queryInterface, Sequelize) => {
+        const transaction = await queryInterface.sequelize.transaction();
+        try {
+            await queryInterface.changeColumn('user_payouts', 'type', {
+                type: Sequelize.ENUM('PERCENTAGE', 'HOURLY', 'MONTHLY', 'ANNUAL', 'NONE'),
+                allowNull: false,
+            }, { transaction });
+            await transaction.commit();
+        }
+        catch (error) {
+            await transaction.rollback();
+            throw error;
+        }
+    },
+};

package/dist/db/psql/migrations/20260425000006-create_user_payout_details.d.ts

@@ -0,0 +1,2 @@
+export function up(queryInterface: any, Sequelize: any): Promise<void>;
+export function down(queryInterface: any, Sequelize: any): Promise<void>;

package/dist/db/psql/migrations/20260425000006-create_user_payout_details.js

@@ -0,0 +1,32 @@
+'use strict';
+module.exports = {
+    up: async (queryInterface, Sequelize) => {
+        const transaction = await queryInterface.sequelize.transaction();
+        try {
+            await queryInterface.changeColumn('user_payout_details', 'type', {
+                type: Sequelize.STRING,
+                allowNull: false,
+                defaultValue: 'NONE',
+            }, { transaction });
+            await transaction.commit();
+        }
+        catch (error) {
+            await transaction.rollback();
+            throw error;
+        }
+    },
+    down: async (queryInterface, Sequelize) => {
+        const transaction = await queryInterface.sequelize.transaction();
+        try {
+            await queryInterface.changeColumn('user_payout_details', 'type', {
+                type: Sequelize.ENUM('PERCENTAGE', 'HOURLY', 'MONTHLY', 'ANNUAL', 'NONE'),
+                allowNull: false,
+            }, { transaction });
+            await transaction.commit();
+        }
+        catch (error) {
+            await transaction.rollback();
+            throw error;
+        }
+    },
+};

package/dist/models/psql/userPayoutDetailsModel.js

@@ -68,7 +68,7 @@ UserPayoutDetailsModel.init({
     payableAmount: { type: sequelize_1.DataTypes.FLOAT, allowNull: true, defaultValue: 0, field: 'payable_amount' },
     amountPerHour: { type: sequelize_1.DataTypes.FLOAT, allowNull: true, defaultValue: 0, field: 'amount_per_hour' },
     percentage: { type: sequelize_1.DataTypes.FLOAT, allowNull: true, defaultValue: 0, field: 'percentage' },
-    type: { type: sequelize_1.DataTypes.ENUM, values: Object.values(app_1.USER_PAYOUT_TYPE), allowNull: false },
+    type: { type: sequelize_1.DataTypes.STRING, allowNull: false, defaultValue: app_1.USER_PAYOUT_TYPE.NONE },
     userId: { type: sequelize_1.DataTypes.UUID, allowNull: false, field: 'user_id' },
     instituteId: { type: sequelize_1.DataTypes.UUID, allowNull: false, field: 'institute_id' },
 }, {

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

@@ -17,6 +17,5 @@ declare class UserPayoutModel extends Model<IUserPayoutModelAttributes, TUserPay
     readonly deletedAt: Date;
     readonly updatedAt: Date;
     static associate(models: any): void;
-    static addHooks(models: any): void;
 }
 export default UserPayoutModel;

package/dist/models/psql/userPayoutModel.js

@@ -4,7 +4,6 @@ const sequelize_1 = require("sequelize");
 const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 const date_fns_1 = require("date-fns");
-const utils_1 = require("../../helpers/utils");
 class UserPayoutModel extends sequelize_1.Model {
     static associate(models) {
         const { UserModel, InstituteModel } = models;
@@ -36,181 +35,6 @@ class UserPayoutModel extends sequelize_1.Model {
             foreignKey: { name: 'userId' },
             as: 'userHasPayoutList',
         });
-        // UserPayoutModel.hasMany(UserPayoutDetailsModel, {
-        //     foreignKey: { name: 'userPayoutId' },
-        //     as: 'userPayoutDetailsList',
-        // });
-    }
-    static addHooks(models) {
-        const { UserPayoutDetailsModel, SubjectHasPayFeeHistory, LectureModel, AttendanceModel } = models;
-        const afterCreateOrUpdateHook = async (userPayout, user = null, transaction, filterOptions = {}) => {
-            try {
-                if (!userPayout.userPayoutDetailsList || !userPayout.userPayoutDetailsList.length)
-                    return userPayout;
-                userPayout.userPayoutDetailsList = (0, utils_1.getUniqueArrayByFields)(userPayout.userPayoutDetailsList, ['subjectId']);
-                const options = { transaction };
-                if (user)
-                    options.userId = user.id;
-                const now = new Date();
-                const previousMonthDate = (0, date_fns_1.subMonths)(now, 1);
-                let startOfPreviousMonth = (0, date_fns_1.startOfMonth)(previousMonthDate).toISOString();
-                let endOfPreviousMonth = (0, date_fns_1.endOfMonth)(previousMonthDate).toISOString();
-                if (filterOptions.include) {
-                    filterOptions.include = !Array.isArray(filterOptions.include) ? [filterOptions.include] : filterOptions.include;
-                    const historyListInclude = filterOptions.include.find((include) => include.as === 'userPayoutHistoryList');
-                    let where = {};
-                    if (historyListInclude && historyListInclude.where && historyListInclude.where[sequelize_1.Op.and]) {
-                        where = historyListInclude.where[sequelize_1.Op.and].pop();
-                    }
-                    if (where.payout_start_time && where.payout_end_time) {
-                        startOfPreviousMonth = where.payout_start_time[sequelize_1.Op.gte];
-                        endOfPreviousMonth = where.payout_end_time[sequelize_1.Op.lte];
-                    }
-                }
-                const attendanceWhereAnd = [{ date: { $gte: startOfPreviousMonth } }, { date: { $lte: endOfPreviousMonth } }];
-                const existUserPayout = (await UserPayoutModel.findOne({
-                    where: { id: userPayout.id },
-                    include: [{ association: 'userPayoutDetailsList' }],
-                    transaction,
-                }));
-                if (!existUserPayout)
-                    return userPayout;
-                if (userPayout.type === app_1.USER_PAYOUT_TYPE.PERCENTAGE) {
-                    let feeTotalBySubjectList = await SubjectHasPayFeeHistory.findAll({
-                        where: {
-                            instituteId: existUserPayout.instituteId,
-                            subjectId: {
-                                [sequelize_1.Op.in]: userPayout.userPayoutDetailsList.map(detail => detail.subjectId),
-                            },
-                        },
-                        attributes: [
-                            ['subject_id', 'subjectId'],
-                            [sequelize_1.Sequelize.fn('sum', sequelize_1.Sequelize.col('amount')), 'amount'],
-                        ],
-                        group: ['subject_id', 'created_at'],
-                        raw: true,
-                    });
-                    feeTotalBySubjectList = JSON.parse(JSON.stringify(feeTotalBySubjectList));
-                    userPayout.userPayoutDetailsList = userPayout.userPayoutDetailsList.map(detail => {
-                        detail.payableAmount = feeTotalBySubjectList
-                            .filter((fee) => fee.subjectId === detail.subjectId)
-                            .reduce((sum, record) => {
-                            if (detail.percentage) {
-                                const amount = ((record.amount || 0) * detail.percentage) / 100;
-                                return sum + parseFloat(amount.toFixed(2));
-                            }
-                            return sum;
-                        }, 0);
-                        return detail;
-                    });
-                }
-                if (userPayout.type === app_1.USER_PAYOUT_TYPE.HOURLY) {
-                    let lectureList = (await LectureModel.findAll({
-                        where: {
-                            instituteId: existUserPayout.instituteId,
-                            subject: {
-                                [sequelize_1.Op.in]: userPayout.userPayoutDetailsList.map(detail => detail.subjectId),
-                            },
-                            [sequelize_1.Op.or]: [{ primaryUserId: existUserPayout.userId }, { secondaryUserId: existUserPayout.userId }],
-                        },
-                        include: [{ association: 'workingDay' }],
-                    }));
-                    lectureList = JSON.parse(JSON.stringify(lectureList));
-                    const currentMonthAttendanceList = await AttendanceModel.find({
-                        $and: attendanceWhereAnd,
-                        userType: userPayout.userType,
-                        'users.userId': userPayout.userId,
-                        'users.status': { $ne: app_1.ATTENDANCE_STATUS.ABSENT },
-                    });
-                    userPayout.userPayoutDetailsList = userPayout.userPayoutDetailsList.map(detail => {
-                        let totalMinutes = 0;
-                        currentMonthAttendanceList.forEach((attendance) => {
-                            const dayName = (0, date_fns_1.format)(attendance.date, 'EEEE');
-                            const lecturesByDay = lectureList.filter(lecture => lecture.workingDay.dayName === dayName && lecture.subject === detail.subjectId);
-                            if (lecturesByDay.length) {
-                                totalMinutes += lecturesByDay.reduce((sum, record) => sum + record.slotDuration, 0);
-                            }
-                        });
-                        detail.payableAmount = ((detail.amountPerHour || 0) / app_1.SIXTY) * totalMinutes;
-                        return detail;
-                    });
-                }
-                const userPayoutDetailsList = [];
-                for (let detail of userPayout.userPayoutDetailsList) {
-                    detail.userPayoutId = existUserPayout.id;
-                    detail.userId = existUserPayout.userId;
-                    detail.instituteId = existUserPayout.instituteId;
-                    detail.type = existUserPayout.type;
-                    const found = existUserPayout?.userPayoutDetailsList?.find(existing => detail.userPayoutId === existUserPayout.id &&
-                        detail.instituteId === existing.instituteId &&
-                        detail.userId === existing.userId &&
-                        detail.type === existing.type &&
-                        detail.subjectId === existing.subjectId &&
-                        detail.batchId === existing.batchId);
-                    if (found) {
-                        await UserPayoutDetailsModel.update(detail, { where: { id: found.id }, ...options });
-                    }
-                    else {
-                        detail = (await UserPayoutDetailsModel.create(detail, options));
-                    }
-                    userPayoutDetailsList.push(detail);
-                }
-                if (userPayoutDetailsList.length) {
-                    await UserPayoutDetailsModel.destroy({
-                        where: {
-                            id: { [sequelize_1.Op.notIn]: userPayoutDetailsList.map(detail => detail.id) },
-                            userPayoutId: existUserPayout.id,
-                        },
-                        ...options,
-                    });
-                }
-                const totalPayableAmount = userPayoutDetailsList.reduce((sum, record) => sum + (record.payableAmount || 0), 0);
-                userPayout.userPayoutDetailsList = userPayoutDetailsList;
-                userPayout.totalPayableAmount = totalPayableAmount;
-                return userPayout;
-            }
-            catch (err) {
-                throw err;
-            }
-        };
-        const afterFindHook = async (userPayoutList, options = {}) => {
-            const transaction = await index_1.sequelize.transaction();
-            try {
-                const syncList = JSON.parse(JSON.stringify(userPayoutList));
-                if (!syncList.length) {
-                    await transaction.commit();
-                    return userPayoutList;
-                }
-                const updatedData = [];
-                for (let syncUserPayout of syncList) {
-                    syncUserPayout = await afterCreateOrUpdateHook(syncUserPayout, undefined, transaction, options);
-                    updatedData.push(syncUserPayout);
-                }
-                userPayoutList = userPayoutList.map(payout => {
-                    const found = updatedData.find(one => one.id === payout.id);
-                    if (found) {
-                        payout.totalPayableAmount = found.totalPayableAmount;
-                        payout.userPayoutDetailsList = found.userPayoutDetailsList;
-                    }
-                    return payout;
-                });
-                await transaction.commit();
-                return userPayoutList;
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            }
-            catch (err) {
-                await transaction.rollback();
-                return userPayoutList;
-            }
-        };
-        UserPayoutModel.addHook('afterFind', async (result, options) => {
-            if (options.syncUserPayoutLastCalculatedAt && Array.isArray(result)) {
-                result = (await afterFindHook(result, options));
-            }
-            else if (options.syncUserPayoutLastCalculatedAt && result) {
-                result = (await afterFindHook([result], options)).pop();
-            }
-        });
     }
 }
 UserPayoutModel.init({
@@ -249,9 +73,9 @@ UserPayoutModel.init({
         field: 'total_paid_amount',
     },
     type: {
-        type: sequelize_1.DataTypes.ENUM,
-        values: Object.values(app_1.USER_PAYOUT_TYPE),
+        type: sequelize_1.DataTypes.STRING,
         allowNull: false,
+        defaultValue: app_1.USER_PAYOUT_TYPE.NONE,
     },
     lastCalculatedAt: {
         type: sequelize_1.DataTypes.DATE,

package/package.json

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