[#72] 빈자리 알림 대상 강의 못찾는 이슈 해결

wafflestudio · May 15, 2023 · 8e2ddc7 · 8e2ddc7
1 parent 8b23b7a
commit 8e2ddc7
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/...rc/main/kotlin/sugangsnu/job/vacancynotification/service/VacancyNotificationJobService.kt b/...rc/main/kotlin/sugangsnu/job/vacancynotification/service/VacancyNotificationJobService.kt
@@ -64,10 +64,6 @@ class VacancyNotifierServiceImpl(
 
         val lectureAndRegistrationStatus = (lectureMap.keys intersect registrationStatusMap.keys)
             .map { lectureMap[it]!! to registrationStatusMap[it]!! }
-        val updated = lectureAndRegistrationStatus
-            .filter { (lecture, status) -> lecture.registrationCount != status.registrationCount }
-            .map { (lecture, status) -> lecture.apply { registrationCount = status.registrationCount } }
-        lectureService.upsertLectures(updated)
 
         val isCurrentStudentRegistrationPeriod =
             coursebook.semester == Semester.SPRING && lectureAndRegistrationStatus.filter { (lecture, status) ->
@@ -81,9 +77,14 @@ class VacancyNotifierServiceImpl(
             } else {
                 lecture.quota == lecture.registrationCount
             }
-        }.filter { (lecture, status) -> (lecture.registrationCount ?: 0) > status.registrationCount }
+        }.filter { (lecture, status) -> lecture.registrationCount > status.registrationCount }
             .map { (lecture, status) -> lecture }
 
+        val updated = lectureAndRegistrationStatus
+            .filter { (lecture, status) -> lecture.registrationCount != status.registrationCount }
+            .map { (lecture, status) -> lecture.apply { registrationCount = status.registrationCount } }
+        lectureService.upsertLectures(updated)
+
         notiTargetLectures.forEach {
             logger.info("이름: ${it.courseTitle}, 강좌번호: ${it.courseNumber}, 분반번호: ${it.lectureNumber}")
         }