휴일 조회시 정렬 추가

KNU-HAEDAL · May 30, 2024 · 584542f · 584542f
1 parent f77136a
commit 584542f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/back/src/main/kotlin/knu/dong/onedayonebaek/fine/service/FineService.kt b/back/src/main/kotlin/knu/dong/onedayonebaek/fine/service/FineService.kt
@@ -39,8 +39,6 @@ class FineService(
                 val solvedDates = problemsOfUsers[user.id]!!
                     .groupingBy { it.solvedDate }.eachCount()
 
-                myLogger.error { solvedDates }
-                myLogger.error { targetDates }
                 result[userDto] = targetDates.count {
                     if (solvedDates.containsKey(it)) {
                         solvedDates[it]!! < group.goalSolveCount

diff --git a/back/src/main/kotlin/knu/dong/onedayonebaek/holiday/repository/HolidayRepository.kt b/back/src/main/kotlin/knu/dong/onedayonebaek/holiday/repository/HolidayRepository.kt
@@ -8,6 +8,7 @@ import java.time.LocalDate
 interface HolidayRepository: JpaRepository<Holiday, Long> {
 
     fun findAllByGroupAndDateBetween(group: Group, start: LocalDate, end: LocalDate): List<Holiday>
+    fun findAllByGroupAndDateBetweenOrderByDate(group: Group, start: LocalDate, end: LocalDate): List<Holiday>
     fun existsByGroupAndDate(group: Group, date: LocalDate): Boolean
     fun deleteByGroupAndDateIn(group: Group, date: List<LocalDate>)
 }
diff --git a/back/src/main/kotlin/knu/dong/onedayonebaek/holiday/service/HolidayService.kt b/back/src/main/kotlin/knu/dong/onedayonebaek/holiday/service/HolidayService.kt
@@ -58,9 +58,7 @@ class HolidayService(
         }
 
         return holidayRepository
-            .findAllByGroupAndDateBetween(group, start, end)
-            .stream()
+            .findAllByGroupAndDateBetweenOrderByDate(group, start, end)
             .map(Holiday::date)
-            .toList()
     }
 }