diff --git a/service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeService.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeService.kt index d2799a24..78788a17 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeService.kt @@ -1,8 +1,9 @@ package com.sangdol.roomescape.theme.business import com.sangdol.common.persistence.IDGenerator -import com.sangdol.roomescape.common.types.AuditingInfo +import com.sangdol.common.utils.KoreaDate import com.sangdol.roomescape.admin.business.AdminService +import com.sangdol.roomescape.common.types.AuditingInfo import com.sangdol.roomescape.theme.exception.ThemeErrorCode import com.sangdol.roomescape.theme.exception.ThemeException import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeEntity @@ -13,7 +14,6 @@ import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import java.time.LocalDate private val log: KLogger = KotlinLogging.logger {} @@ -46,7 +46,7 @@ class ThemeService( fun findMostReservedThemeLastWeek(count: Int): ThemeInfoListResponse { log.info { "[findMostReservedThemeLastWeek] 인기 테마 조회 시작: count=$count" } - val previousWeekSunday = DateUtils.getSundayOfPreviousWeek(LocalDate.now()) + val previousWeekSunday = DateUtils.getSundayOfPreviousWeek(KoreaDate.today()) val previousWeekSaturday = previousWeekSunday.plusDays(6) return themeRepository.findMostReservedThemeByDateAndCount(previousWeekSunday, previousWeekSaturday, count) diff --git a/service/src/test/kotlin/com/sangdol/roomescape/theme/ThemeApiTest.kt b/service/src/test/kotlin/com/sangdol/roomescape/theme/ThemeApiTest.kt index f589b380..b99987d4 100644 --- a/service/src/test/kotlin/com/sangdol/roomescape/theme/ThemeApiTest.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/theme/ThemeApiTest.kt @@ -1,6 +1,7 @@ package com.sangdol.roomescape.theme import com.sangdol.common.types.web.HttpStatus +import com.sangdol.common.utils.KoreaDate import com.sangdol.roomescape.supports.* import com.sangdol.roomescape.theme.business.DateUtils import com.sangdol.roomescape.theme.exception.ThemeErrorCode @@ -89,7 +90,7 @@ class ThemeApiTest( user = user, storeId = store.id, scheduleRequest = ScheduleFixture.createRequest.copy( - date = DateUtils.getSundayOfPreviousWeek(LocalDate.now()).plusDays(it), + date = DateUtils.getSundayOfPreviousWeek(KoreaDate.today()).plusDays(it), themeId = themeIds[0], ) ) @@ -100,7 +101,7 @@ class ThemeApiTest( user = user, storeId = store.id, scheduleRequest = ScheduleFixture.createRequest.copy( - date = DateUtils.getSundayOfPreviousWeek(LocalDate.now()), + date = DateUtils.getSundayOfPreviousWeek(KoreaDate.today()), themeId = themeIds[1], ) ) @@ -111,7 +112,7 @@ class ThemeApiTest( user = user, storeId = store.id, scheduleRequest = ScheduleFixture.createRequest.copy( - date = DateUtils.getSundayOfPreviousWeek(LocalDate.now()).plusDays(it), + date = DateUtils.getSundayOfPreviousWeek(KoreaDate.today()).plusDays(it), themeId = themeIds[2], ) ) @@ -123,7 +124,7 @@ class ThemeApiTest( user = user, storeId = store.id, scheduleRequest = ScheduleFixture.createRequest.copy( - date = DateUtils.getSundayOfPreviousWeek(LocalDate.now()).plusDays(it), + date = DateUtils.getSundayOfPreviousWeek(KoreaDate.today()).plusDays(it), themeId = themeIds[3], ) )