@kipicore/dbcore 1.1.323 → 1.1.326

package/dist/constants/app.d.ts

@@ -327,7 +327,8 @@ export declare enum TYPE_MANAGEMENT_TYPE {
     GENERAL_FEE = "GENERAL_FEE",
     BOOK_ASSESSMENT = "BOOK_ASSESSMENT",
     PROJECT_ASSESSMENT = "PROJECT_ASSESSMENT",
-    ROOM_TYPE = "ROOM_TYPE"
+    ROOM_TYPE = "ROOM_TYPE",
+    EXAM_TERM_TYPE = "EXAM_TERM_TYPE"
 }
 export declare enum TYPE_MANAGEMENT_STATUS {
     ACTIVE = "ACTIVE",

package/dist/constants/app.js

@@ -400,6 +400,7 @@ var TYPE_MANAGEMENT_TYPE;
     TYPE_MANAGEMENT_TYPE["BOOK_ASSESSMENT"] = "BOOK_ASSESSMENT";
     TYPE_MANAGEMENT_TYPE["PROJECT_ASSESSMENT"] = "PROJECT_ASSESSMENT";
     TYPE_MANAGEMENT_TYPE["ROOM_TYPE"] = "ROOM_TYPE";
+    TYPE_MANAGEMENT_TYPE["EXAM_TERM_TYPE"] = "EXAM_TERM_TYPE";
 })(TYPE_MANAGEMENT_TYPE || (exports.TYPE_MANAGEMENT_TYPE = TYPE_MANAGEMENT_TYPE = {}));
 var TYPE_MANAGEMENT_STATUS;
 (function (TYPE_MANAGEMENT_STATUS) {

package/dist/interfaces/examGroupInterface.d.ts

@@ -28,4 +28,5 @@ export interface IExamGroupModelAttributes extends IDefaultAttributes, Document
     subjects?: string[];
     status: EXAM_GROUP_STATUS;
     academicCalendarId?: string;
+    examTermType: string;
 }

package/dist/models/mongodb/examGroupModel.js

@@ -45,6 +45,7 @@ const sequelize_1 = require("sequelize");
 const userInstituteMetaModel_1 = __importDefault(require("./userInstituteMetaModel"));
 const utils_1 = require("../../helpers/utils");
 const date_fns_1 = require("date-fns");
+const psql_1 = require("../psql");
 const examGroupDaysSchema = new mongoose_1.Schema({
     date: {
         type: Date,
@@ -142,6 +143,10 @@ const examGroupModelSchema = new mongoose_1.Schema({
         enum: app_1.EXAM_GROUP_STATUS,
         default: app_1.EXAM_GROUP_STATUS.PENDING,
     },
+    examTermType: {
+        type: String,
+        required: false,
+    },
 }, {
     timestamps: true,
     versionKey: false,
@@ -158,6 +163,16 @@ const createOrUpdateHook = async (examGroup) => {
             if (!institute)
                 throw new Error(errorMessages_1.INSTITUTE_ERROR_MESSAGES.NOT_FOUND);
         }
+        if (examGroup.examTermType) {
+            const examTermType = await psql_1.TypeManagementModel.findOne({
+                where: {
+                    id: examGroup.examTermType,
+                    type: app_1.TYPE_MANAGEMENT_TYPE.EXAM_TERM_TYPE,
+                },
+            });
+            if (!examTermType)
+                throw new Error(errorMessages_1.TYPE_MANAGEMENT_ERROR_MESSAGES.NOT_FOUND);
+        }
         if (examGroup.standards) {
             examGroup.standards = [...new Set(examGroup.standards)];
             const standardCount = await instituteEntityModel_1.default.count({

package/dist/models/psql/lectureModel.js

@@ -57,7 +57,7 @@ class LectureModel extends sequelize_1.Model {
                         throw new Error(errorMessages_1.LECTURE_ERROR_MESSAGES.INVALID_LECTURE_TIME);
                 }
             }
-            if (lecture.classRoomId && lecture?.title?.toLowerCase()?.includes('lecture')) {
+            if (lecture.classRoomId) {
                 const classRoom = await ClassRoomModel.findByPk(lecture.classRoomId);
                 if (!classRoom)
                     throw new Error(errorMessages_1.CLASSROOM_ERROR_MESSAGES.NOT_FOUND);
@@ -91,7 +91,7 @@ class LectureModel extends sequelize_1.Model {
                 };
                 if (lecture.id)
                     where = { ...where, id: { [sequelize_1.Op.ne]: lecture.id } };
-                if (lecture.classRoomId) {
+                if (lecture.classRoomId && lecture?.title?.toLowerCase()?.includes('lecture')) {
                     const classRoomConflict = await LectureModel.findOne({
                         where: { ...where, classRoomId: lecture.classRoomId },
                         ...options,

package/package.json

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