From bb6981666f76ef841489c754e415df730e586020 Mon Sep 17 00:00:00 2001 From: pricelees Date: Mon, 15 Sep 2025 15:50:27 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20Operator=EA=B0=80=20=EC=97=86?= =?UTF-8?q?=EC=9C=BC=EB=A9=B4=20=EC=9A=B0=EC=84=A0=20Unknown=EC=9D=84=20?= =?UTF-8?q?=EB=B0=98=ED=99=98=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/roomescape/admin/business/AdminService.kt | 9 ++++----- .../roomescape/schedule/business/ScheduleService.kt | 4 ++-- .../kotlin/roomescape/theme/business/ThemeService.kt | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/roomescape/admin/business/AdminService.kt b/src/main/kotlin/roomescape/admin/business/AdminService.kt index 786fdadf..557baa68 100644 --- a/src/main/kotlin/roomescape/admin/business/AdminService.kt +++ b/src/main/kotlin/roomescape/admin/business/AdminService.kt @@ -12,7 +12,6 @@ import roomescape.admin.infrastructure.persistence.AdminRepository import roomescape.common.dto.AdminLoginCredentials import roomescape.common.dto.AuditConstant import roomescape.common.dto.OperatorInfo -import roomescape.common.dto.PrincipalType import roomescape.common.dto.toCredentials private val log: KLogger = KotlinLogging.logger {} @@ -37,16 +36,16 @@ class AdminService( } @Transactional(readOnly = true) - fun findOperatorOrNull(id: Long): OperatorInfo? { + fun findOperatorOrUnknown(id: Long): OperatorInfo { log.info { "[AdminService.findOperatorById] 작업자 정보 조회 시작: id=${id}" } return adminRepository.findByIdOrNull(id)?.let { admin -> - OperatorInfo(admin.id, admin.name, PrincipalType.ADMIN).also { + OperatorInfo(admin.id, admin.name).also { log.info { "[AdminService.findOperatorById] 작업자 정보 조회 완료: id=${admin.id}, name=${admin.name}" } } } ?: run { - log.info { "[AdminService.findOperatorById] 작업자 정보 조회 실패. id=${id}" } - null + log.warn { "[AdminService.findOperatorById] 작업자 정보 조회 실패. id=${id}" } + AuditConstant.UNKNOWN_OPERATOR } } diff --git a/src/main/kotlin/roomescape/schedule/business/ScheduleService.kt b/src/main/kotlin/roomescape/schedule/business/ScheduleService.kt index 6d52db6b..12958b86 100644 --- a/src/main/kotlin/roomescape/schedule/business/ScheduleService.kt +++ b/src/main/kotlin/roomescape/schedule/business/ScheduleService.kt @@ -53,8 +53,8 @@ class ScheduleService( val schedule: ScheduleEntity = findOrThrow(id) - val createdBy = adminService.findOperatorById(schedule.createdBy) - val updatedBy = adminService.findOperatorById(schedule.updatedBy) + val createdBy = adminService.findOperatorOrUnknown(schedule.createdBy) + val updatedBy = adminService.findOperatorOrUnknown(schedule.updatedBy) return schedule.toDetailResponse(createdBy, updatedBy) .also { diff --git a/src/main/kotlin/roomescape/theme/business/ThemeService.kt b/src/main/kotlin/roomescape/theme/business/ThemeService.kt index 81f96d37..89492250 100644 --- a/src/main/kotlin/roomescape/theme/business/ThemeService.kt +++ b/src/main/kotlin/roomescape/theme/business/ThemeService.kt @@ -78,8 +78,8 @@ class ThemeService( val theme: ThemeEntity = findOrThrow(id) - val createdBy = adminService.findOperatorById(theme.createdBy) - val updatedBy = adminService.findOperatorById(theme.updatedBy) + val createdBy = adminService.findOperatorOrUnknown(theme.createdBy) + val updatedBy = adminService.findOperatorOrUnknown(theme.updatedBy) return theme.toAdminThemeDetailResponse(createdBy, updatedBy) .also { log.info { "[ThemeService.findAdminThemeDetail] 테마 상세 조회 완료: id=$id, name=${theme.name}" } }