@kipicore/dbcore 1.1.188 → 1.1.190

package/dist/db/psql/migrations/20260105053705-school_fee_terms.js

@@ -0,0 +1,192 @@
+"use strict";
+const up = async (queryInterface, Sequelize) => {
+    const tableName = 'school_fee_terms';
+    const tableExists = await queryInterface
+        .describeTable(tableName)
+        .then(() => true)
+        .catch(() => false);
+    if (!tableExists) {
+        await queryInterface.createTable(tableName, {
+            id: {
+                type: Sequelize.UUID,
+                defaultValue: Sequelize.UUIDV4,
+                allowNull: false,
+                primaryKey: true,
+            },
+            instituteId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'institute_id',
+            },
+            academicCalendarId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'academic_calendar_id',
+            },
+            stdId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'std_id',
+            },
+            feeTypeId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'fee_type_id',
+            },
+            frequency: {
+                type: Sequelize.STRING,
+                allowNull: true,
+            },
+            amount: {
+                type: Sequelize.INTEGER,
+                allowNull: true,
+            },
+            date: {
+                type: Sequelize.DATE,
+                allowNull: true,
+            },
+            oldId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'old_id',
+            },
+            termsDependedId: {
+                type: Sequelize.STRING,
+                allowNull: true,
+                field: 'terms_depended_id',
+            },
+            createdBy: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'created_by',
+            },
+            updatedBy: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'updated_by',
+            },
+            deletedBy: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'deleted_by',
+            },
+            createdAt: {
+                type: Sequelize.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.NOW,
+                field: 'created_at',
+            },
+            updatedAt: {
+                type: Sequelize.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.NOW,
+                field: 'updated_at',
+            },
+            deletedAt: {
+                type: Sequelize.DATE,
+                allowNull: true,
+                field: 'deleted_at',
+            },
+        });
+    }
+    else {
+        const tableDefinition = await queryInterface.describeTable(tableName);
+        const columnsToAdd = {
+            instituteId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'institute_id',
+            },
+            academicCalendarId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'academic_calendar_id',
+            },
+            stdId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'std_id',
+            },
+            feeTypeId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'fee_type_id',
+            },
+            frequency: {
+                type: Sequelize.STRING,
+                allowNull: true,
+            },
+            amount: {
+                type: Sequelize.INTEGER,
+                allowNull: true,
+            },
+            date: {
+                type: Sequelize.DATE,
+                allowNull: true,
+            },
+            oldId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'old_id',
+            },
+            termsDependedId: {
+                type: Sequelize.STRING,
+                allowNull: true,
+                field: 'terms_depended_id',
+            },
+            createdBy: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'created_by',
+            },
+            updatedBy: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'updated_by',
+            },
+            deletedBy: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'deleted_by',
+            },
+            createdAt: {
+                type: Sequelize.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.NOW,
+                field: 'created_at',
+            },
+            updatedAt: {
+                type: Sequelize.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.NOW,
+                field: 'updated_at',
+            },
+            deletedAt: {
+                type: Sequelize.DATE,
+                allowNull: true,
+                field: 'deleted_at',
+            },
+        };
+        for (const column of Object.keys(columnsToAdd)) {
+            const columnToAdd = columnsToAdd[column];
+            const tableColumn = columnToAdd.field || column;
+            if (!tableDefinition[tableColumn]) {
+                await queryInterface.addColumn(tableName, tableColumn, columnToAdd);
+            }
+        }
+    }
+};
+const down = async (queryInterface) => {
+    const tableName = 'school_fee_terms';
+    const tableExists = await queryInterface
+        .describeTable(tableName)
+        .then(() => true)
+        .catch(() => false);
+    if (tableExists) {
+        await queryInterface.dropTable(tableName);
+    }
+};
+module.exports = {
+    up,
+    down,
+};

package/dist/db/psql/migrations/20260105070348-student_feeType_collection.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/20260105070348-student_feeType_collection.js

@@ -0,0 +1,204 @@
+"use strict";
+const up = async (queryInterface, Sequelize) => {
+    const tableName = 'student_fee_type_collection';
+    const tableExists = await queryInterface
+        .describeTable(tableName)
+        .then(() => true)
+        .catch(() => false);
+    if (!tableExists) {
+        await queryInterface.createTable(tableName, {
+            id: {
+                type: Sequelize.UUID,
+                defaultValue: Sequelize.UUIDV4,
+                allowNull: false,
+                primaryKey: true,
+            },
+            instituteId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'institute_id',
+            },
+            userId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'user_id',
+            },
+            academicCalendarId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'academic_calendar_id',
+            },
+            studentFeeCollectionId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'student_fee_collection_id',
+            },
+            feeTypeId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'fee_type_id',
+            },
+            oldId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'old_id',
+            },
+            amount: {
+                type: Sequelize.INTEGER,
+                allowNull: true,
+            },
+            paidAmount: {
+                type: Sequelize.INTEGER,
+                allowNull: true,
+                field: 'paid_amount',
+            },
+            discount: {
+                type: Sequelize.INTEGER,
+                allowNull: true,
+            },
+            status: {
+                type: Sequelize.STRING,
+                allowNull: true,
+                defaultValue: 'PENDING',
+            },
+            createdBy: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'created_by',
+            },
+            updatedBy: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'updated_by',
+            },
+            deletedBy: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'deleted_by',
+            },
+            createdAt: {
+                type: Sequelize.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.NOW,
+                field: 'created_at',
+            },
+            updatedAt: {
+                type: Sequelize.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.NOW,
+                field: 'updated_at',
+            },
+            deletedAt: {
+                type: Sequelize.DATE,
+                allowNull: true,
+                field: 'deleted_at',
+            },
+        });
+    }
+    else {
+        const tableDefinition = await queryInterface.describeTable(tableName);
+        const columnsToAdd = {
+            instituteId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'institute_id',
+            },
+            userId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'user_id',
+            },
+            academicCalendarId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'academic_calendar_id',
+            },
+            studentFeeCollectionId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'student_fee_collection_id',
+            },
+            feeTypeId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'fee_type_id',
+            },
+            oldId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'old_id',
+            },
+            amount: {
+                type: Sequelize.INTEGER,
+                allowNull: true,
+            },
+            paidAmount: {
+                type: Sequelize.INTEGER,
+                allowNull: true,
+                field: 'paid_amount',
+            },
+            discount: {
+                type: Sequelize.INTEGER,
+                allowNull: true,
+            },
+            status: {
+                type: Sequelize.STRING,
+                allowNull: true,
+                defaultValue: 'PENDING',
+            },
+            createdBy: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'created_by',
+            },
+            updatedBy: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'updated_by',
+            },
+            deletedBy: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'deleted_by',
+            },
+            createdAt: {
+                type: Sequelize.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.NOW,
+                field: 'created_at',
+            },
+            updatedAt: {
+                type: Sequelize.DATE,
+                allowNull: false,
+                defaultValue: Sequelize.NOW,
+                field: 'updated_at',
+            },
+            deletedAt: {
+                type: Sequelize.DATE,
+                allowNull: true,
+                field: 'deleted_at',
+            },
+        };
+        for (const column of Object.keys(columnsToAdd)) {
+            const columnToAdd = columnsToAdd[column];
+            const tableColumn = columnToAdd.field || column;
+            if (!tableDefinition[tableColumn]) {
+                await queryInterface.addColumn(tableName, tableColumn, columnToAdd);
+            }
+        }
+    }
+};
+const down = async (queryInterface) => {
+    const tableName = 'student_fee_type_collection';
+    const tableExists = await queryInterface
+        .describeTable(tableName)
+        .then(() => true)
+        .catch(() => false);
+    if (tableExists) {
+        await queryInterface.dropTable(tableName);
+    }
+};
+module.exports = {
+    up,
+    down,
+};

package/dist/interfaces/feeTypeInterface.d.ts

