feat: 최종 시간표 후보가 태그 기준을 미충족하면 기본 태그에서 최소 개수 선정

yourssu · Feb 9, 2025 · a253b40 · a253b40
1 parent 302c8ab
commit a253b40
Showing 1 changed file with 23 additions and 5 deletions.
diff --git a/src/main/kotlin/com/yourssu/soongpt/domain/timetable/implement/TimetableCandidates.kt b/src/main/kotlin/com/yourssu/soongpt/domain/timetable/implement/TimetableCandidates.kt
@@ -5,6 +5,10 @@ import com.yourssu.soongpt.domain.course.implement.Courses
 class TimetableCandidates(
     val values: List<TimetableCandidate>
 ) {
+    companion object {
+        const val TAG_CANDIDATES_SIZE = 5
+    }
+
     fun filterRules(): TimetableCandidates {
         return TimetableCandidates(values.filter { timetableRules(it) })
     }
@@ -25,11 +29,25 @@ class TimetableCandidates(
     }
 
     fun pickTopNOfFinalScores(n: Int, maximumTagLimit: Int): TimetableCandidates {
-        return TimetableCandidates(values.groupBy { it.tag }
-            .map { timetables -> timetables.value
+        val result = TimetableCandidates(
+            values.groupBy { it.tag }
+                .asSequence()
+                .filter { it.key != Tag.DEFAULT }
+                .map { timetables ->
+                    timetables.value
+                        .sortedByDescending { it.calculateFinalScore() }
+                        .take(maximumTagLimit)
+                }.flatten()
                 .sortedByDescending { it.calculateFinalScore() }
-                .take(maximumTagLimit)
-            }.flatten()
-            .take(n))
+                .take(n)
+                .toList())
+        if (validateMinimumTimetablePolicy(result)) {
+            return TimetableCandidates(result.values + values.filter { it.tag == Tag.DEFAULT }
+                .take(TAG_CANDIDATES_SIZE - result.values.size))
+        }
+        return result
     }
+
+    private fun validateMinimumTimetablePolicy(result: TimetableCandidates) =
+        result.values.size < TAG_CANDIDATES_SIZE
 }