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 index fdf6c56..1e25613 100644 --- 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 index 2be5231..bfad425 100644 --- 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 { fun findAllByGroupAndDateBetween(group: Group, start: LocalDate, end: LocalDate): List + fun findAllByGroupAndDateBetweenOrderByDate(group: Group, start: LocalDate, end: LocalDate): List fun existsByGroupAndDate(group: Group, date: LocalDate): Boolean fun deleteByGroupAndDateIn(group: Group, date: List) } \ No newline at end of file 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 index 76fc524..5527fac 100644 --- 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() } } \ No newline at end of file