@kipicore/dbcore 1.1.476 → 1.1.478

package/dist/db/psql/migrations/20260425000008-merge_user_payout_details.d.ts

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

package/dist/db/psql/migrations/20260425000008-merge_user_payout_details.js

@@ -0,0 +1,42 @@
+'use strict';
+module.exports = {
+    up: async (queryInterface, Sequelize) => {
+        const transaction = await queryInterface.sequelize.transaction();
+        try {
+            // Add payout_details to user_payouts
+            await queryInterface.addColumn('user_payouts', 'payout_details', {
+                type: Sequelize.JSONB,
+                allowNull: true,
+                defaultValue: [],
+            }, { transaction });
+            await queryInterface.addColumn('user_payouts', 'start_date', {
+                type: Sequelize.DATE,
+                allowNull: true,
+            }, { transaction });
+            await queryInterface.addColumn('user_payouts', 'end_date', {
+                type: Sequelize.DATE,
+                allowNull: true,
+            }, { transaction });
+            await queryInterface.dropTable('user_payout_details', { transaction });
+            await transaction.commit();
+        }
+        catch (error) {
+            await transaction.rollback();
+            throw error;
+        }
+    },
+    down: async (queryInterface) => {
+        const transaction = await queryInterface.sequelize.transaction();
+        try {
+            // Remove columns from user_payouts
+            await queryInterface.removeColumn('user_payouts', 'payout_details', { transaction });
+            await queryInterface.removeColumn('user_payouts', 'start_date', { transaction });
+            await queryInterface.removeColumn('user_payouts', 'end_date', { transaction });
+            await transaction.commit();
+        }
+        catch (error) {
+            await transaction.rollback();
+            throw error;
+        }
+    },
+};

package/dist/interfaces/index.d.ts

@@ -110,7 +110,6 @@ export * from './userInstituteMetaInterface';
 export * from './userInterface';
 export * from './userLeaveRequestInterface';
 export * from './userMetaInterface';
-export * from './userPayoutDetailsInterface';
 export * from './userPayoutInterface';
 export * from './userProjectAssessmentOptionInterface';
 export * from './userRequiredStepsInterface';

package/dist/interfaces/index.js

@@ -126,7 +126,6 @@ __exportStar(require("./userInstituteMetaInterface"), exports);
 __exportStar(require("./userInterface"), exports);
 __exportStar(require("./userLeaveRequestInterface"), exports);
 __exportStar(require("./userMetaInterface"), exports);
-__exportStar(require("./userPayoutDetailsInterface"), exports);
 __exportStar(require("./userPayoutInterface"), exports);
 __exportStar(require("./userProjectAssessmentOptionInterface"), exports);
 __exportStar(require("./userRequiredStepsInterface"), exports);

package/dist/interfaces/userPayoutInterface.d.ts

@@ -1,5 +1,13 @@
 import { IDefaultAttributes } from './commonInterface';
 import { USER_PAYOUT_TYPE, USER_TYPES } from '../constants/app';
