@kipicore/dbcore 1.1.637 → 1.1.639

package/dist/db/psql/migrations/20260708000000-add-batch-id-to-class-room-collection.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/20260708000000-add-batch-id-to-class-room-collection.js

@@ -0,0 +1,18 @@
+'use strict';
+module.exports = {
+    up: async (queryInterface, Sequelize) => {
+        const tableInfo = await queryInterface.describeTable('class_room_collection');
+        if (!tableInfo.batch_id) {
+            await queryInterface.addColumn('class_room_collection', 'batch_id', {
+                type: Sequelize.UUID,
+                allowNull: true,
+            });
+        }
+    },
+    down: async (queryInterface, Sequelize) => {
+        const tableInfo = await queryInterface.describeTable('class_room_collection');
+        if (tableInfo.batch_id) {
+            await queryInterface.removeColumn('class_room_collection', 'batch_id');
+        }
+    }
+};

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

@@ -0,0 +1,46 @@
+'use strict';
+module.exports = {
+    up: async (queryInterface, Sequelize) => {
+        const table = await queryInterface.describeTable('users');
+        if (table.app_type) {
+            // In PostgreSQL, changing from ENUM to VARCHAR often requires a USING clause
+            try {
+                await queryInterface.sequelize.query('ALTER TABLE users ALTER COLUMN app_type TYPE VARCHAR(255) USING app_type::varchar;');
+                await queryInterface.changeColumn('users', 'app_type', {
+                    type: Sequelize.STRING,
+                    allowNull: true,
+                    defaultValue: 'INSTITUTE_APP',
+                });
+            }
+            catch (error) {
+                // Fallback if the raw query fails
+                await queryInterface.changeColumn('users', 'app_type', {
+                    type: Sequelize.STRING,
+                    allowNull: true,
+                    defaultValue: 'INSTITUTE_APP',
+                });
+            }
+        }
+    },
+    down: async (queryInterface, Sequelize) => {
+        const table = await queryInterface.describeTable('users');
+        if (table.app_type) {
+            try {
+                await queryInterface.sequelize.query('ALTER TABLE users ALTER COLUMN app_type TYPE "enum_users_app_type" USING app_type::text::"enum_users_app_type";');
+                await queryInterface.changeColumn('users', 'app_type', {
+                    type: Sequelize.ENUM('INSTITUTE_APP', 'SCHOOL_APP', 'GLOBAL_APP', 'STUDENT_APP'),
+                    allowNull: true,
+                    defaultValue: 'INSTITUTE_APP',
+                });
+            }
+            catch (error) {
+                // Fallback
+                await queryInterface.changeColumn('users', 'app_type', {
+                    type: Sequelize.ENUM('INSTITUTE_APP', 'SCHOOL_APP', 'GLOBAL_APP', 'STUDENT_APP'),
+                    allowNull: true,
+                    defaultValue: 'INSTITUTE_APP',
+                });
+            }
+        }
+    }
+};

package/dist/interfaces/classRoomCollectionInterface.d.ts

@@ -8,6 +8,7 @@ export interface IClassRoomCollectionModelAttributes extends IDefaultAttributes
     collectorId: string;
     paymentMethod: PAYMENT_TYPE;
     userId?: string;
+    batchId?: string;
     amount: number;
     status: PAYMENT_STATUS;
     paidDate: Date;

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

@@ -13,6 +13,7 @@ declare class ClassRoomCollectionModel extends Model<IClassRoomCollectionModelAt
     classRoomEventId: string;
     paymentMethod: PAYMENT_TYPE;
     academicCalendarId?: string;
+    batchId?: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/classRoomCollectionModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const constants_1 = require("../../constants");
 class ClassRoomCollectionModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, AcademicCalendarModel, ClassRoomEventModel } = models;
+        const { UserModel, InstituteModel, AcademicCalendarModel, ClassRoomEventModel, BatchModel } = models;
         ClassRoomCollectionModel.belongsTo(UserModel, {
             foreignKey: {
                 name: 'createdBy',
@@ -106,6 +106,22 @@ class ClassRoomCollectionModel extends sequelize_1.Model {
             },
             as: 'classEventClassRCol',
         });
+        ClassRoomCollectionModel.belongsTo(BatchModel, {
+            foreignKey: {
+                name: 'batchId',
+                allowNull: true,
+                field: 'batch_id',
+            },
+            as: 'classRColBatch',
+        });
+        BatchModel.hasMany(ClassRoomCollectionModel, {
+            foreignKey: {
+                name: 'batchId',
+                allowNull: true,
+                field: 'batch_id',
+            },
+            as: 'batchClassRCol',
+        });
     }
 }
 ClassRoomCollectionModel.init({
@@ -154,6 +170,11 @@ ClassRoomCollectionModel.init({
         field: 'class_room_event_id',
         allowNull: true,
     },
+    batchId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'batch_id',
+        allowNull: true,
+    },
     paidDate: {
         type: sequelize_1.DataTypes.DATE,
         field: 'paid_date',

package/dist/models/psql/userModel.js

@@ -156,7 +156,7 @@ UserModel.init({
     password: { type: sequelize_1.DataTypes.STRING, allowNull: true },
     emailVerification: { type: sequelize_1.DataTypes.STRING(30), allowNull: false, field: 'email_varification', defaultValue: app_1.EMAIL_VERIFICATION.PENDING },
     mobileVerification: { type: sequelize_1.DataTypes.STRING(30), allowNull: false, field: 'mobile_varification', defaultValue: app_1.MOBILE_VERIFICATION.PENDING },
-    appType: { type: sequelize_1.DataTypes.ENUM, values: Object.values(app_1.APP_TYPE), allowNull: true, field: 'app_type', defaultValue: app_1.APP_TYPE.INSTITUTE_APP },
+    appType: { type: sequelize_1.DataTypes.STRING, allowNull: true, field: 'app_type', defaultValue: app_1.APP_TYPE.INSTITUTE_APP },
     type: { type: sequelize_1.DataTypes.STRING(30), allowNull: false },
     globalId: { type: sequelize_1.DataTypes.STRING, field: 'global_id', defaultValue: null, allowNull: true },
     address1: { type: sequelize_1.DataTypes.STRING, allowNull: true },

package/package.json

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