From 48ee01eb9e45254c593b3dfb197a9f147bc73ef7 Mon Sep 17 00:00:00 2001
From: pricelees <priceelees@gmail.com>
Date: Sun, 5 Oct 2025 20:28:12 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20theme=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EB=B0=8F=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=EC=97=90=20=ED=95=9C=EA=B5=AD=20=EC=8B=9C=EA=B0=84=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sangdol/roomescape/theme/business/ThemeService.kt    | 6 +++---
 .../kotlin/com/sangdol/roomescape/theme/ThemeApiTest.kt  | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

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],
                 )
             )