+export interface IUserPayoutDetails {
+    subjectId?: string;
+    batchId?: string;
+    amountPerHour?: number;
+    payableAmount?: number;
+    percentage?: number;
+    type?: USER_PAYOUT_TYPE;
+}
 export interface IUserPayoutModelAttributes extends IDefaultAttributes {
     id: string;
     userId: string;
@@ -9,5 +17,8 @@ export interface IUserPayoutModelAttributes extends IDefaultAttributes {
     totalPayableAmount?: number;
     totalPaidAmount?: number;
     type: USER_PAYOUT_TYPE;
+    payoutDetails?: IUserPayoutDetails[];
+    startDate?: Date;
+    endDate?: Date;
     lastCalculatedAt: Date;
 }

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

@@ -83,7 +83,6 @@ export { default as UserHasStorageModel } from './userHasStorageModel';
 export { default as UserHasSubjectFeeModel } from './userHasSubjectFeeModel';
 export { default as UserLeaveRequestModel } from './userLeaveRequestModel';
 export { default as UserModel } from './userModel';
-export { default as UserPayoutDetailsModel } from './userPayoutDetailsModel';
 export { default as UserPayoutModel } from './userPayoutModel';
 export { default as UserProjectAssessmentOptionModel } from './userProjectAssessmentOptionModel';
 export { default as UserRequiredStepsModel } from './userRequiredStepsModel';

package/dist/models/psql/index.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectAssessmentOptionModel = exports.ProductModel = exports.PincodeModel = exports.PdcHistoryModel = exports.PdcChequeModel = exports.OfferModel = exports.ModuleModel = exports.ModuleFeatureModel = exports.MasterLeaveModel = exports.LectureModel = exports.LectureHistoryModel = exports.InventoryModel = exports.InventoryHistoryModel = exports.InstituteSubscriptionPlanModel = exports.InstituteModel = exports.InstituteEntityTypeModel = exports.InstituteEntityModel = exports.HomeWorkModel = exports.GreetingsModel = exports.FloorManagementModel = exports.FileStorageModel = exports.FeeReminderSettingModel = exports.FeeReminderModel = exports.FeatureActionModel = exports.FacilityModel = exports.EntityGroupModel = exports.DriverModel = exports.CourseModel = exports.CourseHasVisitorsModel = exports.CountryModel = exports.ContactFeedBackModel = exports.CoinPurchaseOfferModel = exports.CloudStorageModel = exports.ClassRoomModel = exports.CityModel = exports.CategoriesModel = exports.BookAssessmentDateModel = exports.BatchSubjectProjectAssessmentModel = exports.BatchSubjectBookAssessmentModel = exports.BatchModel = exports.BannerModel = exports.BankAccountDetailsModel = exports.AreaModel = exports.AnnouncementModel = exports.AccountHasReceiptDetailsModel = exports.AcademicCalendarModel = exports.SubCategoriesModel = exports.Sequelize = exports.db = exports.sequelize = void 0;
-exports.CloneListModel = exports.IncomeExpenseModel = exports.MaintenanceModel = exports.WorkOffDaysModel = exports.EntityWiseCalendarModel = exports.CampusModel = exports.LostFoundItemModel = exports.WorkingShiftModel = exports.WorkingDayModel = exports.WalletModel = exports.WalletHistoryModel = exports.VendorManagementModel = exports.VehicleModel = exports.UserRequiredStepsModel = exports.UserProjectAssessmentOptionModel = exports.UserPayoutModel = exports.UserPayoutDetailsModel = exports.UserModel = exports.UserLeaveRequestModel = exports.UserHasSubjectFeeModel = exports.UserHasStorageModel = exports.UserHasRollNumberModel = exports.UserHasRoleModel = exports.UserHasParentModel = exports.UserHasOfferModel = exports.UserHasLeaveModel = exports.UserHasLeaveHistoryModel = exports.UserHasInventoryModel = exports.UserHasInventoryHistoryModel = exports.UserHasHomeWorkModel = exports.UserHasFileModel = exports.UserHasDeviceModel = exports.UserHasCourseModel = exports.UserHasBatchModel = exports.UserHasAnnouncementModel = exports.UserBookAssessmentModel = exports.TypeManagementModel = exports.TripModel = exports.TokenModel = exports.ToDoModel = exports.TestimonialModel = exports.SyllabusModel = exports.SubjectHasPayFeeHistoryModel = exports.SubjectHasFeeModel = exports.StateModel = exports.SlotModel = exports.SendNotificationModel = exports.SchoolOfferModel = exports.RulesRegulationModel = exports.RoleModel = void 0;
-exports.PayoutTransactionHistoryModel = exports.AdditionalPayoutModel = exports.LoanEmiModel = exports.UserLoanModel = exports.NoticeboardModel = exports.UserPermissionModel = exports.RoleManagementModel = exports.PermissionModel = exports.DesignationModel = exports.AdditionalPayoutTypeModel = exports.VisitorBookModel = exports.PostalDispatchModel = exports.CallRegisterModel = exports.UserHasOfferAndDiscountModel = exports.UserAcceptedTermsAndCondition = exports.SubjectInternalMarkModel = exports.InternalMarkModel = exports.TermsAndConditionModel = exports.FeeType1Model = exports.StudentFeeTermsModel = exports.UserHasPenaltyModel = exports.PenaltyModel = exports.ClassRoomCollectionModel = exports.ClassRoomEventModel = exports.StudentFeeTypeCollectionModel = exports.SchoolFeeTermsModel = exports.StudentFeeHistoryModel = exports.StudentFeeCollectionModel = exports.UserDirectoryModel = exports.StudentLeaveRequestModel = void 0;
+exports.StudentLeaveRequestModel = exports.CloneListModel = exports.IncomeExpenseModel = exports.MaintenanceModel = exports.WorkOffDaysModel = exports.EntityWiseCalendarModel = exports.CampusModel = exports.LostFoundItemModel = exports.WorkingShiftModel = exports.WorkingDayModel = exports.WalletModel = exports.WalletHistoryModel = exports.VendorManagementModel = exports.VehicleModel = exports.UserRequiredStepsModel = exports.UserProjectAssessmentOptionModel = exports.UserPayoutModel = exports.UserModel = exports.UserLeaveRequestModel = exports.UserHasSubjectFeeModel = exports.UserHasStorageModel = exports.UserHasRollNumberModel = exports.UserHasRoleModel = exports.UserHasParentModel = exports.UserHasOfferModel = exports.UserHasLeaveModel = exports.UserHasLeaveHistoryModel = exports.UserHasInventoryModel = exports.UserHasInventoryHistoryModel = exports.UserHasHomeWorkModel = exports.UserHasFileModel = exports.UserHasDeviceModel = exports.UserHasCourseModel = exports.UserHasBatchModel = exports.UserHasAnnouncementModel = exports.UserBookAssessmentModel = exports.TypeManagementModel = exports.TripModel = exports.TokenModel = exports.ToDoModel = exports.TestimonialModel = exports.SyllabusModel = exports.SubjectHasPayFeeHistoryModel = exports.SubjectHasFeeModel = exports.StateModel = exports.SlotModel = exports.SendNotificationModel = exports.SchoolOfferModel = exports.RulesRegulationModel = exports.RoleModel = void 0;
+exports.PayoutTransactionHistoryModel = exports.AdditionalPayoutModel = exports.LoanEmiModel = exports.UserLoanModel = exports.NoticeboardModel = exports.UserPermissionModel = exports.RoleManagementModel = exports.PermissionModel = exports.DesignationModel = exports.AdditionalPayoutTypeModel = exports.VisitorBookModel = exports.PostalDispatchModel = exports.CallRegisterModel = exports.UserHasOfferAndDiscountModel = exports.UserAcceptedTermsAndCondition = exports.SubjectInternalMarkModel = exports.InternalMarkModel = exports.TermsAndConditionModel = exports.FeeType1Model = exports.StudentFeeTermsModel = exports.UserHasPenaltyModel = exports.PenaltyModel = exports.ClassRoomCollectionModel = exports.ClassRoomEventModel = exports.StudentFeeTypeCollectionModel = exports.SchoolFeeTermsModel = exports.StudentFeeHistoryModel = exports.StudentFeeCollectionModel = exports.UserDirectoryModel = void 0;
 const sequelize_1 = require("sequelize");
 Object.defineProperty(exports, "Sequelize", { enumerable: true, get: function () { return sequelize_1.Sequelize; } });
 const postgresConfig = require('../../configs/postgresConfig');
@@ -260,8 +260,6 @@ var userLeaveRequestModel_1 = require("./userLeaveRequestModel");
 Object.defineProperty(exports, "UserLeaveRequestModel", { enumerable: true, get: function () { return __importDefault(userLeaveRequestModel_1).default; } });
 var userModel_1 = require("./userModel");
 Object.defineProperty(exports, "UserModel", { enumerable: true, get: function () { return __importDefault(userModel_1).default; } });
-var userPayoutDetailsModel_1 = require("./userPayoutDetailsModel");
-Object.defineProperty(exports, "UserPayoutDetailsModel", { enumerable: true, get: function () { return __importDefault(userPayoutDetailsModel_1).default; } });
 var userPayoutModel_1 = require("./userPayoutModel");
 Object.defineProperty(exports, "UserPayoutModel", { enumerable: true, get: function () { return __importDefault(userPayoutModel_1).default; } });
 var userProjectAssessmentOptionModel_1 = require("./userProjectAssessmentOptionModel");

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

@@ -1,5 +1,5 @@
 import { Model } from 'sequelize';
-import { IUserPayoutModelAttributes } from '../../interfaces/userPayoutInterface';
+import { IUserPayoutDetails, IUserPayoutModelAttributes } from '../../interfaces/userPayoutInterface';
 import { TUserPayoutModelCreationAttributes } from '../../types/userPayoutType';
 import { USER_PAYOUT_TYPE, USER_TYPES } from '../../constants/app';
 declare class UserPayoutModel extends Model<IUserPayoutModelAttributes, TUserPayoutModelCreationAttributes> {
@@ -11,6 +11,9 @@ declare class UserPayoutModel extends Model<IUserPayoutModelAttributes, TUserPay
     totalPayableAmount: number;
     totalPaidAmount: number;
     type: USER_PAYOUT_TYPE;
+    payoutDetails: IUserPayoutDetails[];
+    startDate: Date;
+    endDate: Date;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/userPayoutModel.js

@@ -82,6 +82,22 @@ UserPayoutModel.init({
         allowNull: false,
         defaultValue: app_1.USER_PAYOUT_TYPE.NONE,
     },
+    payoutDetails: {
+        type: sequelize_1.DataTypes.JSONB,
+        allowNull: true,
+        defaultValue: [],
+        field: 'payout_details',
+    },
+    startDate: {
+        type: sequelize_1.DataTypes.DATE,
+        allowNull: true,
+        field: 'start_date',
+    },
+    endDate: {
+        type: sequelize_1.DataTypes.DATE,
+        allowNull: true,
+        field: 'end_date',
+    },
     lastCalculatedAt: {
         type: sequelize_1.DataTypes.DATE,
         defaultValue: (0, date_fns_1.startOfToday)(),

package/dist/types/index.d.ts

@@ -101,7 +101,6 @@ export * from './userHasSubjectFeeType';
 export * from './userInstituteMetaType';
 export * from './userLeaveRequestType';
 export * from './userMetaType';
-export * from './userPayoutDetailsType';
 export * from './userPayoutType';
 export * from './userProjectAssessmentOptionType';
 export * from './userRequiredStepsType';

package/dist/types/index.js

@@ -117,7 +117,6 @@ __exportStar(require("./userHasSubjectFeeType"), exports);
 __exportStar(require("./userInstituteMetaType"), exports);
 __exportStar(require("./userLeaveRequestType"), exports);
 __exportStar(require("./userMetaType"), exports);
-__exportStar(require("./userPayoutDetailsType"), exports);
 __exportStar(require("./userPayoutType"), exports);
 __exportStar(require("./userProjectAssessmentOptionType"), exports);
 __exportStar(require("./userRequiredStepsType"), exports);

package/dist/types/userPayoutType.d.ts

@@ -1,7 +1,3 @@
 import { Optional } from 'sequelize';
 import { IUserPayoutModelAttributes } from '../interfaces/userPayoutInterface';
-import { TUserPayoutDetailsModelCreationAttributes } from './userPayoutDetailsType';
 export type TUserPayoutModelCreationAttributes = Optional<IUserPayoutModelAttributes, 'id'>;
-export type TUserPayoutWithDetails = IUserPayoutModelAttributes & {
-    userPayoutDetailsList: TUserPayoutDetailsModelCreationAttributes[];
-};

package/package.json

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

package/dist/interfaces/userPayoutDetailsInterface.d.ts

@@ -1,14 +0,0 @@
-import { IDefaultAttributes } from './commonInterface';
-import { USER_PAYOUT_TYPE } from '../constants/app';
-export interface IUserPayoutDetailsModelAttributes extends IDefaultAttributes {
-    id: string;
-    subjectId: string;
-    batchId: string;
-    userPayoutId: string;
-    amountPerHour?: number;
-    payableAmount: number;
-    percentage?: number;
-    type: USER_PAYOUT_TYPE;
-    userId: string;
-    instituteId: string;
-}

package/dist/interfaces/userPayoutDetailsInterface.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,22 +0,0 @@
-import { Model } from 'sequelize';
-import { IUserPayoutDetailsModelAttributes } from '../../interfaces/userPayoutDetailsInterface';
-import { TUserPayoutDetailsModelCreationAttributes } from '../../types/userPayoutDetailsType';
-import { USER_PAYOUT_TYPE } from '../../constants/app';
-declare class UserPayoutDetailsModel extends Model<IUserPayoutDetailsModelAttributes, TUserPayoutDetailsModelCreationAttributes> {
-    id: string;
-    subjectId: string;
-    batchId: string;
-    userPayoutId: string;
-    amountPerHour?: number;
-    percentage?: number;
-    type: USER_PAYOUT_TYPE;
-    payableAmount: number;
-    createdBy: string;
-    updatedBy: string;
-    deletedBy: string;
-    readonly createdAt: Date;
-    readonly deletedAt: Date;
-    readonly updatedAt: Date;
-    static associate(models: any): void;
-}
-export default UserPayoutDetailsModel;

package/dist/models/psql/userPayoutDetailsModel.js

@@ -1,81 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const sequelize_1 = require("sequelize");
-const index_1 = require("./index");
-const app_1 = require("../../constants/app");
-class UserPayoutDetailsModel extends sequelize_1.Model {
-    static associate(models) {
-        const { UserModel, InstituteModel, BatchModel, InstituteEntityModel, UserPayoutModel } = models;
-        UserPayoutDetailsModel.belongsTo(UserModel, {
-            foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' },
-            as: 'createdByUser',
-        });
-        UserPayoutDetailsModel.belongsTo(UserModel, {
-            foreignKey: { name: 'updatedBy', allowNull: true, field: 'updated_by' },
-            as: 'updatedByUser',
-        });
-        UserPayoutDetailsModel.belongsTo(UserModel, {
-            foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
-            as: 'deletedByUser',
-        });
-        UserPayoutDetailsModel.belongsTo(UserModel, {
-            foreignKey: { name: 'userId' },
-            as: 'user',
-        });
-        UserModel.hasMany(UserPayoutDetailsModel, {
-            foreignKey: { name: 'userId' },
-            as: 'userHasPayoutDetailsList',
-        });
-        UserPayoutDetailsModel.belongsTo(InstituteModel, {
-            foreignKey: { name: 'instituteId' },
-            as: 'institute',
-        });
-        InstituteModel.hasMany(UserPayoutDetailsModel, {
-            foreignKey: { name: 'instituteId' },
-            as: 'instituteHasPayoutDetailsList',
-        });
-        UserPayoutDetailsModel.belongsTo(BatchModel, {
-            foreignKey: { name: 'batchId' },
-            as: 'batch',
-        });
-        BatchModel.hasMany(UserPayoutDetailsModel, {
-            foreignKey: { name: 'batchId' },
-            as: 'batchHasPayoutDetailsList',
-        });
-        UserPayoutDetailsModel.belongsTo(InstituteEntityModel, {
-            foreignKey: { name: 'subjectId' },
-            as: 'subject',
-        });
-        InstituteEntityModel.hasMany(UserPayoutDetailsModel, {
-            foreignKey: { name: 'subjectId' },
-            as: 'subjectHasPayoutDetailsList',
-        });
-        UserPayoutDetailsModel.belongsTo(UserPayoutModel, {
-            foreignKey: { name: 'userPayoutId' },
-            as: 'userPayout',
-        });
-        UserPayoutModel.hasMany(UserPayoutDetailsModel, {
-            foreignKey: { name: 'userPayoutId' },
-            as: 'userPayoutDetailsList',
-        });
-    }
-}
-UserPayoutDetailsModel.init({
-    id: { type: sequelize_1.DataTypes.UUID, defaultValue: sequelize_1.DataTypes.UUIDV4, allowNull: false, primaryKey: true },
-    subjectId: { type: sequelize_1.DataTypes.UUID, allowNull: false, field: 'subject_id' },
-    batchId: { type: sequelize_1.DataTypes.UUID, allowNull: false, field: 'batch_id' },
-    userPayoutId: { type: sequelize_1.DataTypes.UUID, allowNull: false, field: 'user_payout_id' },
-    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.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' },
-}, {
-    modelName: 'UserPayoutDetailsModel',
-    tableName: 'user_payout_details',
-    timestamps: true,
-    paranoid: true,
-    sequelize: index_1.sequelize,
-});
-exports.default = UserPayoutDetailsModel;

package/dist/types/userPayoutDetailsType.d.ts

@@ -1,3 +0,0 @@
-import { Optional } from 'sequelize';
-import { IUserPayoutDetailsModelAttributes } from '../interfaces/userPayoutDetailsInterface';
-export type TUserPayoutDetailsModelCreationAttributes = Optional<IUserPayoutDetailsModelAttributes, 'id'>;

package/dist/types/userPayoutDetailsType.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });