@kipicore/dbcore 1.1.121 → 1.1.123

package/dist/models/psql/lectureModel.js

@@ -155,7 +155,7 @@ class LectureModel extends sequelize_1.Model {
         });
     }
     static associate(models) {
-        const { UserModel, TypeManagementModel, InstituteModel, WorkingDayModel, SlotModel, WorkingShiftModel, ClassRoomModel, BatchModel, InstituteEntityModel, } = models;
+        const { UserModel, TypeManagementModel, InstituteModel, WorkingDayModel, SlotModel, WorkingShiftModel, ClassRoomModel, BatchModel, InstituteEntityModel, AcademicCalendarModel, } = models;
         LectureModel.belongsTo(UserModel, { foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' }, as: 'createdByUser' });
         LectureModel.belongsTo(UserModel, { foreignKey: { name: 'updatedBy', allowNull: true, field: 'updated_by' }, as: 'updatedByUser' });
         LectureModel.belongsTo(UserModel, { foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' }, as: 'deletedByUser' });
@@ -184,6 +184,14 @@ class LectureModel extends sequelize_1.Model {
         BatchModel.hasMany(LectureModel, { foreignKey: 'batchId', as: 'batchHasLectures' });
         LectureModel.belongsTo(InstituteEntityModel, { foreignKey: 'subject', as: 'subjectDetails' });
         InstituteEntityModel.hasMany(LectureModel, { foreignKey: 'subject', as: 'subjectHasLectures' });
+        LectureModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'lectureAcaCal',
+        });
+        AcademicCalendarModel.hasMany(LectureModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalLecture',
+        });
     }
 }
 LectureModel.init({
@@ -209,5 +217,10 @@ LectureModel.init({
     plannerSyncStatus: { type: sequelize_1.DataTypes.STRING, field: 'planner_sync_status', allowNull: true, defaultValue: app_1.PLANNER_SYNC_STATUS.PENDING },
     shiftId: { type: sequelize_1.DataTypes.UUID, field: 'shift_id', allowNull: true },
     slotId: { type: sequelize_1.DataTypes.UUID, field: 'slot_id', allowNull: true },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, { modelName: 'LectureModel', tableName: 'lectures', timestamps: true, sequelize: index_1.sequelize });
 exports.default = LectureModel;

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

@@ -12,6 +12,7 @@ declare class MasterLeaveModel extends Model<IMasterLeaveModelAttributes, TMaste
     endTermDuration: Date;
     leave: LEAVE;
     status: COMMAN_STATUS;
+    academicCalendarId: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/masterLeaveModel.js

@@ -28,7 +28,7 @@ class MasterLeaveModel extends sequelize_1.Model {
         });
     }
     static associate(models) {
-        const { InstituteModel, TypeManagementModel, UserModel } = models;
+        const { InstituteModel, TypeManagementModel, UserModel, AcademicCalendarModel } = models;
         MasterLeaveModel.belongsTo(InstituteModel, {
             foreignKey: {
                 name: 'instituteId',
@@ -75,6 +75,14 @@ class MasterLeaveModel extends sequelize_1.Model {
             },
             as: 'deletedByUser',
         });
+        MasterLeaveModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id', allowNull: true },
+            as: 'masterLeaveAcaCal',
+        });
+        AcademicCalendarModel.hasMany(MasterLeaveModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id', allowNull: true },
+            as: 'acaCalMasterLeave',
+        });
     }
 }
 MasterLeaveModel.init({
@@ -122,6 +130,11 @@ MasterLeaveModel.init({
         type: sequelize_1.DataTypes.DATE,
         allowNull: true,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'MasterLeaveModel',
     tableName: 'master_leaves',

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

@@ -17,6 +17,7 @@ declare class OfferModel extends Model<IOffersModelAttributes, TOfferModelCreati
     startTime?: Date;
     endTime?: Date;
     userLimit?: number;
+    academicCalendarId?: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/offerModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class OfferModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel } = models;
+        const { UserModel, InstituteModel, AcademicCalenderModel } = models;
         OfferModel.belongsTo(UserModel, {
             foreignKey: {
                 name: 'userId',
@@ -46,6 +46,14 @@ class OfferModel extends sequelize_1.Model {
             },
             as: 'deletedByUser',
         });
+        OfferModel.belongsTo(AcademicCalenderModel, {
+            foreignKey: {
+                name: 'academicCalendarId',
+                field: 'academic_calendar_id',
+            },
+            as: 'offerAcaCal',
+        });
+        AcademicCalenderModel.hasMany(OfferModel, { foreignKey: 'academicCalendarId', as: 'acaCalOffer' });
     }
 }
 OfferModel.init({
@@ -114,6 +122,10 @@ OfferModel.init({
         type: sequelize_1.DataTypes.INTEGER,
         allowNull: true,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        allowNull: true,
+    }
 }, {
     modelName: 'OfferModel',
     tableName: 'offers',

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

@@ -13,6 +13,7 @@ declare class PaymentTermsModel extends Model<IPaymentTermsModelAttributes> {
     feeCollectionId: string;
     startDate: Date;
     endDate: Date;
+    academicCalendarId: string;
     static associate(models: any): void;
 }
 export default PaymentTermsModel;

package/dist/models/psql/paymentTermsModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class PaymentTermsModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel } = models;
+        const { UserModel, InstituteModel, AcademicCalendarModel } = models;
         PaymentTermsModel.belongsTo(InstituteModel, {
             foreignKey: {
                 name: 'instituteId',
@@ -46,6 +46,14 @@ class PaymentTermsModel extends sequelize_1.Model {
             },
             as: 'deletedByUser',
         });
+        PaymentTermsModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'paymentTermsAcaCal',
+        });
+        AcademicCalendarModel.hasMany(PaymentTermsModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalPaymentTerms',
+        });
     }
 }
 PaymentTermsModel.init({
@@ -103,6 +111,11 @@ PaymentTermsModel.init({
         field: 'fee_collection_id',
         allowNull: false,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'PaymentTermsModel',
     tableName: 'payment_terms',

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

@@ -15,6 +15,7 @@ declare class PdcChequeModel extends Model<IPdcChequeModelAttributes, TPdcCheque
     bankName: string;
     frequency: PDF_CHEQUE_FREQUENCY;
     standardId: string;
+    academicCalendarId?: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/pdcChequeModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class PdcChequeModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, UserFeeTypeByAccountModel, InstituteEntityModel } = models;
+        const { UserModel, InstituteModel, UserFeeTypeByAccountModel, InstituteEntityModel, AcademicCalenderModel } = models;
         PdcChequeModel.belongsTo(UserModel, {
             foreignKey: {
                 name: 'createdBy',
@@ -62,6 +62,14 @@ class PdcChequeModel extends sequelize_1.Model {
             foreignKey: 'standardId',
             as: 'StandardPdcCheques',
         });
+        PdcChequeModel.belongsTo(AcademicCalenderModel, {
+            foreignKey: {
+                name: 'academicCalendarId',
+                field: 'academic_calendar_id',
+            },
+            as: 'pdcChequeAcaCal',
+        });
+        AcademicCalenderModel.hasMany(PdcChequeModel, { foreignKey: 'academicCalendarId', field: 'academic_calendar_id', as: 'acaCalPdcCheque' });
     }
 }
 PdcChequeModel.init({
@@ -124,6 +132,11 @@ PdcChequeModel.init({
         type: sequelize_1.DataTypes.STRING,
         allowNull: true,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    }
 }, {
     modelName: 'PdcChequeModel',
     tableName: 'pdcCheques',

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

@@ -16,6 +16,7 @@ declare class PdcHistoryModel extends Model<IPdcHistoryModelAttributes, TPdcHist
     bankName: string;
     frequency: PDF_CHEQUE_FREQUENCY;
     standardId: string;
+    academicCalendarId?: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/pdcHistoryModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class PdcHistoryModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, UserFeeTypeByAccountModel, InstituteEntityModel, PdcChequeModel } = models;
+        const { UserModel, InstituteModel, UserFeeTypeByAccountModel, InstituteEntityModel, PdcChequeModel, AcademicCalenderModel } = models;
         PdcHistoryModel.belongsTo(UserModel, {
             foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' },
             as: 'createdByUser',
@@ -58,6 +58,14 @@ class PdcHistoryModel extends sequelize_1.Model {
             foreignKey: 'pdcChequeId',
             as: 'detailsOfPdcCheck',
         });
+        PdcHistoryModel.belongsTo(AcademicCalenderModel, {
+            foreignKey: {
+                name: 'academicCalendarId',
+                field: 'academic_calendar_id',
+            },
+            as: 'pdcChequeHAcaCal',
+        });
+        AcademicCalenderModel.hasMany(PdcHistoryModel, { foreignKey: 'academicCalendarId', field: 'academic_calendar_id', as: 'acaCalPdcChequeH' });
     }
 }
 PdcHistoryModel.init({
@@ -125,6 +133,11 @@ PdcHistoryModel.init({
         type: sequelize_1.DataTypes.STRING,
         allowNull: true,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    }
 }, {
     modelName: 'PdcHistoryModel',
     tableName: 'pdc_history',

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

@@ -7,6 +7,7 @@ declare class ProjectAssessmentOptionModel extends Model<IProjectAssessmentOptio
     title: string;
     subTitle: string;
     descriptions: string;
+    academicCalendarId: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

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;