@kipicore/dbcore 1.1.122 → 1.1.123

package/dist/models/psql/userHasLeaveModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class UserHasLeaveModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, MasterLeaveModel, UserHasLeaveModel } = models;
+        const { UserModel, InstituteModel, MasterLeaveModel, UserHasLeaveModel, AcademicCalendarModel } = models;
         UserHasLeaveModel.belongsTo(UserModel, {
             foreignKey: { name: 'userId', field: 'user_id' },
             as: 'leaveUser',
@@ -50,6 +50,14 @@ class UserHasLeaveModel extends sequelize_1.Model {
             foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
             as: 'deletedByUser',
         });
+        UserHasLeaveModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'userHLeaveAcaCal',
+        });
+        AcademicCalendarModel.hasMany(UserHasLeaveModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalUserHLeave',
+        });
     }
 }
 UserHasLeaveModel.init({
@@ -91,6 +99,11 @@ UserHasLeaveModel.init({
         defaultValue: 0,
         allowNull: false,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'UserHasLeaveModel',
     tableName: 'user_has_leave',

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

@@ -9,6 +9,7 @@ declare class UserHasOfferModel extends Model<IUserHasOfferModelAttributes, TUse
     courseId?: string;
     offerId: string;
     discountAmount: number;
+    academicCalendarId?: string;
     createdBy?: string;
     updatedBy?: string;
     deletedBy?: string;

package/dist/models/psql/userHasOfferModel.js

@@ -4,7 +4,7 @@ const sequelize_1 = require("sequelize");
 const index_1 = require("./index");
 class UserHasOfferModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, FeesCollectionModel, OfferModel, CourseModel } = models;
+        const { UserModel, InstituteModel, FeesCollectionModel, OfferModel, CourseModel, AcademicCalenderModel } = models;
         UserHasOfferModel.belongsTo(InstituteModel, {
             foreignKey: { name: 'instituteId', field: 'institute_id' },
             as: 'userHasOfferInstitute',
@@ -56,6 +56,14 @@ class UserHasOfferModel extends sequelize_1.Model {
             foreignKey: 'courseId',
             as: 'userOfferHasCourse',
         });
+        UserHasOfferModel.belongsTo(AcademicCalenderModel, {
+            foreignKey: {
+                name: 'academicCalendarId',
+                field: 'academic_calendar_id',
+            },
+            as: 'userHOfferAcaCal',
+        });
+        AcademicCalenderModel.hasMany(UserHasOfferModel, { foreignKey: 'academicCalendarId', field: 'academic_calendar_id', as: 'acaCalUserHOffer' });
     }
 }
 UserHasOfferModel.init({
@@ -90,6 +98,10 @@ UserHasOfferModel.init({
         type: sequelize_1.DataTypes.UUID,
         allowNull: true,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        allowNull: true,
+    }
 }, {
     modelName: 'UserHasOfferModel',
     tableName: 'user_has_offers',

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

@@ -7,6 +7,7 @@ declare class UserHasRollNumberModel extends Model<IUserHasRollNumberModelAttrib
     instituteId: string;
     batchId: string;
     rollNumber: number;
+    academicCalendarId: string;
     createdBy?: string;
     updatedBy?: string;
     deletedBy?: string;

package/dist/models/psql/userHasRollNumberModel.js

@@ -4,7 +4,7 @@ const sequelize_1 = require("sequelize");
 const index_1 = require("./index");
 class UserHasRollNumberModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, BatchModel } = models;
+        const { UserModel, InstituteModel, BatchModel, AcademicCalendarModel } = models;
         UserHasRollNumberModel.belongsTo(InstituteModel, {
             foreignKey: { name: 'instituteId', field: 'institute_id' },
             as: 'rollNumberHasInstitute',
@@ -41,6 +41,14 @@ class UserHasRollNumberModel extends sequelize_1.Model {
             foreignKey: 'userId',
             as: 'rollNumberHasUser',
         });
+        UserHasRollNumberModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'userHRollNAcaCal',
+        });
+        AcademicCalendarModel.hasMany(UserHasRollNumberModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalUserHRollN',
+        });
     }
 }
 UserHasRollNumberModel.init({
@@ -66,6 +74,11 @@ UserHasRollNumberModel.init({
         type: sequelize_1.DataTypes.INTEGER,
         allowNull: false,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'UserHasRollNumberModel',
     tableName: 'user_has_roll_number',

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

@@ -14,6 +14,7 @@ declare class UserLeaveRequestModel extends Model<IUserLeaveRequestModelAttribut
     startTime: Date;
     endTime: Date;
     userHasLeaveId?: string;
+    academicCalendarId?: string;
     createdBy?: string;
     updatedBy?: string;
     deletedBy?: string;

package/dist/models/psql/userLeaveRequestModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class UserLeaveRequestModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, MasterLeaveModel, UserHasLeaveModel } = models;
+        const { UserModel, InstituteModel, MasterLeaveModel, UserHasLeaveModel, AcademicCalendarModel } = models;
         UserLeaveRequestModel.belongsTo(UserModel, { foreignKey: 'userId', as: 'user' });
         UserLeaveRequestModel.belongsTo(InstituteModel, { foreignKey: 'instituteId', as: 'institute' });
         UserLeaveRequestModel.belongsTo(MasterLeaveModel, { foreignKey: 'leaveId', as: 'leaveDetails' });
@@ -26,6 +26,14 @@ class UserLeaveRequestModel extends sequelize_1.Model {
             foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
             as: 'deletedByUser',
         });
+        UserLeaveRequestModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'userLReqAcaCal',
+        });
+        AcademicCalendarModel.hasMany(UserLeaveRequestModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalUserLReq',
+        });
     }
 }
 UserLeaveRequestModel.init({
@@ -79,6 +87,11 @@ UserLeaveRequestModel.init({
         type: sequelize_1.DataTypes.DATE,
         allowNull: false,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'UserLeaveRequestModel',
     tableName: 'user_leave_request',

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

@@ -9,6 +9,7 @@ declare class UserProjectAssessmentOptionModel extends Model<IUserProjectAssessm
     userId: string;
     status: PROJECT_ASSESSMENT_OPTION_STATUS;
     note: string;
+    academicCalendarId?: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/userProjectAssessmentOptionModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class UserProjectAssessmentOptionModel extends sequelize_1.Model {
     static associate(models) {
-        const { BatchSubjectProjectAssessmentModel, ProjectAssessmentOptionModel, UserModel } = models;
+        const { BatchSubjectProjectAssessmentModel, ProjectAssessmentOptionModel, UserModel, AcademicCalendarModel } = models;
         UserProjectAssessmentOptionModel.belongsTo(BatchSubjectProjectAssessmentModel, {
             foreignKey: { name: 'assessmentProjectId', field: 'assessment_project_id' },
             as: 'assessmentProject',
@@ -42,6 +42,14 @@ class UserProjectAssessmentOptionModel extends sequelize_1.Model {
             foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
             as: 'deletedByUser',
         });
+        UserProjectAssessmentOptionModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'syllabusAcaCal',
+        });
+        AcademicCalendarModel.hasMany(UserProjectAssessmentOptionModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'acaCalSyllabus',
+        });
     }
 }
 UserProjectAssessmentOptionModel.init({
@@ -75,6 +83,11 @@ UserProjectAssessmentOptionModel.init({
         type: sequelize_1.DataTypes.TEXT,
         allowNull: true,
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'UserProjectAssessmentOptionModel',
     tableName: 'user_project_assessment_options',

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

@@ -10,6 +10,7 @@ declare class WorkingDayModel extends Model<IWorkingDayAttributes, TWorkingDayCr
     endTime: Date;
     instituteId: string;
     dayOfWeek: number;
+    academicCalendarId: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/workingDayModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class WorkingDayModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel } = models;
+        const { UserModel, AcademicCalendarModel } = models;
         WorkingDayModel.belongsTo(UserModel, {
             foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' },
             as: 'createdByUser',
@@ -18,6 +18,10 @@ class WorkingDayModel extends sequelize_1.Model {
             foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
             as: 'deletedByUser',
         });
+        WorkingDayModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', allowNull: true, field: 'academic_calendar_id' },
+            as: 'workingDayAcaCal',
+        });
     }
 }
 WorkingDayModel.init({
@@ -57,6 +61,11 @@ WorkingDayModel.init({
         allowNull: true,
         field: 'institute_id',
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'WorkingDayModel',
     tableName: 'working_days',

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

@@ -11,6 +11,7 @@ declare class WorkingShiftModel extends Model<IWorkingShiftAttributes, TWorkingS
     workingId: string;
     instituteId: string;
     slotId: string;
+    academicCalendarId: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/workingShiftModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class WorkingShiftModel extends sequelize_1.Model {
     static associate(models) {
-        const { WorkingDayModel, InstituteModel, SlotModel, UserModel } = models;
+        const { WorkingDayModel, InstituteModel, SlotModel, UserModel, AcademicCalendarModel } = models;
         WorkingShiftModel.belongsTo(WorkingDayModel, {
             foreignKey: 'workingId',
             as: 'shiftHasWorkingDay',
@@ -42,6 +42,10 @@ class WorkingShiftModel extends sequelize_1.Model {
             foreignKey: { name: 'deletedBy', allowNull: true, field: 'deleted_by' },
             as: 'deletedByUser',
         });
+        WorkingShiftModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', allowNull: true, field: 'academic_calendar_id' },
+            as: 'workingShiftAcaCal',
+        });
     }
 }
 WorkingShiftModel.init({
@@ -86,6 +90,11 @@ WorkingShiftModel.init({
         allowNull: true,
         field: 'institute_id',
     },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'WorkingShiftModel',
     tableName: 'working_shift_days',

package/package.json

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