@@ -7,7 +7,12 @@ export interface IFeeTypeModelAttributes extends IDefaultAttributes {
     feeType: FEE_TYPE;
     module: COMMAN_STATUS;
     status: COMMAN_STATUS;
-    account: string;
+    account: string[];
+    isCreditAllowed: boolean;
+    isCashAllowed: boolean;
+    isRefundable: boolean;
+    isTaxable: boolean;
+    isRequired: boolean;
     instituteId: string;
     isDefault: BOOLEAN_STATUS;
     academicCalendarId: string;

package/dist/interfaces/index.d.ts

@@ -165,5 +165,9 @@ export * from './userDirectoryInterface';
 export * from './feeConfigInterface';
 export * from './schoolFee1Interface';
 export * from './instituteFeeInterface';
+export * from './studentFeeCollectionInterface';
+export * from './studentFeeHistoryInterface';
+export * from './schoolFeeTermsInterface';
+export * from './studentFeeTypeCollectionInterface';
 export * from './classRoomEventInterface';
 export * from './classRoomCollectionInterface';

package/dist/interfaces/index.js

@@ -181,5 +181,9 @@ __exportStar(require("./userDirectoryInterface"), exports);
 __exportStar(require("./feeConfigInterface"), exports);
 __exportStar(require("./schoolFee1Interface"), exports);
 __exportStar(require("./instituteFeeInterface"), exports);
+__exportStar(require("./studentFeeCollectionInterface"), exports);
+__exportStar(require("./studentFeeHistoryInterface"), exports);
+__exportStar(require("./schoolFeeTermsInterface"), exports);
+__exportStar(require("./studentFeeTypeCollectionInterface"), exports);
 __exportStar(require("./classRoomEventInterface"), exports);
 __exportStar(require("./classRoomCollectionInterface"), exports);

package/dist/interfaces/schoolFee1Interface.d.ts

@@ -10,17 +10,12 @@ export interface IFeeStructure {
     totalAmount: number;
     frequency: PAYMENT_TERMS_TYPE;
     isNotApplicableForGirls: boolean;
-    isRefundable: boolean;
-    isTaxable: boolean;
-    isRequired: boolean;
     title: string;
 }
 export interface IFee1Schema {
     feeTypeId: string;
-    isCreditAllowed: boolean;
     paymentMethod: PAYMENT_TYPE[];
-    bankIds: string[];
-    fesStructure: IFeeStructure[];
+    feeStructure: IFeeStructure[];
 }
 export interface ISchoolFee1ModelAttributes extends IDefaultAttributes, Document {
     id: string;

package/dist/interfaces/schoolFeeTermsInterface.d.ts

@@ -0,0 +1,14 @@
+import { PAYMENT_TERMS_TYPE } from '../constants';
+import { IDefaultAttributes } from './commonInterface';
+export interface ISchoolFeeTermsModelAttributes extends IDefaultAttributes {
+    id: string;
+    instituteId: string;
+    academicCalendarId: string;
+    stdId: string;
+    feeTypeId: string;
+    frequency: PAYMENT_TERMS_TYPE;
+    amount: number;
+    date: Date;
+    oldId?: string;
+    termsDependedId: string;
+}

package/dist/interfaces/schoolFeeTermsInterface.js

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

package/dist/interfaces/studentFeeCollectionInterface.d.ts

@@ -0,0 +1,18 @@
+import { STUDENT_FEE_COLLECTION_STATUS } from '../constants/app';
+import { IDefaultAttributes } from './commonInterface';
+export interface IStudentFeeCollectionModelAttributes extends IDefaultAttributes {
+    id: string;
+    userId: string;
+    academicCalendarId: string;
+    instituteId: string;
+    oldId?: string;
+    status: STUDENT_FEE_COLLECTION_STATUS;
+    oldPendingAmount: number;
+    discount: number;
+    settleUpFee: number;
+    paidFee: number;
+    totalFee: number;
+    collectionDependedId: string;
+    carryForwardTo: string;
+    carryForwardFee: number;
+}

package/dist/interfaces/studentFeeCollectionInterface.js

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

package/dist/interfaces/studentFeeHistoryInterface.d.ts

@@ -0,0 +1,23 @@
+import { FEE_HISTORY_STATUS, PAYMENT_TYPE } from '../constants/app';
+import { IDefaultAttributes } from './commonInterface';
+export interface IStudentFeeHistoryModelAttributes extends IDefaultAttributes {
+    id: string;
+    instituteId: string;
+    userId: string;
+    academicCalendarId: string;
+    parentHistoryId?: string;
+    paymentType: PAYMENT_TYPE;
+    paidFee: number;
+    status: FEE_HISTORY_STATUS;
+    feeTypeId?: string[];
+    bankAccountId?: string;
+    invoicePdf?: string;
+    invoiceNumber?: string;
+    studentFeeCollectionId: string;
+    feeHistoryConfigId?: string;
+    note?: string;
+    paidDate: Date;
+    upiId?: string;
+    bankName?: string;
+    chequeNo?: string;
+}

package/dist/interfaces/studentFeeHistoryInterface.js

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

package/dist/interfaces/studentFeeTypeCollectionInterface.d.ts

@@ -0,0 +1,15 @@
+import { STUDENT_FEE_COLLECTION_STATUS } from '../constants/app';
+import { IDefaultAttributes } from './commonInterface';
+export interface IStudentFeeTypeCollectionModelAttributes extends IDefaultAttributes {
+    id: string;
+    instituteId: string;
+    userId: string;
+    academicCalendarId: string;
+    studentFeeCollectionId: string;
+    feeTypeId: string;
+    amount: number;
+    status: STUDENT_FEE_COLLECTION_STATUS;
+    paidAmount: number;
+    discount: number;
+    oldId?: string;
+}

package/dist/interfaces/studentFeeTypeCollectionInterface.js

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

package/dist/models/mongodb/schoolFee1Model.js

@@ -82,36 +82,39 @@ const feeStructureSchema = new mongoose_1.Schema({
         type: Boolean,
         default: false,
     },
-    isRefundable: {
-        type: Boolean,
-        default: false,
-    },
-    isTaxable: {
-        type: Boolean,
-        default: false,
-    },
-    isRequired: {
-        type: Boolean,
-    },
+    // isRefundable: {
+    //     type: Boolean,
+    //     default: false,
+    // },
+    // isTaxable: {
+    //     type: Boolean,
+    //     default: false,
+    // },
+    // isRequired: {
+    //     type: Boolean,
+    // },
 }, { _id: false });
 const feeSchema = new mongoose_1.Schema({
     feeTypeId: {
         type: String,
         required: true,
     },
-    isCreditAllowed: {
-        type: Boolean,
-    },
+    // isCreditAllowed: {
+    //     type: Boolean,
+    // },
     paymentMethod: {
         type: [String],
         enum: Object.values(app_1.PAYMENT_TYPE),
         default: [],
     },
-    bankIds: {
-        type: [String],
-        default: [],
-    },
-    fesStructure: {
+    // bankIds: {
+    //     type: [String],
+    //     default: [],
+    // },
+    // isCashAllowed: {
+    //     type: Boolean,
+    // },
+    feeStructure: {
         type: [feeStructureSchema],
         required: true,
         default: [],
@@ -162,7 +165,7 @@ const schoolFee1Schema = new mongoose_1.Schema({
 schoolFee1Schema.pre('save', async function (next) {
     const schoolFee1 = this;
     try {
-        if (!schoolFee1.fees || schoolFee1.fees.length === 0 || schoolFee1.fees.every(fee => fee.fesStructure.length === 0)) {
+        if (!schoolFee1.fees || schoolFee1.fees.length === 0 || schoolFee1.fees.every(fee => fee.feeStructure.length === 0)) {
             return next(new Error('Fees array cannot be empty.'));
         }
         if (schoolFee1.instituteId) {
@@ -195,7 +198,7 @@ schoolFee1Schema.pre('save', async function (next) {
                 if (!feeType)
                     return next(new Error(errorMessages_1.FEE_TYPE_ERROR_MESSAGES.NOT_FOUND));
             }
-            for (const structure of fee.fesStructure) {
+            for (const structure of fee.feeStructure) {
                 // OPTIONAL: Frequency-based term length validation
                 // if (
                 //     structure.frequency &&

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

@@ -10,7 +10,12 @@ declare class FeeTypeModel extends Model<IFeeTypeModelAttributes, TFeeTypeModelC
     feeType: FEE_TYPE;
     module: COMMAN_STATUS;
     status: COMMAN_STATUS;
-    account: string;
+    account: string[];
+    isCreditAllowed: boolean;
+    isCashAllowed: boolean;
+    isRefundable: boolean;
+    isTaxable: boolean;
+    isRequired: boolean;
     isDefault: BOOLEAN_STATUS;
     academicCalendarId: string;
     createdBy: string;