From 26910f1d14cd90878ea520fc5ca095669f07eeae Mon Sep 17 00:00:00 2001 From: pricelees Date: Fri, 12 Sep 2025 21:27:28 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=ED=85=8C=EB=A7=88=20/=20=EC=9D=BC?= =?UTF-8?q?=EC=A0=95=EC=97=90=EC=84=9C=EC=9D=98=20=EC=83=9D=EC=84=B1(?= =?UTF-8?q?=EC=88=98=EC=A0=95)=EC=9D=B8=20=EB=B0=98=ED=99=98=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=EC=9D=84=20OperatorInfo=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roomescape/schedule/business/ScheduleService.kt | 7 ++++--- .../kotlin/roomescape/schedule/web/ScheduleDto.kt | 7 ++++--- .../kotlin/roomescape/theme/business/ThemeService.kt | 9 +++++---- src/main/kotlin/roomescape/theme/web/ThemeDto.kt | 11 ++++++----- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/main/kotlin/roomescape/schedule/business/ScheduleService.kt b/src/main/kotlin/roomescape/schedule/business/ScheduleService.kt index 2d8ce9e3..9c5efbb5 100644 --- a/src/main/kotlin/roomescape/schedule/business/ScheduleService.kt +++ b/src/main/kotlin/roomescape/schedule/business/ScheduleService.kt @@ -7,6 +7,7 @@ import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional +import roomescape.admin.business.AdminService import roomescape.common.config.next import roomescape.member.business.MemberService import roomescape.schedule.exception.ScheduleErrorCode @@ -23,7 +24,7 @@ class ScheduleService( private val scheduleRepository: ScheduleRepository, private val scheduleValidator: ScheduleValidator, private val tsidFactory: TsidFactory, - private val memberService: MemberService + private val adminService: AdminService ) { @Transactional(readOnly = true) @@ -53,8 +54,8 @@ class ScheduleService( val schedule: ScheduleEntity = findOrThrow(id) - val createdBy = memberService.findSummaryById(schedule.createdBy).name - val updatedBy = memberService.findSummaryById(schedule.updatedBy).name + val createdBy = adminService.findOperatorById(schedule.createdBy) + val updatedBy = adminService.findOperatorById(schedule.updatedBy) return schedule.toDetailRetrieveResponse(createdBy, updatedBy) .also { diff --git a/src/main/kotlin/roomescape/schedule/web/ScheduleDto.kt b/src/main/kotlin/roomescape/schedule/web/ScheduleDto.kt index 2812bfaf..15360615 100644 --- a/src/main/kotlin/roomescape/schedule/web/ScheduleDto.kt +++ b/src/main/kotlin/roomescape/schedule/web/ScheduleDto.kt @@ -1,5 +1,6 @@ package roomescape.schedule.web +import roomescape.common.dto.OperatorInfo import roomescape.schedule.infrastructure.persistence.ScheduleEntity import roomescape.schedule.infrastructure.persistence.ScheduleStatus import java.time.LocalDate @@ -49,12 +50,12 @@ data class ScheduleDetailRetrieveResponse( val time: LocalTime, val status: ScheduleStatus, val createdAt: LocalDateTime, - val createdBy: String, + val createdBy: OperatorInfo, val updatedAt: LocalDateTime, - val updatedBy: String, + val updatedBy: OperatorInfo, ) -fun ScheduleEntity.toDetailRetrieveResponse(createdBy: String, updatedBy: String) = ScheduleDetailRetrieveResponse( +fun ScheduleEntity.toDetailRetrieveResponse(createdBy: OperatorInfo, updatedBy: OperatorInfo) = ScheduleDetailRetrieveResponse( id = this.id, date = this.date, time = this.time, diff --git a/src/main/kotlin/roomescape/theme/business/ThemeService.kt b/src/main/kotlin/roomescape/theme/business/ThemeService.kt index a24be7cb..56ae0271 100644 --- a/src/main/kotlin/roomescape/theme/business/ThemeService.kt +++ b/src/main/kotlin/roomescape/theme/business/ThemeService.kt @@ -6,6 +6,7 @@ import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional +import roomescape.admin.business.AdminService import roomescape.common.config.next import roomescape.member.business.MemberService import roomescape.theme.exception.ThemeErrorCode @@ -19,9 +20,9 @@ private val log: KLogger = KotlinLogging.logger {} @Service class ThemeService( private val themeRepository: ThemeRepository, + private val themeValidator: ThemeValidator, private val tsidFactory: TsidFactory, - private val memberService: MemberService, - private val themeValidator: ThemeValidator + private val adminService: AdminService ) { @Transactional(readOnly = true) fun findThemesByIds(request: ThemeListRetrieveRequest): ThemeSummaryListResponse { @@ -66,8 +67,8 @@ class ThemeService( val theme: ThemeEntity = findOrThrow(id) - val createdBy = memberService.findSummaryById(theme.createdBy).name - val updatedBy = memberService.findSummaryById(theme.updatedBy).name + val createdBy = adminService.findOperatorById(theme.createdBy) + val updatedBy = adminService.findOperatorById(theme.updatedBy) return theme.toAdminThemeDetailResponse(createdBy, updatedBy) .also { log.info { "[ThemeService.findAdminThemeDetail] 테마 상세 조회 완료: id=$id, name=${theme.name}" } } diff --git a/src/main/kotlin/roomescape/theme/web/ThemeDto.kt b/src/main/kotlin/roomescape/theme/web/ThemeDto.kt index 8f5fb270..a1cf87a8 100644 --- a/src/main/kotlin/roomescape/theme/web/ThemeDto.kt +++ b/src/main/kotlin/roomescape/theme/web/ThemeDto.kt @@ -1,5 +1,6 @@ package roomescape.theme.web +import roomescape.common.dto.OperatorInfo import roomescape.theme.infrastructure.persistence.Difficulty import roomescape.theme.infrastructure.persistence.ThemeEntity import java.time.LocalDateTime @@ -103,12 +104,12 @@ data class AdminThemeDetailRetrieveResponse( val expectedMinutesTo: Short, val isOpen: Boolean, val createdAt: LocalDateTime, - val createdBy: String, + val createdBy: OperatorInfo, val updatedAt: LocalDateTime, - val updatedBy: String, + val updatedBy: OperatorInfo, ) -fun ThemeEntity.toAdminThemeDetailResponse(createUserName: String, updateUserName: String) = +fun ThemeEntity.toAdminThemeDetailResponse(createdBy: OperatorInfo, updatedBy: OperatorInfo) = AdminThemeDetailRetrieveResponse( id = this.id, name = this.name, @@ -123,9 +124,9 @@ fun ThemeEntity.toAdminThemeDetailResponse(createUserName: String, updateUserNam expectedMinutesTo = this.expectedMinutesTo, isOpen = this.isOpen, createdAt = this.createdAt, - createdBy = createUserName, + createdBy = createdBy, updatedAt = this.updatedAt, - updatedBy = updateUserName + updatedBy = updatedBy ) data class ThemeListRetrieveRequest(