@kipicore/dbcore 1.1.218 → 1.1.220

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

@@ -0,0 +1,191 @@
+'use strict';
+const up = async (queryInterface, Sequelize) => {
+    const tableName = 'fee_type1';
+    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,
+            },
+            typeManagementId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'type_management_id',
+            },
+            instituteId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'institute_id',
+            },
+            account: {
+                type: Sequelize.ARRAY(Sequelize.UUID),
+                allowNull: true,
+                defaultValue: [],
+            },
+            status: {
+                type: Sequelize.STRING,
+                allowNull: true,
+            },
+            module: {
+                type: Sequelize.STRING,
+                allowNull: true,
+            },
+            isDefault: {
+                type: Sequelize.STRING,
+                allowNull: true,
+                field: 'is_default',
+            },
+            isCreditAllowed: {
+                type: Sequelize.BOOLEAN,
+                allowNull: true,
+                field: 'is_credit_allowed',
+                defaultValue: false,
+            },
+            isRefundable: {
+                type: Sequelize.BOOLEAN,
+                allowNull: true,
+                field: 'is_refundable',
+                defaultValue: false,
+            },
+            isRequired: {
+                type: Sequelize.BOOLEAN,
+                allowNull: true,
+                field: 'is_required',
+                defaultValue: false,
+            },
+            isTaxable: {
+                type: Sequelize.BOOLEAN,
+                allowNull: true,
+                field: 'is_taxable',
+                defaultValue: false,
+            },
+            defaultAccount: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'default_account',
+            },
+            feeType: {
+                type: Sequelize.STRING,
+                allowNull: true,
+                field: 'fee_type',
+            },
+            frequency: {
+                type: Sequelize.STRING,
+                allowNull: true,
+            },
+            academicCalendarId: {
+                type: Sequelize.UUID,
+                allowNull: true,
+                field: 'academic_calendar_id',
+            },
+            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',
+            },
+            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',
+            },
+            paymentType: {
+                type: Sequelize.ARRAY(Sequelize.STRING),
+                allowNull: true,
+                field: 'payment_type',
+                defaultValue: [],
+            },
+        });
+    }
+    else {
+        const tableDefinition = await queryInterface.describeTable(tableName);
+        const columnsToAdd = {
+            typeManagementId: { type: Sequelize.UUID, allowNull: true, field: 'type_management_id' },
+            instituteId: { type: Sequelize.UUID, allowNull: true, field: 'institute_id' },
+            account: { type: Sequelize.ARRAY(Sequelize.UUID), allowNull: true, defaultValue: [] },
+            status: { type: Sequelize.STRING, allowNull: true },
+            module: { type: Sequelize.STRING, allowNull: true },
+            isDefault: { type: Sequelize.STRING, allowNull: true, field: 'is_default' },
+            isCreditAllowed: { type: Sequelize.BOOLEAN, allowNull: true, field: 'is_credit_allowed', defaultValue: false },
+            isRefundable: { type: Sequelize.BOOLEAN, allowNull: true, field: 'is_refundable', defaultValue: false },
+            isRequired: { type: Sequelize.BOOLEAN, allowNull: true, field: 'is_required', defaultValue: false },
+            isTaxable: { type: Sequelize.BOOLEAN, allowNull: true, field: 'is_taxable', defaultValue: false },
+            defaultAccount: { type: Sequelize.UUID, allowNull: true, field: 'default_account' },
+            feeType: { type: Sequelize.STRING, allowNull: true, field: 'fee_type' },
+            frequency: { type: Sequelize.STRING, allowNull: true },
+            academicCalendarId: { type: Sequelize.UUID, allowNull: true, field: 'academic_calendar_id' },
+            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' },
+            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',
+            },
+            paymentType: {
+                type: Sequelize.ARRAY(Sequelize.STRING),
+                allowNull: true,
+                field: 'payment_type',
+                defaultValue: [],
+            },
+        };
+        for (const key of Object.keys(columnsToAdd)) {
+            const column = columnsToAdd[key];
+            const columnName = column.field || key;
+            if (!tableDefinition[columnName]) {
+                await queryInterface.addColumn(tableName, columnName, column);
+            }
+        }
+    }
+};
+const down = async (queryInterface) => {
+    const tableName = 'fee_type1';
+    const tableExists = await queryInterface
+        .describeTable(tableName)
+        .then(() => true)
+        .catch(() => false);
+    if (tableExists) {
+        await queryInterface.dropTable(tableName);
+    }
+};
+module.exports = {
+    up,
+    down,
+};

