@kipicore/dbcore 1.1.209 → 1.1.210

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

@@ -0,0 +1,32 @@
+'use strict';
+const up = async (queryInterface, Sequelize) => {
+    const table = await queryInterface.describeTable('student_fee_history');
+    // Check if column already exists
+    if (!table.fee_type_id) {
+        await queryInterface.sequelize.query(`
+        UPDATE student_fee_history
+        SET fee_type_id = fee_type_id[1]
+        WHERE fee_type_id IS NOT NULL
+          AND array_length(fee_type_id, 1) > 0;
+      `);
+        // 2. Change column type to UUID
+        await queryInterface.changeColumn('student_fee_history', 'fee_type_id', {
+            type: Sequelize.UUID,
+            allowNull: true,
+        });
+    }
+};
+const down = async (queryInterface, Sequelize) => {
+    const table = await queryInterface.describeTable('student_fee_history');
+    // Remove only if column exists
+    if (table.fee_type_id) {
+        await queryInterface.changeColumn('student_fee_history', 'fee_type_id', {
+            type: Sequelize.ARRAY(Sequelize.STRING),
+            allowNull: true,
+        });
+    }
+};
+module.exports = {
+    up,
+    down,
+};

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

@@ -0,0 +1,35 @@
+'use strict';
+const up = async (queryInterface, Sequelize) => {
+    const table = await queryInterface.describeTable('student_fee_type_collection');
+    // Check if column already exists
+    if (!table.subject_id) {
+        await queryInterface.addColumn('student_fee_type_collection', 'subject_id', {
+            type: Sequelize.UUID,
+            defaultValue: null,
+            allowNull: true,
+            field: 'subject_id',
+        });
+    }
+    if (!table.batch_id) {
+        await queryInterface.addColumn('student_fee_type_collection', 'batch_id', {
+            type: Sequelize.UUID,
+            defaultValue: null,
+            allowNull: true,
+            field: 'batch_id',
+        });
+    }
+};
+const down = async (queryInterface, Sequelize) => {
+    const table = await queryInterface.describeTable('student_fee_type_collection');
+    // Remove only if column exists
+    if (table.subject_id) {
+        await queryInterface.removeColumn('student_fee_type_collection', 'subject_id');
+    }
+    if (table.batch_id) {
+        await queryInterface.removeColumn('student_fee_type_collection', 'batch_id');
+    }
+};
+module.exports = {
+    up,
+    down,
+};

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

@@ -0,0 +1,35 @@
+'use strict';
+const up = async (queryInterface, Sequelize) => {
+    const table = await queryInterface.describeTable('student_fee_history');
+    // Check if column already exists
+    if (!table.subject_id) {
+        await queryInterface.addColumn('student_fee_history', 'subject_id', {
+            type: Sequelize.UUID,
+            defaultValue: null,
+            allowNull: true,
+            field: 'subject_id',
+        });
+    }
+    if (!table.batch_id) {
+        await queryInterface.addColumn('student_fee_history', 'batch_id', {
+            type: Sequelize.UUID,
+            defaultValue: null,
+            allowNull: true,
+            field: 'batch_id',
+        });
+    }
+};
+const down = async (queryInterface, Sequelize) => {
+    const table = await queryInterface.describeTable('student_fee_history');
+    // Remove only if column exists
+    if (table.subject_id) {
+        await queryInterface.removeColumn('student_fee_history', 'subject_id');
+    }
+    if (table.batch_id) {
+        await queryInterface.removeColumn('student_fee_history', 'batch_id');
+    }
+};
+module.exports = {
+    up,
+    down,
+};

package/dist/interfaces/studentFeeHistoryInterface.d.ts

