@kipicore/dbcore 1.1.287 → 1.1.289
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -103,13 +103,20 @@ class LectureModel extends sequelize_1.Model {
|
|
|
103
103
|
if (classRoomConflict)
|
|
104
104
|
throw new Error(errorMessages_1.LECTURE_ERROR_MESSAGES.CLASSROOM_OCCUPIED);
|
|
105
105
|
}
|
|
106
|
+
// const teacherConflictWhere = omit(where, ['slotId']);
|
|
106
107
|
if (lecture.primaryUserId) {
|
|
107
|
-
const teacherConflict = await LectureModel.findOne({
|
|
108
|
+
const teacherConflict = await LectureModel.findOne({
|
|
109
|
+
where: { ...where, primaryUserId: lecture.primaryUserId },
|
|
110
|
+
...options,
|
|
111
|
+
});
|
|
108
112
|
if (teacherConflict)
|
|
109
113
|
throw new Error(errorMessages_1.LECTURE_ERROR_MESSAGES.TEACHER_OCCUPIED);
|
|
110
114
|
}
|
|
111
115
|
if (lecture.secondaryUserId) {
|
|
112
|
-
const teacherConflict = await LectureModel.findOne({
|
|
116
|
+
const teacherConflict = await LectureModel.findOne({
|
|
117
|
+
where: { ...where, secondaryUserId: lecture.secondaryUserId },
|
|
118
|
+
...options,
|
|
119
|
+
});
|
|
113
120
|
if (teacherConflict)
|
|
114
121
|
throw new Error(errorMessages_1.LECTURE_ERROR_MESSAGES.TEACHER_OCCUPIED);
|
|
115
122
|
}
|
package/package.json
CHANGED