pricelees/roomescape-refactored
1
0
Fork 0
generated from pricelees/issue-pr-template
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[#54] 애플리케이션 배포 #55

Merged
pricelees merged 20 commits from infra/#54 into main 2025-10-06 02:42:13 +00:00
Conversation 0 Commits 20 Files Changed 124 +8 -7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 48ee01eb9e - Show all commits

6
service/src/main/kotlin/com/sangdol/roomescape/theme/business/ThemeService.kt
View File

@ -1,8 +1,9 @@
package com.sangdol.roomescape.theme.business package com.sangdol.roomescape.theme.business
import com.sangdol.common.persistence.IDGenerator 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.admin.business.AdminService
import com.sangdol.roomescape.common.types.AuditingInfo
import com.sangdol.roomescape.theme.exception.ThemeErrorCode import com.sangdol.roomescape.theme.exception.ThemeErrorCode
import com.sangdol.roomescape.theme.exception.ThemeException import com.sangdol.roomescape.theme.exception.ThemeException
import com.sangdol.roomescape.theme.infrastructure.persistence.ThemeEntity 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.data.repository.findByIdOrNull
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional import org.springframework.transaction.annotation.Transactional
import java.time.LocalDate
private val log: KLogger = KotlinLogging.logger {} private val log: KLogger = KotlinLogging.logger {}
@ -46,7 +46,7 @@ class ThemeService(
fun findMostReservedThemeLastWeek(count: Int): ThemeInfoListResponse { fun findMostReservedThemeLastWeek(count: Int): ThemeInfoListResponse {
log.info { "[findMostReservedThemeLastWeek] 인기 테마 조회 시작: count=$count" } log.info { "[findMostReservedThemeLastWeek] 인기 테마 조회 시작: count=$count" }
val previousWeekSunday = DateUtils.getSundayOfPreviousWeek(LocalDate.now()) val previousWeekSunday = DateUtils.getSundayOfPreviousWeek(KoreaDate.today())
val previousWeekSaturday = previousWeekSunday.plusDays(6) val previousWeekSaturday = previousWeekSunday.plusDays(6)
return themeRepository.findMostReservedThemeByDateAndCount(previousWeekSunday, previousWeekSaturday, count) return themeRepository.findMostReservedThemeByDateAndCount(previousWeekSunday, previousWeekSaturday, count)

9
service/src/test/kotlin/com/sangdol/roomescape/theme/ThemeApiTest.kt
View File

@ -1,6 +1,7 @@
package com.sangdol.roomescape.theme package com.sangdol.roomescape.theme
import com.sangdol.common.types.web.HttpStatus import com.sangdol.common.types.web.HttpStatus
import com.sangdol.common.utils.KoreaDate
import com.sangdol.roomescape.supports.* import com.sangdol.roomescape.supports.*
import com.sangdol.roomescape.theme.business.DateUtils import com.sangdol.roomescape.theme.business.DateUtils
import com.sangdol.roomescape.theme.exception.ThemeErrorCode import com.sangdol.roomescape.theme.exception.ThemeErrorCode
@ -89,7 +90,7 @@ class ThemeApiTest(
user = user, user = user,
storeId = store.id, storeId = store.id,
scheduleRequest = ScheduleFixture.createRequest.copy( scheduleRequest = ScheduleFixture.createRequest.copy(
date = DateUtils.getSundayOfPreviousWeek(LocalDate.now()).plusDays(it), date = DateUtils.getSundayOfPreviousWeek(KoreaDate.today()).plusDays(it),
themeId = themeIds[0], themeId = themeIds[0],
) )
) )
@ -100,7 +101,7 @@ class ThemeApiTest(
user = user, user = user,
storeId = store.id, storeId = store.id,
scheduleRequest = ScheduleFixture.createRequest.copy( scheduleRequest = ScheduleFixture.createRequest.copy(
date = DateUtils.getSundayOfPreviousWeek(LocalDate.now()), date = DateUtils.getSundayOfPreviousWeek(KoreaDate.today()),
themeId = themeIds[1], themeId = themeIds[1],
) )
) )
@ -111,7 +112,7 @@ class ThemeApiTest(
user = user, user = user,
storeId = store.id, storeId = store.id,
scheduleRequest = ScheduleFixture.createRequest.copy( scheduleRequest = ScheduleFixture.createRequest.copy(
date = DateUtils.getSundayOfPreviousWeek(LocalDate.now()).plusDays(it), date = DateUtils.getSundayOfPreviousWeek(KoreaDate.today()).plusDays(it),
themeId = themeIds[2], themeId = themeIds[2],
) )
) )
@ -123,7 +124,7 @@ class ThemeApiTest(
user = user, user = user,
storeId = store.id, storeId = store.id,
scheduleRequest = ScheduleFixture.createRequest.copy( scheduleRequest = ScheduleFixture.createRequest.copy(
date = DateUtils.getSundayOfPreviousWeek(LocalDate.now()).plusDays(it), date = DateUtils.getSundayOfPreviousWeek(KoreaDate.today()).plusDays(it),
themeId = themeIds[3], themeId = themeIds[3],
) )
) )