@kipicore/dbcore 1.1.237 → 1.1.239

package/dist/constants/app.d.ts

@@ -485,7 +485,8 @@ export declare enum USER_CHAPTER_INDEX_STATUS {
 }
 export declare enum FEE_HISTORY_STATUS {
     COMPLETED = "COMPLETED",
-    PENDING = "PENDING"
+    PENDING = "PENDING",
+    DELETED = "DELETED"
 }
 export declare enum CHAPTER_INDEX_FILE_TYPE {
     VIDEO = "VIDEO",

package/dist/constants/app.js

@@ -590,6 +590,7 @@ var FEE_HISTORY_STATUS;
 (function (FEE_HISTORY_STATUS) {
     FEE_HISTORY_STATUS["COMPLETED"] = "COMPLETED";
     FEE_HISTORY_STATUS["PENDING"] = "PENDING";
+    FEE_HISTORY_STATUS["DELETED"] = "DELETED";
 })(FEE_HISTORY_STATUS || (exports.FEE_HISTORY_STATUS = FEE_HISTORY_STATUS = {}));
 var CHAPTER_INDEX_FILE_TYPE;
 (function (CHAPTER_INDEX_FILE_TYPE) {

package/dist/db/psql/migrations/20260202072445-update-entity-wise-calendar-structure.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/20260202072445-update-entity-wise-calendar-structure.js

@@ -0,0 +1,102 @@
+'use strict';
+const up = async (queryInterface, Sequelize) => {
+    const table = await queryInterface.describeTable('entity_wise_calendar');
+    // Add parent_id (self reference)
+    if (!table.parent_id) {
+        await queryInterface.addColumn('entity_wise_calendar', 'parent_id', {
+            type: Sequelize.UUID,
+            allowNull: true,
+            defaultValue: null,
+            field: 'parent_id',
+            references: {
+                model: 'entity_wise_calendar',
+                key: 'id',
+            },
+            onUpdate: 'CASCADE',
+            onDelete: 'SET NULL',
+        });
+    }
+    // Add start_date
+    if (!table.start_date) {
+        await queryInterface.addColumn('entity_wise_calendar', 'start_date', {
+            type: Sequelize.DATE,
+            allowNull: true,
+            field: 'start_date',
+        });
+    }
+    // Add end_date
+    if (!table.end_date) {
+        await queryInterface.addColumn('entity_wise_calendar', 'end_date', {
+            type: Sequelize.DATE,
+            allowNull: true,
+            field: 'end_date',
+        });
+    }
+    // Add start_year
+    if (!table.start_year) {
+        await queryInterface.addColumn('entity_wise_calendar', 'start_year', {
+            type: Sequelize.INTEGER,
+            allowNull: true,
+            field: 'start_year',
+        });
+    }
+    // Add end_year
+    if (!table.end_year) {
+        await queryInterface.addColumn('entity_wise_calendar', 'end_year', {
+            type: Sequelize.INTEGER,
+            allowNull: true,
+            field: 'end_year',
+        });
+    }
+    // Remove academic_calendar_id (old design)
+    if (table.academic_calendar_id) {
+        await queryInterface.removeColumn('entity_wise_calendar', 'academic_calendar_id');
+    }
+    // Remove institute_id (old design)
+    if (table.institute_id) {
+        await queryInterface.removeColumn('entity_wise_calendar', 'institute_id');
+    }
+};
+const down = async (queryInterface, Sequelize) => {
+    const table = await queryInterface.describeTable('entity_wise_calendar');
+    // Re-add academic_calendar_id
+    if (!table.academic_calendar_id) {
+        await queryInterface.addColumn('entity_wise_calendar', 'academic_calendar_id', {
+            type: Sequelize.UUID,
+            allowNull: true,
+            field: 'academic_calendar_id',
+        });
+    }
+    // Re-add institute_id
+    if (!table.institute_id) {
+        await queryInterface.addColumn('entity_wise_calendar', 'institute_id', {
+            type: Sequelize.UUID,
+            allowNull: true,
+            field: 'institute_id',
+        });
+    }
+    // Remove parent_id
+    if (table.parent_id) {
+        await queryInterface.removeColumn('entity_wise_calendar', 'parent_id');
+    }
+    // Remove start_date
+    if (table.start_date) {
+        await queryInterface.removeColumn('entity_wise_calendar', 'start_date');
+    }
+    // Remove end_date
+    if (table.end_date) {
+        await queryInterface.removeColumn('entity_wise_calendar', 'end_date');
+    }
+    // Remove start_year
+    if (table.start_year) {
+        await queryInterface.removeColumn('entity_wise_calendar', 'start_year');
+    }
+    // Remove end_year
+    if (table.end_year) {
+        await queryInterface.removeColumn('entity_wise_calendar', 'end_year');
+    }
+};
+module.exports = {
+    up,
+    down,
+};

package/dist/db/psql/migrations/20260202105643-update-academic-calendars-add-hierarchy-and-entity.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/20260202105643-update-academic-calendars-add-hierarchy-and-entity.js

@@ -0,0 +1,90 @@
+'use strict';
+const up = async (queryInterface, Sequelize) => {
+    const table = await queryInterface.describeTable('academic_calendars');
+    // start_year
+    if (!table.start_year) {
+        await queryInterface.addColumn('academic_calendars', 'start_year', {
+            type: Sequelize.INTEGER,
+            allowNull: true,
+            field: 'start_year',
+        });
+    }
+    // end_year
+    if (!table.end_year) {
+        await queryInterface.addColumn('academic_calendars', 'end_year', {
+            type: Sequelize.INTEGER,
+            allowNull: true,
+            field: 'end_year',
+        });
+    }
+    // parent_id (self reference)
+    if (!table.parent_id) {
+        await queryInterface.addColumn('academic_calendars', 'parent_id', {
+            type: Sequelize.UUID,
+            allowNull: true,
+            field: 'parent_id',
+            references: {
+                model: 'academic_calendars',
+                key: 'id',
+            },
+            onUpdate: 'CASCADE',
+            onDelete: 'SET NULL',
+        });
+    }
+    // entity_id (InstituteEntityModel)
+    if (!table.entity_id) {
+        await queryInterface.addColumn('academic_calendars', 'entity_id', {
+            type: Sequelize.UUID,
+            allowNull: true,
+            field: 'entity_id',
+            references: {
+                model: 'institute_entities',
+                key: 'id',
+            },
+            onUpdate: 'CASCADE',
+            onDelete: 'SET NULL',
+        });
+    }
+    // base_id (logical root / grouping)
+    if (!table.base_id) {
+        await queryInterface.addColumn('academic_calendars', 'base_id', {
+            type: Sequelize.UUID,
+            allowNull: true,
+            field: 'base_id',
+        });
+    }
+    // is_updated flag
+    if (!table.is_updated) {
+        await queryInterface.addColumn('academic_calendars', 'is_updated', {
+            type: Sequelize.BOOLEAN,
+            allowNull: false,
+            defaultValue: false,
+            field: 'is_updated',
+        });
+    }
+};
+const down = async (queryInterface, Sequelize) => {
+    const table = await queryInterface.describeTable('academic_calendars');
+    if (table.is_updated) {
+        await queryInterface.removeColumn('academic_calendars', 'is_updated');
+    }
+    if (table.base_id) {
+        await queryInterface.removeColumn('academic_calendars', 'base_id');
+    }
+    if (table.entity_id) {
+        await queryInterface.removeColumn('academic_calendars', 'entity_id');
+    }
+    if (table.parent_id) {
+        await queryInterface.removeColumn('academic_calendars', 'parent_id');
+    }
+    if (table.end_year) {
+        await queryInterface.removeColumn('academic_calendars', 'end_year');
+    }
+    if (table.start_year) {
+        await queryInterface.removeColumn('academic_calendars', 'start_year');
+    }
+};
+module.exports = {
+    up,
+    down,
+};

package/dist/interfaces/academicCalendarInterface.d.ts

@@ -6,4 +6,10 @@ export interface IAcademicCalendarModelAttributes extends IDefaultAttributes {
     endDate: Date;
     instituteId: string;
     status: ACADEMIC_CALENDARS_STATUS;
+    parentId: string;
+    entityId: string;
+    baseId: string;
+    startYear: number;
+    endYear: number;
+    isUpdated?: boolean;
 }

package/dist/interfaces/entityWiseCalendarInterface.d.ts

@@ -2,8 +2,11 @@ import { ACADEMIC_CALENDARS_STATUS } from '../constants/app';
 import { IDefaultAttributes } from './commonInterface';
 export interface IEntityWiseCalendarModelAttributes extends IDefaultAttributes {
     id: string;
+    parentId?: string;
     entityId: string;
-    instituteId?: string;
-    academicCalendarId?: string;
     status: ACADEMIC_CALENDARS_STATUS;
+    startDate: Date;
+    endDate: Date;
+    startYear: number;
+    endYear: number;
 }

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

@@ -8,6 +8,11 @@ export declare class AcademicCalendarModel extends Model<IAcademicCalendarModelA
     startDate: Date;
     endDate: Date;
     status: ACADEMIC_CALENDARS_STATUS;
+    parentId: string;
+    entityId: string;
+    baseId: string;
+    startYear: number;
+    endYear: number;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/academicCalendarModel.js

@@ -6,7 +6,7 @@ const app_1 = require("../../constants/app");
 const index_1 = require("./index");
 class AcademicCalendarModel extends sequelize_1.Model {
     static associate(models) {
-        const { InstituteModel, UserModel } = models;
+        const { InstituteModel, UserModel, InstituteEntityModel } = models;
         AcademicCalendarModel.belongsTo(InstituteModel, {
             foreignKey: {
                 name: 'instituteId',
@@ -42,6 +42,24 @@ class AcademicCalendarModel extends sequelize_1.Model {
             foreignKey: 'instituteId',
             as: 'instituteHasAcademicCalendars',
         });
+        // Self-referencing hierarchy
+        AcademicCalendarModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'parentId', field: 'parent_id' },
+            as: 'parentAcademicCalendar',
+        });
+        AcademicCalendarModel.hasMany(AcademicCalendarModel, {
+            foreignKey: { name: 'parentId', field: 'parent_id' },
+            as: 'subAcademicCalendarList',
+        });
+        // Entity relation
+        AcademicCalendarModel.belongsTo(InstituteEntityModel, {
+            foreignKey: { name: 'entityId', field: 'entity_id' },
+            as: 'academicCalendarEntity',
+        });
+        InstituteEntityModel.hasMany(AcademicCalendarModel, {
+            foreignKey: { name: 'entityId', field: 'entity_id' },
+            as: 'academicCalendarEntityList',
+        });
     }
 }
 exports.AcademicCalendarModel = AcademicCalendarModel;
@@ -73,6 +91,36 @@ AcademicCalendarModel.init({
         allowNull: false,
         defaultValue: app_1.ACADEMIC_CALENDARS_STATUS.FUTURE_ACADEMIC_CALENDAR,
     },
+    startYear: {
+        type: sequelize_1.DataTypes.INTEGER,
+        field: 'start_year',
+        allowNull: true,
+    },
+    endYear: {
+        type: sequelize_1.DataTypes.INTEGER,
+        field: 'end_year',
+        allowNull: true,
+    },
+    parentId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'parent_id',
+        allowNull: true,
+    },
+    entityId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'entity_id',
+        allowNull: true,
+    },
+    baseId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'base_id',
+        allowNull: true,
+    },
+    isUpdated: {
+        type: sequelize_1.DataTypes.BOOLEAN,
+        field: 'is_updated',
+        defaultValue: false,
+    },
 }, {
     modelName: 'AcademicCalendarModel',
     tableName: 'academic_calendars',

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

@@ -4,10 +4,13 @@ import { TEntityWiseCalendarModelCreationAttributes } from '../../types/entityWi
 import { ACADEMIC_CALENDARS_STATUS } from '../../constants/app';
 declare class EntityWiseCalendarModel extends Model<IEntityWiseCalendarModelAttributes, TEntityWiseCalendarModelCreationAttributes> {
     id: string;
-    instituteId?: string;
-    academicCalendarId?: string;
+    parentId?: string;
     entityId: string;
     status: ACADEMIC_CALENDARS_STATUS;
+    startDate: Date;
+    endDate: Date;
+    startYear: number;
+    endYear: number;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/entityWiseCalendarModel.js

@@ -5,54 +5,36 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class EntityWiseCalendarModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, AcademicCalendarModel, InstituteEntityModel } = models;
+        const { UserModel, InstituteEntityModel } = models;
         EntityWiseCalendarModel.belongsTo(UserModel, {
-            foreignKey: {
-                name: 'createdBy',
-                allowNull: true,
-                field: 'created_by',
-            },
+            foreignKey: { name: 'createdBy', field: 'created_by' },
             as: 'createdByUser',
         });
         EntityWiseCalendarModel.belongsTo(UserModel, {
-            foreignKey: {
-                name: 'updatedBy',
-                allowNull: true,
-                field: 'updated_by',
-            },
+            foreignKey: { name: 'updatedBy', field: 'updated_by' },
             as: 'updatedByUser',
         });
         EntityWiseCalendarModel.belongsTo(UserModel, {
-            foreignKey: {
-                name: 'deletedBy',
-                allowNull: true,
-                field: 'deleted_by',
-            },
+            foreignKey: { name: 'deletedBy', field: 'deleted_by' },
             as: 'deletedByUser',
         });
-        EntityWiseCalendarModel.belongsTo(InstituteModel, {
-            foreignKey: { name: 'instituteId', field: 'institute_id' },
-            as: 'entityWiseCalendarInstitute',
+        // Self-referencing hierarchy
+        EntityWiseCalendarModel.belongsTo(EntityWiseCalendarModel, {
+            foreignKey: { name: 'parentId', field: 'parent_id' },
+            as: 'parentEntityWiseCalendar',
         });
-        InstituteModel.hasMany(EntityWiseCalendarModel, {
-            foreignKey: { name: 'instituteId', field: 'institute_id' },
-            as: 'instituteHasEntityWiseCalendar',
-        });
-        EntityWiseCalendarModel.belongsTo(AcademicCalendarModel, {
-            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
-            as: 'entityWiseAcademicCalendar',
-        });
-        AcademicCalendarModel.hasMany(EntityWiseCalendarModel, {
-            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
-            as: 'academicCalendarIdHasEntityWiseCalendar',
+        EntityWiseCalendarModel.hasMany(EntityWiseCalendarModel, {
+            foreignKey: { name: 'parentId', field: 'parent_id' },
+            as: 'subEntityWiseCalendarList',
         });
+        // Entity relation
         EntityWiseCalendarModel.belongsTo(InstituteEntityModel, {
             foreignKey: { name: 'entityId', field: 'entity_id' },
             as: 'entityWiseCalendarEntity',
         });
         InstituteEntityModel.hasMany(EntityWiseCalendarModel, {
             foreignKey: { name: 'entityId', field: 'entity_id' },
-            as: 'entityWiseCalendarHasEntity',
+            as: 'entityWiseCalendarEntityList',
         });
     }
 }
@@ -63,14 +45,9 @@ EntityWiseCalendarModel.init({
         allowNull: false,
         primaryKey: true,
     },
-    academicCalendarId: {
-        type: sequelize_1.DataTypes.UUID,
-        field: 'academic_calendar_id',
-        allowNull: true,
-    },
-    instituteId: {
+    parentId: {
         type: sequelize_1.DataTypes.UUID,
-        field: 'institute_id',
+        field: 'parent_id',
         allowNull: true,
     },
     entityId: {
@@ -80,8 +57,28 @@ EntityWiseCalendarModel.init({
     },
     status: {
         type: sequelize_1.DataTypes.STRING,
+        allowNull: false,
         defaultValue: app_1.ACADEMIC_CALENDARS_STATUS.CURRENT_ACADEMIC_CALENDAR,
-        allowNull: true,
+    },
+    startDate: {
+        type: sequelize_1.DataTypes.DATE,
+        field: 'start_date',
+        allowNull: false,
+    },
+    endDate: {
+        type: sequelize_1.DataTypes.DATE,
+        field: 'end_date',
+        allowNull: false,
+    },
+    startYear: {
+        type: sequelize_1.DataTypes.INTEGER,
+        field: 'start_year',
+        allowNull: false,
+    },
+    endYear: {
+        type: sequelize_1.DataTypes.INTEGER,
+        field: 'end_year',
+        allowNull: false,
     },
 }, {
     modelName: 'EntityWiseCalendar',

package/package.json

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