From 8d86dd8a709ee4414c30209770d5465490419128 Mon Sep 17 00:00:00 2001 From: pricelees Date: Sat, 13 Sep 2025 11:47:47 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20MDC=EC=97=90=20=EB=84=A3=EB=8A=94?= =?UTF-8?q?=20=ED=9A=8C=EC=9B=90=20ID=20=EC=83=81=EC=88=98=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/roomescape/common/config/JpaConfig.kt | 4 ++-- src/main/kotlin/roomescape/common/dto/CommonAuth.kt | 2 ++ .../roomescape/common/log/ApiLogMessageConverter.kt | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/roomescape/common/config/JpaConfig.kt b/src/main/kotlin/roomescape/common/config/JpaConfig.kt index 842cd0da..8944e26a 100644 --- a/src/main/kotlin/roomescape/common/config/JpaConfig.kt +++ b/src/main/kotlin/roomescape/common/config/JpaConfig.kt @@ -5,7 +5,7 @@ import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import org.springframework.data.domain.AuditorAware import org.springframework.data.jpa.repository.config.EnableJpaAuditing -import roomescape.auth.web.support.MDC_MEMBER_ID_KEY +import roomescape.common.dto.MDC_PRINCIPAL_ID_KEY import java.util.* @Configuration @@ -18,7 +18,7 @@ class JpaConfig { class MdcAuditorAware : AuditorAware { override fun getCurrentAuditor(): Optional { - val memberIdStr: String? = MDC.get(MDC_MEMBER_ID_KEY) + val memberIdStr: String? = MDC.get(MDC_PRINCIPAL_ID_KEY) if (memberIdStr == null) { return Optional.empty() diff --git a/src/main/kotlin/roomescape/common/dto/CommonAuth.kt b/src/main/kotlin/roomescape/common/dto/CommonAuth.kt index de7ab182..7d67a872 100644 --- a/src/main/kotlin/roomescape/common/dto/CommonAuth.kt +++ b/src/main/kotlin/roomescape/common/dto/CommonAuth.kt @@ -2,6 +2,8 @@ package roomescape.common.dto import roomescape.admin.infrastructure.persistence.AdminPermissionLevel +const val MDC_PRINCIPAL_ID_KEY: String = "principal_id" + abstract class LoginCredentials { abstract val id: Long abstract val password: String diff --git a/src/main/kotlin/roomescape/common/log/ApiLogMessageConverter.kt b/src/main/kotlin/roomescape/common/log/ApiLogMessageConverter.kt index dd41a26e..85e042be 100644 --- a/src/main/kotlin/roomescape/common/log/ApiLogMessageConverter.kt +++ b/src/main/kotlin/roomescape/common/log/ApiLogMessageConverter.kt @@ -3,7 +3,7 @@ package roomescape.common.log import com.fasterxml.jackson.databind.ObjectMapper import jakarta.servlet.http.HttpServletRequest import org.slf4j.MDC -import roomescape.auth.web.support.MDC_MEMBER_ID_KEY +import roomescape.common.dto.MDC_PRINCIPAL_ID_KEY enum class LogType { INCOMING_HTTP_REQUEST, @@ -34,8 +34,8 @@ class ApiLogMessageConverter( controllerPayload: Map, ): String { val payload: MutableMap = commonRequestPayload(LogType.CONTROLLER_INVOKED, request) - val memberId: Long? = MDC.get(MDC_MEMBER_ID_KEY)?.toLong() - if (memberId != null) payload["member_id"] = memberId else payload["member_id"] = "NONE" + val memberId: Long? = MDC.get(MDC_PRINCIPAL_ID_KEY)?.toLong() + if (memberId != null) payload["principal_id"] = memberId else payload["principal_id"] = "NONE" payload.putAll(controllerPayload) @@ -48,9 +48,9 @@ class ApiLogMessageConverter( payload["endpoint"] = request.endpoint payload["status_code"] = request.httpStatus - MDC.get(MDC_MEMBER_ID_KEY)?.toLongOrNull() - ?.let { payload["member_id"] = it } - ?: run { payload["member_id"] = "NONE" } + MDC.get(MDC_PRINCIPAL_ID_KEY)?.toLongOrNull() + ?.let { payload["principal_id"] = it } + ?: run { payload["principal_id"] = "NONE" } request.startTime?.let { payload["duration_ms"] = System.currentTimeMillis() - it } request.body?.let { payload["response_body"] = it }