@@ -9,7 +9,9 @@ export interface IStudentFeeHistoryModelAttributes extends IDefaultAttributes {
     paymentType: PAYMENT_TYPE;
     paidFee: number;
     status: FEE_HISTORY_STATUS;
-    feeTypeId?: string[];
+    feeTypeId?: string;
+    subjectId?: string;
+    batchId?: string;
     bankAccountId?: string;
     invoicePdf?: string;
     invoiceNumber?: string;

package/dist/interfaces/studentFeeTypeCollectionInterface.d.ts

@@ -6,7 +6,9 @@ export interface IStudentFeeTypeCollectionModelAttributes extends IDefaultAttrib
     userId: string;
     academicCalendarId: string;
     studentFeeCollectionId: string;
-    feeTypeId: string;
+    feeTypeId?: string;
+    subjectId?: string;
+    batchId?: string;
     amount: number;
     status: STUDENT_FEE_COLLECTION_STATUS;
     paidAmount: number;

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

@@ -11,7 +11,7 @@ export declare class StudentFeeHistoryModel extends Model<IStudentFeeHistoryMode
     paymentType: PAYMENT_TYPE;
     paidFee: number;
     status: FEE_HISTORY_STATUS;
-    feeTypeId?: string[];
+    feeTypeId?: string;
     bankAccountId?: string;
     invoicePdf?: string;
     invoiceNumber?: string;
@@ -22,6 +22,8 @@ export declare class StudentFeeHistoryModel extends Model<IStudentFeeHistoryMode
     upiId?: string;
     bankName?: string;
     chequeNo?: string;
+    batchId: string;
+    subjectId: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/studentFeeHistoryModel.js

@@ -6,7 +6,7 @@ const index_1 = require("./index");
 const constants_1 = require("../../constants");
 class StudentFeeHistoryModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, StudentFeeCollectionModel, FileStorageModel, BankAccountDetailsModel, AcademicCalendarModel } = models;
