diff --git a/build.gradle.kts b/build.gradle.kts index e46b82b4..5f4b11d5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,6 +39,7 @@ subprojects { dependencies { add("implementation", "io.github.oshai:kotlin-logging-jvm:7.0.3") add("implementation", "io.kotest:kotest-runner-junit5:5.9.1") + add("implementation", "ch.qos.logback:logback-classic:1.5.18") } tasks.withType { diff --git a/common/log/src/main/kotlin/com/sangdol/common/log/config/LogType.kt b/common/log/src/main/kotlin/com/sangdol/common/log/constant/LogType.kt similarity index 57% rename from common/log/src/main/kotlin/com/sangdol/common/log/config/LogType.kt rename to common/log/src/main/kotlin/com/sangdol/common/log/constant/LogType.kt index e39c85bb..8717b69c 100644 --- a/common/log/src/main/kotlin/com/sangdol/common/log/config/LogType.kt +++ b/common/log/src/main/kotlin/com/sangdol/common/log/constant/LogType.kt @@ -1,10 +1,9 @@ -package com.sangdol.common.log.config +package com.sangdol.common.log.constant enum class LogType { INCOMING_HTTP_REQUEST, CONTROLLER_INVOKED, - CONTROLLER_SUCCESS, - AUTHENTICATION_FAILURE, + SUCCEED, APPLICATION_FAILURE, UNHANDLED_EXCEPTION } diff --git a/common/config/src/main/kotlin/com/sangdol/common/config/JacksonConfig.kt b/common/web/src/main/kotlin/com/sangdol/common/web/config/JacksonConfig.kt similarity index 94% rename from common/config/src/main/kotlin/com/sangdol/common/config/JacksonConfig.kt rename to common/web/src/main/kotlin/com/sangdol/common/web/config/JacksonConfig.kt index 4dc73d80..fb6eb907 100644 --- a/common/config/src/main/kotlin/com/sangdol/common/config/JacksonConfig.kt +++ b/common/web/src/main/kotlin/com/sangdol/common/web/config/JacksonConfig.kt @@ -1,4 +1,4 @@ -package com.sangdol.common.config +package com.sangdol.common.web.config import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.databind.DeserializationFeature @@ -14,7 +14,11 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer import com.fasterxml.jackson.module.kotlin.kotlinModule import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration -import java.time.* +import java.time.LocalDate +import java.time.LocalDateTime +import java.time.LocalTime +import java.time.OffsetDateTime +import java.time.ZoneId import java.time.format.DateTimeFormatter @Configuration @@ -83,4 +87,4 @@ class JacksonConfig { gen.writeString(value.format(ISO_OFFSET_DATE_TIME_FORMATTER)) } } -} +} \ No newline at end of file diff --git a/common/config/src/test/kotlin/com/sangdol/common/config/JacksonConfigTest.kt b/common/web/src/test/kotlin/com/sangdol/common/web/config/JacksonConfigTest.kt similarity index 98% rename from common/config/src/test/kotlin/com/sangdol/common/config/JacksonConfigTest.kt rename to common/web/src/test/kotlin/com/sangdol/common/web/config/JacksonConfigTest.kt index b98b02fa..19af86d1 100644 --- a/common/config/src/test/kotlin/com/sangdol/common/config/JacksonConfigTest.kt +++ b/common/web/src/test/kotlin/com/sangdol/common/web/config/JacksonConfigTest.kt @@ -1,4 +1,4 @@ -package com.sangdol.common.config +package com.sangdol.common.web.config import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.exc.InvalidFormatException @@ -89,4 +89,4 @@ class JacksonConfigTest : FunSpec({ serialized shouldBe "\"2025-07-14T12:30:00+09:00\"" } } -}) +}) \ No newline at end of file diff --git a/service/src/main/kotlin/com/sangdol/roomescape/common/log/RoomescapeLogMaskingConverter.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/log/RoomescapeLogMaskingConverter.kt index d5077d89..e5c90829 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/common/log/RoomescapeLogMaskingConverter.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/log/RoomescapeLogMaskingConverter.kt @@ -1,6 +1,6 @@ package com.sangdol.roomescape.common.log -import com.sangdol.common.config.JacksonConfig +import com.sangdol.common.web.config.JacksonConfig import com.sangdol.common.log.message.AbstractLogMaskingConverter class RoomescapeLogMaskingConverter: AbstractLogMaskingConverter( diff --git a/service/src/test/kotlin/com/sangdol/roomescape/supports/RestAssuredUtils.kt b/service/src/test/kotlin/com/sangdol/roomescape/supports/RestAssuredUtils.kt index 9e7fc01e..af53b62e 100644 --- a/service/src/test/kotlin/com/sangdol/roomescape/supports/RestAssuredUtils.kt +++ b/service/src/test/kotlin/com/sangdol/roomescape/supports/RestAssuredUtils.kt @@ -1,6 +1,6 @@ package com.sangdol.roomescape.supports -import com.sangdol.common.config.JacksonConfig +import com.sangdol.common.web.config.JacksonConfig import com.sangdol.common.types.exception.ErrorCode import io.restassured.module.kotlin.extensions.Given import io.restassured.module.kotlin.extensions.Then