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

[#34] 회원 / 인증 도메인 재정의 #43

Merged
pricelees merged 73 commits from refactor/#34 into main 2025-09-13 10:13:45 +00:00
Conversation 0 Commits 73 Files Changed 150 +10 -8
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8d86dd8a70 - Show all commits

4
src/main/kotlin/roomescape/common/config/JpaConfig.kt
View File

@ -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<Long> {
override fun getCurrentAuditor(): Optional<Long> {
val memberIdStr: String? = MDC.get(MDC_MEMBER_ID_KEY)
val memberIdStr: String? = MDC.get(MDC_PRINCIPAL_ID_KEY)
if (memberIdStr == null) {
return Optional.empty()

2
src/main/kotlin/roomescape/common/dto/CommonAuth.kt
View File

@ -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

12
src/main/kotlin/roomescape/common/log/ApiLogMessageConverter.kt
View File

@ -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, Any>,
): String {
val payload: MutableMap<String, Any> = 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 }