package/dist/interfaces/feeType1Interface.d.ts

@@ -1,4 +1,4 @@
-import { FEE_TYPE, COMMAN_STATUS, FEE_TYPE_FREQUENCY, BOOLEAN_STATUS } from '../constants/app';
+import { FEE_TYPE, COMMAN_STATUS, FEE_TYPE_FREQUENCY, BOOLEAN_STATUS, PAYMENT_TYPE } from '../constants/app';
 import { IDefaultAttributes } from './commonInterface';
 export interface IFeeType1ModelAttributes extends IDefaultAttributes {
     id: string;
@@ -15,5 +15,6 @@ export interface IFeeType1ModelAttributes extends IDefaultAttributes {
     isRequired: boolean;
     instituteId: string;
     isDefault: BOOLEAN_STATUS;
+    paymentType: PAYMENT_TYPE[];
     academicCalendarId: string;
 }

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

@@ -11,6 +11,7 @@ declare class FeeType1Model extends Model<IFeeType1ModelAttributes, TFeeType1Mod
     module: COMMAN_STATUS;
     status: COMMAN_STATUS;
     account: string[];
+    paymentType: string[];
     isDefault: BOOLEAN_STATUS;
     academicCalendarId: string;
     isCreditAllowed: boolean;

package/dist/models/psql/feeType1Model.js

@@ -133,6 +133,11 @@ FeeType1Model.init({
         field: 'academic_calendar_id',
         allowNull: true,
     },
+    paymentType: {
+        type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.STRING),
+        allowNull: true,
+        defaultValue: [],
+    },
 }, {
     modelName: 'FeeType1Model',
     tableName: 'fee_type1',

package/dist/models/psql/testimonialModel.js

@@ -64,8 +64,9 @@ class TestimonialModel extends sequelize_1.Model {
     static addHooks(models) {
         const { InstituteModel, UserModel, InstituteEntityModel } = models;
         const beforeCreateOrUpdateHook = async (testimonial) => {
+            let institute = null;
             if (testimonial.instituteId) {
-                const institute = await InstituteModel.findByPk(testimonial.instituteId);
+                institute = await InstituteModel.findByPk(testimonial.instituteId);
                 if (!institute) {
                     throw new Error(errorMessages_1.INSTITUTE_ERROR_MESSAGES.NOT_FOUND);
                 }
@@ -80,11 +81,18 @@ class TestimonialModel extends sequelize_1.Model {
             }
             testimonial.class = `${(0, utils_1.fromSnakeCaseToNormalText)(testimonial.userType)}`;
             if (testimonial.userId && testimonial.instituteId && testimonial.userType !== app_1.USER_TYPES.PARENTS) {
-                const meta = await userInstituteMetaModel_1.default.findOne({
+                const userInstituteMetaWhere = {
                     userId: testimonial.userId,
                     instituteId: testimonial.instituteId,
-                    status: app_1.USER_INSTITUTE_META_STATUS.ACCEPTED,
-                });
+                    status: { $in: [app_1.USER_INSTITUTE_META_STATUS.ACCEPTED] },
+                };
+                if (testimonial.academicCalendarId)
+                    userInstituteMetaWhere.academicCalendarId = testimonial.academicCalendarId;
+                if (institute?.type !== null || institute?.subType !== null) {
+                    userInstituteMetaWhere.status = { $in: [app_1.USER_INSTITUTE_META_STATUS.ACCEPTED, app_1.USER_INSTITUTE_META_STATUS.PENDING] };
+                    // userInstituteMetaWhere.details = BOOLEAN_STATUS.YES;
+                }
+                const meta = await userInstituteMetaModel_1.default.findOne(userInstituteMetaWhere);
                 if (!meta) {
                     throw new Error(errorMessages_1.USER_INSTITUTE_META_ERROR_MESSAGES.NOT_FOUND);
                 }
@@ -97,10 +105,7 @@ class TestimonialModel extends sequelize_1.Model {
                         association: 'entityType',
                         required: true,
                         where: {
-                            [sequelize_1.Op.or]: [
-                                { title: { [sequelize_1.Op.iLike]: 'STANDARD' } },
-                                { title: { [sequelize_1.Op.iLike]: 'MEDIUM' } },
-                            ],
+                            [sequelize_1.Op.or]: [{ title: { [sequelize_1.Op.iLike]: 'STANDARD' } }, { title: { [sequelize_1.Op.iLike]: 'MEDIUM' } }],
                         },
                     },
                 });

package/package.json

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