Merge pull request #323 from wafflestudio/develop

Release
wafflestudio · Aug 7, 2023 · 5309105 · 5309105
2 parents 6b5838f + ab500af
commit 5309105
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/core/timetable/TimetableLectureService.ts b/src/core/timetable/TimetableLectureService.ts
@@ -76,8 +76,8 @@ export async function addLecture(timetable: Timetable, lecture: UserLecture, isF
 
 
 export async function addCustomLecture(timetable: Timetable, lecture: UserLecture, isForced: boolean): Promise<void> {
-  if (isInvalidClassTime(lecture)) throw new InvalidLectureTimeJsonError()
   syncRealTimeWithPeriod(lecture)
+  if (isInvalidClassTime(lecture)) throw new InvalidLectureTimeJsonError()
 
   // ios 3.1.3 UUID 넘겨주는 에러 hotfix
   delete lecture.lecture_id
@@ -129,8 +129,8 @@ export async function partialModifyUserLecture(userId: string, tableId: string,
     LectureColorService.validateLectureColor(lecture);
   }
   if (lecture['class_time_json']) {
-    if(isInvalidClassTime(lecture)) throw new InvalidLectureTimeJsonError()
     syncRealTimeWithPeriod(lecture)
+    if(isInvalidClassTime(lecture)) throw new InvalidLectureTimeJsonError()
     validateLectureTime(lecture);
 
     const overlappingLectures = getOverlappingLectures(table, lecture).filter(overlappingLecture => overlappingLecture._id != lecture._id)
@@ -256,12 +256,12 @@ function timesOverlap(time1: TimePlace, time2: TimePlace): boolean {
 
 function syncRealTimeWithPeriod(lecture: any): void  {
   lecture.class_time_json.forEach(it => {
-    if (it.start_time && it.end_time) {
+    if (it.start_time != null && it.end_time != null) {
       const startTime = Time.fromHourMinuteString(it.start_time)
       const endTime = Time.fromHourMinuteString(it.end_time)
       it.startMinute = startTime.totalMinute
       it.endMinute = endTime.totalMinute
-    } else if (it.start && it.len) {
+    } else if (it.start != null && it.len != null) {
       it.startMinute = new Time((it.start + 8) * 60).totalMinute
       it.endMinute = new Time((it.start + it.len + 8) * 60).totalMinute
     }
@@ -270,7 +270,7 @@ function syncRealTimeWithPeriod(lecture: any): void  {
 
 function isInvalidClassTime(lecture: Lecture): boolean {
   return lecture.class_time_json.some(
-    it => (it.start == null || it.len == null) && (it.startMinute == null || it.endMinute == null) && (it.start_time == null || it.end_time == null)
+    it => it.startMinute == null || it.endMinute == null
   );
 }