feat: 시간표 조합이 없으면 예외 반환

yourssu · Feb 5, 2025 · 10526b2 · 10526b2
1 parent 0b58afc
commit 10526b2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/main/kotlin/com/yourssu/soongpt/domain/course/implement/CoursesFactory.kt b/src/main/kotlin/com/yourssu/soongpt/domain/course/implement/CoursesFactory.kt
@@ -1,5 +1,6 @@
 package com.yourssu.soongpt.domain.course.implement
 
+import com.yourssu.soongpt.domain.course.implement.exception.InvalidTimetableRequestException
 import org.springframework.stereotype.Component
 
 @Component
@@ -13,4 +14,10 @@ class CoursesFactory {
             }
         }.map { Courses(it) }
     }
+
+    fun validateEmpty(timetableCandidates: List<Courses>) {
+        if (timetableCandidates.isEmpty()) {
+            throw InvalidTimetableRequestException()
+        }
+    }
 }
diff --git a/...com/yourssu/soongpt/domain/course/implement/exception/InvalidTimetableRequestException.kt b/...com/yourssu/soongpt/domain/course/implement/exception/InvalidTimetableRequestException.kt
@@ -0,0 +1,7 @@
+package com.yourssu.soongpt.domain.course.implement.exception
+
+import com.yourssu.soongpt.common.handler.BadRequestException
+
+class InvalidTimetableRequestException : BadRequestException(message = "시간표가 나올 수 있는 경우의 수가 없습니다.") {
+
+}
diff --git a/src/main/kotlin/com/yourssu/soongpt/domain/timetable/business/TimetableService.kt b/src/main/kotlin/com/yourssu/soongpt/domain/timetable/business/TimetableService.kt
@@ -32,14 +32,13 @@ class TimetableService(
         val majorElectiveCourses =
             command.majorElectiveCourses.map { courseReader.findAllByCourseNameInMajorElective(department.id!!, it) }
         val generalRequiredCourses =
-            command.generalRequiredCourses.map {
-                courseReader.findAllByCourseNameInGeneralRequired(
-                    department.id!!,
-                    it
-                )
+            command.generalRequiredCourses.map { courseReader.findAllByCourseNameInGeneralRequired(department.id!!, it)
             }
+
         val coursesCandidates =
             coursesFactory.generateTimetableCandidates(majorRequiredCourses + majorElectiveCourses + generalRequiredCourses)
+        coursesFactory.validateEmpty(coursesCandidates)
+
         val responses = ArrayList<TimetableResponse>()
         for (courses in coursesCandidates) {
             val timetable = timetableWriter.save(Timetable(tag = Tag.DEFAULT))