From 1bb88066bcb33f3161d2f8c73627b3c26bad4976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=8F=84=EA=B2=BD?= Date: Fri, 1 Nov 2024 08:48:10 +0900 Subject: [PATCH 1/2] WIP on develop --- .../weekendmeal/service/QueryIsWeekendMealPeriodService.kt | 5 +++-- .../service/QueryWeekendMealApplicationService.kt | 6 ++++-- 2 files changed, 7 insertions(+), 4 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 index 11026273..513273b4 100644 --- a/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryIsWeekendMealPeriodService.kt +++ b/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryIsWeekendMealPeriodService.kt @@ -8,6 +8,7 @@ import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import java.time.LocalDate import java.time.LocalDate.now +import java.time.ZoneId @Service class QueryIsWeekendMealPeriodService( @@ -16,7 +17,7 @@ class QueryIsWeekendMealPeriodService( @Transactional(readOnly = true) override fun isWeekendMealPeriod(): QueryIsPeriodStatusResponse { - val today = now() + val today = now(ZoneId.of("Asia/Seoul")) val periods = queryWeekendMealPeriodPort.queryAllWeekendMeal() val currentPeriod = findCurrentPeriod(today, periods) @@ -32,7 +33,7 @@ class QueryIsWeekendMealPeriodService( private fun findCurrentPeriod(today: LocalDate, periods: List): WeekendMealPeriod? { return periods.find { - today.isAfter(it.start.minusDays(1)) && today.isBefore(it.end.plusDays(1)) + (today.isEqual(it.start) || today.isAfter(it.start)) && today.isBefore(it.end.plusDays(1)) } } diff --git a/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryWeekendMealApplicationService.kt b/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryWeekendMealApplicationService.kt index ed0d06ea..b2b86978 100644 --- a/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryWeekendMealApplicationService.kt +++ b/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryWeekendMealApplicationService.kt @@ -6,6 +6,7 @@ import dsm.pick2024.domain.weekendmeal.presentation.dto.response.QueryWeekendMea import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import java.time.LocalDate.* +import java.time.ZoneId @Service class QueryWeekendMealApplicationService( @@ -14,12 +15,13 @@ class QueryWeekendMealApplicationService( @Transactional override fun queryWeekendMealApplication(): QueryWeekendMealStatusResponse { - val today = now() + val today = now(ZoneId.of("Asia/Seoul")) + val periods = queryWeekendMealPeriodPort.queryAllWeekendMeal() val period = periods.find { - today.isAfter(it.start.minusDays(1)) && today.isBefore(it.end.plusDays(1)) + (today.isEqual(it.start) || today.isAfter(it.start)) && today.isBefore(it.end.plusDays(1)) } val status = period != null From f77cbc45bd2ffd591170212c769848115fb8daf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=8F=84=EA=B2=BD?= Date: Fri, 1 Nov 2024 08:50:51 +0900 Subject: [PATCH 2/2] ktlint --- .../weekendmeal/service/QueryWeekendMealApplicationService.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryWeekendMealApplicationService.kt b/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryWeekendMealApplicationService.kt index b2b86978..f23c621d 100644 --- a/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryWeekendMealApplicationService.kt +++ b/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryWeekendMealApplicationService.kt @@ -17,7 +17,6 @@ class QueryWeekendMealApplicationService( override fun queryWeekendMealApplication(): QueryWeekendMealStatusResponse { val today = now(ZoneId.of("Asia/Seoul")) - val periods = queryWeekendMealPeriodPort.queryAllWeekendMeal() val period = periods.find {