Merge branch 'develop'

DSM-PICK · Nov 5, 2024 · 85f0b8b · 85f0b8b
2 parents cad886c + a90f9fe
commit 85f0b8b
Showing 1 changed file with 2 additions and 2 deletions.
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) }
     }
 }