Merge branch 'develop'

rudeh2926 · rudeh2926 · commit 85f0b8ba372f · 2024-11-05T19:37:02.000+09:00
diff --git a/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryIsWeekendMealPeriodService.kt b/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryIsWeekendMealPeriodService.kt
@@ -38,7 +38,7 @@ class QueryIsWeekendMealPeriodService(
     }
 
     private fun findNextPeriod(today: LocalDate, periods: List<WeekendMealPeriod>): WeekendMealPeriod? {
-        return periods.filter { it.start.isAfter(today) }
-            .minByOrNull { it.start }
+        return periods.firstOrNull { it.start.isAfter(today) }
+            ?: periods.lastOrNull { it.end.isBefore(today) }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class QueryIsWeekendMealPeriodService(`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`private fun findNextPeriod(today: LocalDate, periods: List<WeekendMealPeriod>): WeekendMealPeriod? {`
`41`		`- return periods.filter { it.start.isAfter(today) }`
`42`		`- .minByOrNull { it.start }`
	`41`	`+ return periods.firstOrNull { it.start.isAfter(today) }`
	`42`	`+ ?: periods.lastOrNull { it.end.isBefore(today) }`
`43`	`43`	`}`
`44`	`44`	`}`