@kipicore/dbcore 1.1.122 → 1.1.123

package/dist/models/psql/projectAssessmentOptionModel.js

@@ -4,7 +4,7 @@ const sequelize_1 = require("sequelize");
 const index_1 = require("./index");
 class ProjectAssessmentOptionModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, BatchSubjectProjectAssessmentModel } = models;
+        const { UserModel, BatchSubjectProjectAssessmentModel, AcademicCalendarModel } = models;
         ProjectAssessmentOptionModel.belongsTo(BatchSubjectProjectAssessmentModel, {
             foreignKey: { name: 'assessmentProjectId', field: 'assessment_project_id' },
             as: 'assessmentProject',
@@ -25,6 +25,10 @@ class ProjectAssessmentOptionModel extends sequelize_1.Model {
             foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
             as: 'deletedByUser',
         });
+        ProjectAssessmentOptionModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', allowNull: true, field: 'academic_calendar_id' },
+            as: 'projectAsOpAC',
+        });
     }
 }
 ProjectAssessmentOptionModel.init({
@@ -52,6 +56,11 @@ ProjectAssessmentOptionModel.init({
         type: sequelize_1.DataTypes.TEXT,
         allowNull: true,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'ProjectAssessmentOptionModel',
     tableName: 'project_assessment_options',

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

@@ -19,6 +19,7 @@ declare class SchoolOfferModel extends Model<ISchoolOffersModelAttributes, TScho
     noLimit: boolean;
     account?: string;
     applicableOn?: string[];
+    academicCalendarId: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/schoolOfferModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class SchoolOfferModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, BankAccountDetailsModel, InstituteModel } = models;
+        const { UserModel, BankAccountDetailsModel, InstituteModel, AcademicCalendarModel } = models;
         SchoolOfferModel.belongsTo(UserModel, {
             foreignKey: { name: 'userId', field: 'user_id' },
             as: 'schoolOfferUser',
@@ -42,6 +42,14 @@ class SchoolOfferModel extends sequelize_1.Model {
             foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
             as: 'deletedByUser',
         });
+        SchoolOfferModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'SchoolOffersAcademicCalendar',
+        });
+        AcademicCalendarModel.hasMany(SchoolOfferModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'academicCalendarSchoolOffers',
+        });
     }
 }
 SchoolOfferModel.init({
@@ -70,6 +78,11 @@ SchoolOfferModel.init({
         type: sequelize_1.DataTypes.UUID,
         allowNull: false,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
     name: {
         type: sequelize_1.DataTypes.STRING,
         allowNull: true,

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

@@ -7,6 +7,7 @@ declare class SlotModel extends Model<ISlotModelAttributes, TSlotModelCreationAt
     name: string;
     instituteId: string;
     type: SCHOOL_SHIFT;
+    academicCalendarId?: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/slotModel.js

@@ -6,7 +6,7 @@ const app_1 = require("../../constants/app");
 const errorMessages_1 = require("../../constants/errorMessages");
 class SlotModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel } = models;
+        const { UserModel, InstituteModel, AcademicCalendarModel } = models;
         SlotModel.belongsTo(UserModel, {
             foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' },
             as: 'createdByUser',
@@ -27,6 +27,14 @@ class SlotModel extends sequelize_1.Model {
             foreignKey: 'instituteId',
             as: 'instituteHasSlots',
         });
+        SlotModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId' },
+            as: 'slotAcademicCal',
+        });
+        AcademicCalendarModel.hasMany(SlotModel, {
+            foreignKey: 'academicCalendarId',
+            as: 'academicCalSlot',
+        });
     }
     static addHooks(models) {
         const { InstituteModel } = models;
@@ -70,6 +78,11 @@ SlotModel.init({
         type: sequelize_1.DataTypes.ENUM(...Object.values(app_1.SCHOOL_SHIFT)),
         allowNull: false,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'SlotModel',
     tableName: 'slots',

package/dist/models/psql/subjectHasFeeModel.js

@@ -28,11 +28,11 @@ class SubjectHasFeeModel extends sequelize_1.Model {
             as: 'subjectHasSubjectHasFee',
         });
         SubjectHasFeeModel.belongsTo(AcademicCalendarModel, {
-            foreignKey: { name: 'academicCalenderId', field: 'academic_calender_id' },
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
             as: 'subHFeeAcaCal',
         });
         AcademicCalendarModel.hasMany(SubjectHasFeeModel, {
-            foreignKey: { name: 'academicCalenderId', field: 'academic_calender_id' },
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
             as: 'acaCalSubHFee',
         });
         SubjectHasFeeModel.belongsTo(BatchModel, {
@@ -96,7 +96,7 @@ SubjectHasFeeModel.init({
         type: sequelize_1.DataTypes.INTEGER,
         allowNull: false,
     },
-    academicCalenderId: {
+    academicCalendarId: {
         type: sequelize_1.DataTypes.UUID,
         field: 'academic_calender_id',
         allowNull: true,

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

@@ -8,6 +8,7 @@ declare class SyllabusModel extends Model<ISyllabusModelAttributes, TSyllabusCre
     instituteId: string;
     subjectId: string;
     id: string;
+    academicCalendarId: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/syllabusModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class SyllabusModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, InstituteEntityModel, FileStorageModel } = models;
+        const { UserModel, InstituteModel, InstituteEntityModel, FileStorageModel, AcademicCalendarModel } = models;
         SyllabusModel.belongsTo(UserModel, {
             foreignKey: {
                 name: 'createdBy',
@@ -74,6 +74,14 @@ class SyllabusModel extends sequelize_1.Model {
             },
             as: 'syllabusFileStorageDetails',
         });
+        SyllabusModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'syllabusAcaCal',
+        });
+        AcademicCalendarModel.hasMany(SyllabusModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalSyllabus',
+        });
     }
 }
 SyllabusModel.init({
@@ -103,6 +111,11 @@ SyllabusModel.init({
         field: 'subject_id',
         allowNull: true,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'SyllabusModel',
     tableName: 'syllabus',

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

@@ -11,6 +11,7 @@ declare class TestimonialModel extends Model<ITestimonialModelAttributes, TTesti
     rating: number;
     userType: USER_TYPES;
     class?: string | null;
+    academicCalendarId?: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/testimonialModel.js

@@ -11,7 +11,7 @@ const utils_1 = require("../../helpers/utils");
 const userInstituteMetaModel_1 = __importDefault(require("../mongodb/userInstituteMetaModel"));
 class TestimonialModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel } = models;
+        const { UserModel, InstituteModel, AcademicCalendarModel } = models;
         TestimonialModel.belongsTo(UserModel, {
             foreignKey: {
                 name: 'createdBy',
@@ -52,6 +52,14 @@ class TestimonialModel extends sequelize_1.Model {
             foreignKey: 'userId',
             as: 'userHasTestimonials',
         });
+        TestimonialModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'syllabusAcaCal',
+        });
+        AcademicCalendarModel.hasMany(TestimonialModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalSyllabus',
+        });
     }
     static addHooks(models) {
         const { InstituteModel, UserModel, InstituteEntityModel } = models;
@@ -148,6 +156,11 @@ TestimonialModel.init({
         defaultValue: null,
         allowNull: true,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'TestimonialModel',
     tableName: 'testimonials',

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

@@ -12,6 +12,7 @@ declare class TripModel extends Model<ITripModelAttributes, TTripModelCreationAt
     instituteId: string;
     departure: Date;
     arrival: Date;
+    academicCalendarId?: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/tripModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class TripModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, VehicleModel, InstituteModel } = models;
+        const { UserModel, VehicleModel, InstituteModel, AcademicCalendarModel } = models;
         TripModel.belongsTo(UserModel, {
             foreignKey: {
                 name: 'createdBy',
@@ -54,6 +54,14 @@ class TripModel extends sequelize_1.Model {
             foreignKey: 'driverId',
             as: 'tripHasDriver',
         });
+        TripModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'tripAcaCal',
+        });
+        AcademicCalendarModel.hasMany(TripModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalTrip',
+        });
     }
 }
 TripModel.init({
@@ -101,6 +109,11 @@ TripModel.init({
         field: 'institute_id',
         allowNull: true,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'TripModel',
     tableName: 'trips',

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

@@ -9,6 +9,7 @@ declare class UserBookAssessmentModel extends Model<IUserBookAssessmentModelAttr
     batchId: string;
     userId: string;
     status: USER_BOOK_ASSESSMENT_STATUS;
+    academicCalendarId?: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/userBookAssessmentModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class UserBookAssessmentModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, BatchSubjectBookAssessmentModel, BatchModel, BookAssessmentDateModel } = models;
+        const { UserModel, BatchSubjectBookAssessmentModel, BatchModel, BookAssessmentDateModel, AcademicCalendarModel } = models;
         UserBookAssessmentModel.belongsTo(BatchSubjectBookAssessmentModel, {
             foreignKey: {
                 name: 'assessmentBookId',
@@ -86,6 +86,14 @@ class UserBookAssessmentModel extends sequelize_1.Model {
             },
             as: 'deletedByUser',
         });
+        UserBookAssessmentModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'userBAssessAcaCal',
+        });
+        AcademicCalendarModel.hasMany(UserBookAssessmentModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalUserBAssess',
+        });
     }
 }
 UserBookAssessmentModel.init({
@@ -119,6 +127,11 @@ UserBookAssessmentModel.init({
         type: sequelize_1.DataTypes.ENUM(...Object.values(app_1.USER_BOOK_ASSESSMENT_STATUS)),
         defaultValue: app_1.USER_BOOK_ASSESSMENT_STATUS.PENDING,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'UserBookAssessmentModel',
     tableName: 'user_book_assessments',

package/dist/models/psql/userFeeTypeModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class UserFeeTypeModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, FeeTypeModel, SchoolFeeCollectionModel, UserFeeTypeByAccountModel } = models;
+        const { UserModel, InstituteModel, FeeTypeModel, SchoolFeeCollectionModel, UserFeeTypeByAccountModel, AcademicCalendarModel, } = models;
         UserFeeTypeModel.belongsTo(InstituteModel, {
             foreignKey: {
                 name: 'instituteId',
@@ -100,6 +100,14 @@ class UserFeeTypeModel extends sequelize_1.Model {
             },
             as: 'deletedByUser',
         });
+        UserFeeTypeModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'userFeeTypeAcaCal',
+        });
+        AcademicCalendarModel.hasMany(UserFeeTypeModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalUserFeeType',
+        });
     }
 }
 UserFeeTypeModel.init({
@@ -158,6 +166,11 @@ UserFeeTypeModel.init({
         field: 'fee_collection_account_id',
         allowNull: false,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'UserFeeTypeModel',
     tableName: 'user_fee_types',

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

@@ -8,6 +8,7 @@ declare class UserHasAnnouncementModel extends Model<IUserHasAnnouncementModelAt
     announcementId: string;
     instituteId: string;
     status: USER_HAS_ANNOUCEMENT_STATUS;
+    academicCalendarId: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/userHasAnnouncementModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class UserHasAnnouncementModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, AnnouncementModel } = models;
+        const { UserModel, InstituteModel, AnnouncementModel, AcademicCalendarModel } = models;
         UserHasAnnouncementModel.belongsTo(UserModel, {
             foreignKey: {
                 name: 'createdBy',
@@ -66,6 +66,14 @@ class UserHasAnnouncementModel extends sequelize_1.Model {
             },
             as: 'announcementUserList',
         });
+        UserHasAnnouncementModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'announcementUserAcademicCal',
+        });
+        AcademicCalendarModel.hasMany(UserHasAnnouncementModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'academicCalAnnouncementUser',
+        });
     }
 }
 UserHasAnnouncementModel.init({
@@ -96,6 +104,11 @@ UserHasAnnouncementModel.init({
         allowNull: false,
         defaultValue: app_1.USER_HAS_ANNOUCEMENT_STATUS.SENT,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'UserHasAnnouncementModel',
     tableName: 'user_has_announcementes',

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

@@ -6,6 +6,7 @@ declare class UserHasBatchModel extends Model<IUserHasBatchModelAttributes, TUse
     userId: string;
     batchId: string;
     subjects: string[];
+    academicCalendarId: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/userHasBatchModel.js

@@ -4,7 +4,7 @@ const sequelize_1 = require("sequelize");
 const index_1 = require("./index");
 class UserHasBatchModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, BatchModel } = models;
+        const { UserModel, BatchModel, AcademicCalendarModel } = models;
         UserHasBatchModel.belongsTo(UserModel, {
             foreignKey: {
                 name: 'createdBy',
@@ -57,6 +57,20 @@ class UserHasBatchModel extends sequelize_1.Model {
             },
             as: 'userBatches',
         });
+        UserHasBatchModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: {
+                name: 'academicCalendarId',
+                field: 'academic_calendar_id',
+            },
+            as: 'userHBAcademicCal',
+        });
+        AcademicCalendarModel.hasMany(UserHasBatchModel, {
+            foreignKey: {
+                name: 'academicCalendarId',
+                field: 'academic_calendar_id',
+            },
+            as: 'academicCalUserHB',
+        });
     }
 }
 UserHasBatchModel.init({
@@ -81,6 +95,11 @@ UserHasBatchModel.init({
         defaultValue: [],
         allowNull: false,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'UserHasBatchModel',
     tableName: 'user_has_batches',

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

@@ -10,6 +10,7 @@ declare class UserHasHomeWorkModel extends Model<IUserHasHomeWorkModelAttributes
     note?: string;
     studentStatus: HOME_WORK_STATUS;
     instituteStatus: HOME_WORK_STATUS;
+    academicCalendarId: string;
     createdBy?: string;
     updatedBy?: string;
     deletedBy?: string;

package/dist/models/psql/userHasHomeWorkModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class UserHasHomeWorkModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, BatchModel, HomeWorkModel } = models;
+        const { UserModel, InstituteModel, BatchModel, HomeWorkModel, AcademicCalendarModel } = models;
         UserHasHomeWorkModel.belongsTo(InstituteModel, {
             foreignKey: { name: 'instituteId', field: 'institute_id' },
             as: 'homeWorkHasInstitute',
@@ -30,6 +30,14 @@ class UserHasHomeWorkModel extends sequelize_1.Model {
             foreignKey: { name: 'homeWorkId', field: 'homework_id' },
             as: 'homeWorkUsers',
         });
+        UserHasHomeWorkModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'homeWorkHasAcademicCalendar',
+        });
+        AcademicCalendarModel.hasMany(UserHasHomeWorkModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'academicCalendarHasHomeWork',
+        });
         UserHasHomeWorkModel.belongsTo(UserModel, {
             foreignKey: { name: 'createdBy', field: 'created_by', allowNull: true },
             as: 'createdByUser',
@@ -80,6 +88,11 @@ UserHasHomeWorkModel.init({
         allowNull: true,
         defaultValue: app_1.HOME_WORK_STATUS.NOT_COMPLETED,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        allowNull: true,
+        field: 'academic_calendar_id',
+    },
 }, {
     modelName: 'UserHasHomeWorkModel',
     tableName: 'user_has_home_work',

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

@@ -19,6 +19,7 @@ declare class UserHasInventoryHistoryModel extends Model<IUserHasInventoryHistor
     parentId: string;
     remainingQuantity: number;
     totalQuantity: number;
+    academicCalendarId?: string;
     createdBy?: string;
     updatedBy?: string;
     deletedBy?: string;

package/dist/models/psql/userHasInventoryHistoryModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class UserHasInventoryHistoryModel extends sequelize_1.Model {
     static associate(models) {
-        const { InventoryModel, InstituteModel, UserModel } = models;
+        const { InventoryModel, InstituteModel, UserModel, AcademicCalendarModel } = models;
         UserHasInventoryHistoryModel.belongsTo(InventoryModel, {
             foreignKey: { name: 'inventoryId', field: 'inventory_id' },
             as: 'inventory',
@@ -42,6 +42,14 @@ class UserHasInventoryHistoryModel extends sequelize_1.Model {
             foreignKey: { name: 'deletedBy', field: 'deleted_by', allowNull: true },
             as: 'deletedByUser',
         });
+        UserHasInventoryHistoryModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'userHInventoryHAcaCal',
+        });
+        AcademicCalendarModel.hasMany(UserHasInventoryHistoryModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalUserHInventoryH',
+        });
     }
 }
 UserHasInventoryHistoryModel.init({
@@ -120,6 +128,11 @@ UserHasInventoryHistoryModel.init({
         type: sequelize_1.DataTypes.UUID,
         allowNull: false,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'UserHasInventoryHistoryModel',
     tableName: 'user_has_inventory_history',

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

@@ -20,6 +20,7 @@ declare class UserHasInventoryModel extends Model<IUserHasInventoryModelAttribut
     returnNote?: string;
     instituteId: string;
     totalReturnQuantity: number;
+    academicCalendarId?: string;
     createdBy?: string;
     updatedBy?: string;
     deletedBy?: string;

package/dist/models/psql/userHasInventoryModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class UserHasInventoryModel extends sequelize_1.Model {
     static associate(models) {
-        const { InventoryModel, UserModel, InstituteModel } = models;
+        const { InventoryModel, UserModel, InstituteModel, AcademicCalendarModel } = models;
         UserHasInventoryModel.belongsTo(InventoryModel, {
             foreignKey: { name: 'inventoryId', field: 'inventory_id' },
             as: 'inventory',
@@ -33,6 +33,14 @@ class UserHasInventoryModel extends sequelize_1.Model {
             foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
             as: 'deletedByUser',
         });
+        UserHasInventoryModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'userHInventoryAcaCal',
+        });
+        AcademicCalendarModel.hasMany(UserHasInventoryModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalUserHInventory',
+        });
     }
 }
 UserHasInventoryModel.init({
@@ -115,6 +123,11 @@ UserHasInventoryModel.init({
         type: sequelize_1.DataTypes.UUID,
         allowNull: false,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'UserHasInventoryModel',
     tableName: 'user_has_inventory',

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

@@ -15,6 +15,7 @@ declare class UserHasLeaveHistoryModel extends Model<IUserHasLeaveHistoryModelAt
     leave: LEAVE;
     userLeaveRequestId: string;
     userHasLeaveId: string;
+    academicCalendarId?: string;
     createdBy?: string;
     updatedBy?: string;
     deletedBy?: string;

package/dist/models/psql/userHasLeaveHistoryModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class UserHasLeaveHistoryModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, UserHasLeaveModel } = models;
+        const { UserModel, InstituteModel, UserHasLeaveModel, AcademicCalendarModel } = models;
         UserHasLeaveHistoryModel.belongsTo(UserModel, { foreignKey: 'userId', as: 'user' });
         UserModel.hasMany(UserHasLeaveHistoryModel, { foreignKey: 'userId', as: 'leaveHistory' });
         UserHasLeaveHistoryModel.belongsTo(InstituteModel, { foreignKey: 'instituteId', as: 'institute' });
@@ -24,6 +24,14 @@ class UserHasLeaveHistoryModel extends sequelize_1.Model {
             foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
             as: 'deletedByUser',
         });
+        UserHasLeaveHistoryModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'syllabusAcaCal',
+        });
+        AcademicCalendarModel.hasMany(UserHasLeaveHistoryModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalSyllabus',
+        });
     }
 }
 UserHasLeaveHistoryModel.init({
@@ -82,6 +90,11 @@ UserHasLeaveHistoryModel.init({
         type: sequelize_1.DataTypes.DATE,
         allowNull: false,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'UserHasLeaveHistory',
     tableName: 'user_has_leave_history',

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

@@ -11,6 +11,7 @@ declare class UserHasLeaveModel extends Model<IUserHasLeaveModelAttributes, TUse
     leaveId: string;
     leave: LEAVE;
     userHasLeaveId?: string;
+    academicCalendarId?: string;
     createdBy?: string;
     updatedBy?: string;
     deletedBy?: string;