+        const { UserModel, InstituteModel, StudentFeeCollectionModel, FileStorageModel, BankAccountDetailsModel, AcademicCalendarModel, FeeTypeModel, BatchModel, InstituteEntityModel, } = models;
         StudentFeeHistoryModel.belongsTo(StudentFeeCollectionModel, {
             foreignKey: { name: 'studentFeeCollectionId', field: 'student_fee_collection_id', allowNull: true },
             as: 'feeHistoryCollection',
@@ -63,6 +63,14 @@ class StudentFeeHistoryModel extends sequelize_1.Model {
             foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
             as: 'acaCalStudentFeeHistory',
         });
+        StudentFeeHistoryModel.belongsTo(FeeTypeModel, {
+            foreignKey: { name: 'feeTypeId', field: 'feeType_id' },
+            as: 'studentFeeHistoryFeeType',
+        });
+        FeeTypeModel.hasMany(StudentFeeHistoryModel, {
+            foreignKey: { name: 'feeTypeId', field: 'feeType_id' },
+            as: 'feeTypeStudentFeeHistory',
+        });
         StudentFeeHistoryModel.belongsTo(UserModel, {
             foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' },
             as: 'createdByUser',
@@ -75,6 +83,22 @@ class StudentFeeHistoryModel extends sequelize_1.Model {
             foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
             as: 'deletedByUser',
         });
+        StudentFeeHistoryModel.belongsTo(InstituteEntityModel, {
+            foreignKey: { name: 'subjectId', field: 'subject_id' },
+            as: 'studentHistorySubject',
+        });
+        InstituteEntityModel.hasMany(StudentFeeHistoryModel, {
+            foreignKey: { name: 'subjectId', field: 'subject_id' },
+            as: 'subjectStudentHistory',
+        });
+        StudentFeeHistoryModel.belongsTo(BatchModel, {
+            foreignKey: { name: 'batchId', field: 'batch_id' },
+            as: 'studentHistoryBatch',
+        });
+        BatchModel.hasMany(StudentFeeHistoryModel, {
+            foreignKey: { name: 'batchId', field: 'batch_id' },
+            as: 'batchStudentHistory',
+        });
     }
     static addHooks(models) {
         StudentFeeHistoryModel.beforeCreate(async (feeCollection) => {
@@ -114,17 +138,19 @@ StudentFeeHistoryModel.init({
     paymentType: { type: sequelize_1.DataTypes.STRING, allowNull: true },
     paidFee: { type: sequelize_1.DataTypes.INTEGER, allowNull: true },
     status: { type: sequelize_1.DataTypes.STRING, allowNull: true, defaultValue: constants_1.FEE_HISTORY_STATUS.COMPLETED },
-    feeTypeId: { type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.STRING), field: 'fee_type_id', allowNull: true, defaultValue: [] },
+    feeTypeId: { type: sequelize_1.DataTypes.UUID, field: 'fee_type_id', allowNull: true, defaultValue: null },
     bankAccountId: { type: sequelize_1.DataTypes.UUID, field: 'bank_account_id', allowNull: true },
     invoicePdf: { type: sequelize_1.DataTypes.UUID, field: 'invoice_pdf', allowNull: true },
     invoiceNumber: { type: sequelize_1.DataTypes.STRING, field: 'invoice_number', allowNull: true },
-    feeHistoryConfigId: { type: sequelize_1.DataTypes.STRING, field: 'fee_history_config_id', allowNull: true },
+    feeHistoryConfigId: { type: sequelize_1.DataTypes.STRING, field: 'fee_history_config_id', allowNull: true }, // group id for one time pay all fee
     note: { type: sequelize_1.DataTypes.STRING, field: 'note', allowNull: true },
     studentFeeCollectionId: { type: sequelize_1.DataTypes.UUID, field: 'student_fee_collection_id', allowNull: true },
     paidDate: { type: sequelize_1.DataTypes.DATE, defaultValue: sequelize_1.DataTypes.NOW, allowNull: true },
     upiId: { type: sequelize_1.DataTypes.STRING, allowNull: true },
     bankName: { type: sequelize_1.DataTypes.STRING, allowNull: true },
     chequeNo: { type: sequelize_1.DataTypes.STRING, allowNull: true },
+    subjectId: { type: sequelize_1.DataTypes.UUID, field: 'subject_id', allowNull: true },
+    batchId: { type: sequelize_1.DataTypes.UUID, field: 'batch_id', allowNull: true },
 }, {
     modelName: 'StudentFeeHistoryModel',
     tableName: 'student_fee_history',

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

@@ -9,6 +9,8 @@ export declare class StudentFeeTypeCollectionModel extends Model<IStudentFeeType
     academicCalendarId: string;
     studentFeeCollectionId: string;
     feeTypeId: string;
+    batchId: string;
+    subjectId: string;
     amount: number;
     status: STUDENT_FEE_COLLECTION_STATUS;
     paidAmount: number;

package/dist/models/psql/studentFeeTypeCollectionModel.js

@@ -6,7 +6,7 @@ const index_1 = require("./index");
 const constants_1 = require("../../constants");
 class StudentFeeTypeCollectionModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, StudentFeeCollectionModel, AcademicCalendarModel, FeeTypeModel } = models;
+        const { UserModel, InstituteModel, StudentFeeCollectionModel, AcademicCalendarModel, FeeTypeModel, InstituteEntityModel, BatchModel } = models;
         StudentFeeTypeCollectionModel.belongsTo(StudentFeeCollectionModel, {
             foreignKey: { name: 'studentFeeCollectionId', field: 'student_fee_collection_id', allowNull: true },
             as: 'feeTypeCollection',
@@ -47,6 +47,22 @@ class StudentFeeTypeCollectionModel extends sequelize_1.Model {
             foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
             as: 'acaCalFeeTypeCollection',
         });
+        StudentFeeTypeCollectionModel.belongsTo(InstituteEntityModel, {
+            foreignKey: { name: 'subjectId', field: 'subject_id' },
+            as: 'feeTypeCollectionSubject',
+        });
+        InstituteEntityModel.hasMany(StudentFeeTypeCollectionModel, {
+            foreignKey: { name: 'subjectId', field: 'subject_id' },
+            as: 'subjectFeeTypeCollection',
+        });
+        StudentFeeTypeCollectionModel.belongsTo(BatchModel, {
+            foreignKey: { name: 'batchId', field: 'batch_id' },
+            as: 'feeTypeCollectionBatch',
+        });
+        BatchModel.hasMany(StudentFeeTypeCollectionModel, {
+            foreignKey: { name: 'batchId', field: 'batch_id' },
+            as: 'batchFeeTypeCollection',
+        });
         StudentFeeTypeCollectionModel.belongsTo(FeeTypeModel, {
             foreignKey: {
                 name: 'feeTypeId',
@@ -87,6 +103,8 @@ StudentFeeTypeCollectionModel.init({
     paidAmount: { type: sequelize_1.DataTypes.INTEGER, allowNull: true },
     status: { type: sequelize_1.DataTypes.STRING, allowNull: true, defaultValue: constants_1.STUDENT_FEE_COLLECTION_STATUS.PENDING },
     feeTypeId: { type: sequelize_1.DataTypes.UUID, field: 'fee_type_id', allowNull: true },
+    subjectId: { type: sequelize_1.DataTypes.UUID, field: 'subject_id', allowNull: true },
+    batchId: { type: sequelize_1.DataTypes.UUID, field: 'batch_id', allowNull: true },
 }, {
     modelName: 'StudentFeeTypeCollectionModel',
     tableName: 'student_fee_type_collection',

package/package.json

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