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

[#44] 매장 기능 도입 #45

Merged
pricelees merged 116 commits from feat/#44 into main 2025-09-20 03:15:06 +00:00
Conversation 0 Commits 116 Files Changed 133 +8 -9
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bb6981666f - Show all commits

9
src/main/kotlin/roomescape/admin/business/AdminService.kt
View File

@ -12,7 +12,6 @@ import roomescape.admin.infrastructure.persistence.AdminRepository
import roomescape.common.dto.AdminLoginCredentials import roomescape.common.dto.AdminLoginCredentials
import roomescape.common.dto.AuditConstant import roomescape.common.dto.AuditConstant
import roomescape.common.dto.OperatorInfo import roomescape.common.dto.OperatorInfo
import roomescape.common.dto.PrincipalType
import roomescape.common.dto.toCredentials import roomescape.common.dto.toCredentials
private val log: KLogger = KotlinLogging.logger {} private val log: KLogger = KotlinLogging.logger {}
@ -37,16 +36,16 @@ class AdminService(
} }
@Transactional(readOnly = true) @Transactional(readOnly = true)
fun findOperatorOrNull(id: Long): OperatorInfo? { fun findOperatorOrUnknown(id: Long): OperatorInfo {
log.info { "[AdminService.findOperatorById] 작업자 정보 조회 시작: id=${id}" } log.info { "[AdminService.findOperatorById] 작업자 정보 조회 시작: id=${id}" }
return adminRepository.findByIdOrNull(id)?.let { admin -> 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}" } log.info { "[AdminService.findOperatorById] 작업자 정보 조회 완료: id=${admin.id}, name=${admin.name}" }
} }
} ?: run { } ?: run {
log.info { "[AdminService.findOperatorById] 작업자 정보 조회 실패. id=${id}" } log.warn { "[AdminService.findOperatorById] 작업자 정보 조회 실패. id=${id}" }
null AuditConstant.UNKNOWN_OPERATOR
} }
} }

4
src/main/kotlin/roomescape/schedule/business/ScheduleService.kt
View File

@ -53,8 +53,8 @@ class ScheduleService(
val schedule: ScheduleEntity = findOrThrow(id) val schedule: ScheduleEntity = findOrThrow(id)
val createdBy = adminService.findOperatorById(schedule.createdBy) val createdBy = adminService.findOperatorOrUnknown(schedule.createdBy)
val updatedBy = adminService.findOperatorById(schedule.updatedBy) val updatedBy = adminService.findOperatorOrUnknown(schedule.updatedBy)
return schedule.toDetailResponse(createdBy, updatedBy) return schedule.toDetailResponse(createdBy, updatedBy)
.also { .also {

4
src/main/kotlin/roomescape/theme/business/ThemeService.kt
View File

@ -78,8 +78,8 @@ class ThemeService(
val theme: ThemeEntity = findOrThrow(id) val theme: ThemeEntity = findOrThrow(id)
val createdBy = adminService.findOperatorById(theme.createdBy) val createdBy = adminService.findOperatorOrUnknown(theme.createdBy)
val updatedBy = adminService.findOperatorById(theme.updatedBy) val updatedBy = adminService.findOperatorOrUnknown(theme.updatedBy)
return theme.toAdminThemeDetailResponse(createdBy, updatedBy) return theme.toAdminThemeDetailResponse(createdBy, updatedBy)
.also { log.info { "[ThemeService.findAdminThemeDetail] 테마 상세 조회 완료: id=$id, name=${theme.name}" } } .also { log.info { "[ThemeService.findAdminThemeDetail] 테마 상세 조회 완료: id=$id, name=${theme.name}" } }