@kipicore/dbcore 1.1.286 → 1.1.288

package/dist/db/psql/index.js

@@ -65,6 +65,7 @@ const CampusCarnivalModule = require('./seeders/Data/campusCarnival');
 const TransportModule = require('./seeders/Data/transportModule');
 const GreetingModule = require('./seeders/Data/greetingModule');
 const TaskManagementModule = require('./seeders/Data/taskManagementModule');
+const UserRoleModule = require('./seeders/Data/UserRoleModule');
 // const DashboardManagementModule = require('./seeders/Data/dashboardManagementModule'); // Need to uncomment dashboard module is ready
 // const CertificateManagementModule = require('./seeders/Data/certificateManagementModule'); // Need to uncomment certificate module is ready
 const allModules = [
@@ -133,5 +134,6 @@ const allModules = [
     TaskManagementModule,
     // DashboardManagementModule // Need to uncomment dashboard module is ready
     // CertificateManagementModule // Need to uncomment certificate module is ready
+    UserRoleModule,
 ];
 module.exports = allModules;

package/dist/db/psql/seeders/Data/UserRoleModule.d.ts

@@ -0,0 +1,13 @@
+export let name: string;
+export let code: string;
+export let appType: string[];
+export let features: {
+    name: string;
+    code: string;
+    appType: string[];
+    actions: {
+        name: string;
+        code: string;
+        appType: string[];
+    }[];
+}[];

package/dist/db/psql/seeders/Data/UserRoleModule.js

@@ -0,0 +1,18 @@
+"use strict";
+const appTypeEnum = require('./appType');
+const UserRoleModule = {
+    name: 'User Role',
+    code: 'USERROLE',
+    appType: [appTypeEnum.SCHOOL_APP],
+    features: [
+        {
+            name: 'User Role Management',
+            code: 'USERROLE.USERROLEMANAGEMENT',
+            appType: [appTypeEnum.SCHOOL_APP],
+            actions: [
+                { name: 'Principle', code: 'USERROLE.USERROLEMANAGEMENT.PRINCIPLE', appType: [appTypeEnum.SCHOOL_APP] },
+            ],
+        },
+    ],
+};
+module.exports = UserRoleModule;

package/dist/models/psql/lectureModel.js

@@ -103,13 +103,20 @@ class LectureModel extends sequelize_1.Model {
                     if (classRoomConflict)
                         throw new Error(errorMessages_1.LECTURE_ERROR_MESSAGES.CLASSROOM_OCCUPIED);
                 }
+                const teacherConflictWhere = (0, utils_1.omit)(where, ['slotId']);
                 if (lecture.primaryUserId) {
-                    const teacherConflict = await LectureModel.findOne({ where: { ...where, primaryUserId: lecture.primaryUserId }, ...options });
+                    const teacherConflict = await LectureModel.findOne({
+                        where: { ...teacherConflictWhere, primaryUserId: lecture.primaryUserId },
+                        ...options,
+                    });
                     if (teacherConflict)
                         throw new Error(errorMessages_1.LECTURE_ERROR_MESSAGES.TEACHER_OCCUPIED);
                 }
                 if (lecture.secondaryUserId) {
-                    const teacherConflict = await LectureModel.findOne({ where: { ...where, secondaryUserId: lecture.secondaryUserId }, ...options });
+                    const teacherConflict = await LectureModel.findOne({
+                        where: { ...teacherConflictWhere, secondaryUserId: lecture.secondaryUserId },
+                        ...options,
+                    });
                     if (teacherConflict)
                         throw new Error(errorMessages_1.LECTURE_ERROR_MESSAGES.TEACHER_OCCUPIED);
                 }

package/package.json

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