From a7b3636410c32f0d551b2bc30d8ca1ec28f3532b Mon Sep 17 00:00:00 2001 From: pricelees Date: Sat, 27 Sep 2025 20:48:17 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?= =?UTF-8?q?=EC=98=88=EC=99=B8=20=ED=83=80=EC=9E=85=20=EA=B3=B5=ED=86=B5=20?= =?UTF-8?q?=EB=AA=A8=EB=93=88=20=EC=9D=B4=EC=A0=84=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B8=ED=95=9C=20=EA=B8=B0=EC=A1=B4=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=EB=8D=95=EC=85=98=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/build.gradle.kts | 1 + .../admin/exception/AdminException.kt | 6 ++-- .../auth/exception/AuthErrorCode.kt | 4 +-- .../auth/exception/AuthException.kt | 2 +- .../common/dto/response/CommonApiResponse.kt | 2 +- .../exception/ExceptionControllerAdvice.kt | 29 ++++++++++--------- .../common/util/TransactionExecutionUtil.kt | 4 +-- .../payment/exception/PaymentErrorCode.kt | 4 +-- .../payment/exception/PaymentException.kt | 2 +- .../infrastructure/client/TosspayClient.kt | 4 +-- .../region/exception/RegionException.kt | 6 ++-- .../exception/ReservationErrorCode.kt | 4 +-- .../exception/ReservationException.kt | 4 +-- .../schedule/exception/ScheduleErrorCode.kt | 4 +-- .../schedule/exception/ScheduleException.kt | 4 +-- .../store/exception/StoreException.kt | 6 ++-- .../theme/exception/ThemeErrorCode.kt | 4 +-- .../theme/exception/ThemeException.kt | 2 +- .../user/exception/UserException.kt | 6 ++-- 19 files changed, 51 insertions(+), 47 deletions(-) diff --git a/service/build.gradle.kts b/service/build.gradle.kts index 3c0819bc..8cbf1766 100644 --- a/service/build.gradle.kts +++ b/service/build.gradle.kts @@ -56,6 +56,7 @@ dependencies { implementation(project(":common:config")) implementation(project(":common:persistence")) implementation(project(":common:utils")) + implementation(project(":common:types")) } tasks.jar { diff --git a/service/src/main/kotlin/com/sangdol/roomescape/admin/exception/AdminException.kt b/service/src/main/kotlin/com/sangdol/roomescape/admin/exception/AdminException.kt index 5de62281..08ad5b8e 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/admin/exception/AdminException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/admin/exception/AdminException.kt @@ -1,8 +1,8 @@ package com.sangdol.roomescape.admin.exception -import com.sangdol.roomescape.common.exception.ErrorCode -import com.sangdol.roomescape.common.exception.RoomescapeException -import org.springframework.http.HttpStatus +import com.sangdol.common.types.exception.ErrorCode +import com.sangdol.common.types.exception.RoomescapeException +import com.sangdol.common.types.web.HttpStatus class AdminException( override val errorCode: AdminErrorCode, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthErrorCode.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthErrorCode.kt index ee5f5f01..2da82e04 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthErrorCode.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthErrorCode.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.auth.exception -import org.springframework.http.HttpStatus -import com.sangdol.roomescape.common.exception.ErrorCode +import com.sangdol.common.types.web.HttpStatus +import com.sangdol.common.types.exception.ErrorCode enum class AuthErrorCode( override val httpStatus: HttpStatus, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthException.kt b/service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthException.kt index 07c26ac6..4b233149 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/auth/exception/AuthException.kt @@ -1,6 +1,6 @@ package com.sangdol.roomescape.auth.exception -import com.sangdol.roomescape.common.exception.RoomescapeException +import com.sangdol.common.types.exception.RoomescapeException class AuthException( override val errorCode: AuthErrorCode, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/common/dto/response/CommonApiResponse.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/dto/response/CommonApiResponse.kt index e52f0804..524c23f6 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/common/dto/response/CommonApiResponse.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/dto/response/CommonApiResponse.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.common.dto.response import com.fasterxml.jackson.annotation.JsonInclude -import com.sangdol.roomescape.common.exception.ErrorCode +import com.sangdol.common.types.exception.ErrorCode @JsonInclude(JsonInclude.Include.NON_NULL) data class CommonApiResponse( diff --git a/service/src/main/kotlin/com/sangdol/roomescape/common/exception/ExceptionControllerAdvice.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/exception/ExceptionControllerAdvice.kt index aff98040..a327c766 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/common/exception/ExceptionControllerAdvice.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/exception/ExceptionControllerAdvice.kt @@ -1,21 +1,24 @@ package com.sangdol.roomescape.common.exception -import io.github.oshai.kotlinlogging.KLogger -import io.github.oshai.kotlinlogging.KotlinLogging -import jakarta.servlet.http.HttpServletRequest -import org.slf4j.MDC -import org.springframework.http.HttpStatus -import org.springframework.http.ResponseEntity -import org.springframework.http.converter.HttpMessageNotReadableException -import org.springframework.web.bind.MethodArgumentNotValidException -import org.springframework.web.bind.annotation.ExceptionHandler -import org.springframework.web.bind.annotation.RestControllerAdvice +import com.sangdol.common.types.exception.CommonErrorCode +import com.sangdol.common.types.exception.ErrorCode +import com.sangdol.common.types.exception.RoomescapeException +import com.sangdol.common.types.web.HttpStatus import com.sangdol.roomescape.auth.exception.AuthException import com.sangdol.roomescape.common.dto.response.CommonErrorResponse import com.sangdol.roomescape.common.log.ApiLogMessageConverter import com.sangdol.roomescape.common.log.ConvertResponseMessageRequest import com.sangdol.roomescape.common.log.LogType import com.sangdol.roomescape.common.log.getEndpoint +import io.github.oshai.kotlinlogging.KLogger +import io.github.oshai.kotlinlogging.KotlinLogging +import jakarta.servlet.http.HttpServletRequest +import org.slf4j.MDC +import org.springframework.http.ResponseEntity +import org.springframework.http.converter.HttpMessageNotReadableException +import org.springframework.web.bind.MethodArgumentNotValidException +import org.springframework.web.bind.annotation.ExceptionHandler +import org.springframework.web.bind.annotation.RestControllerAdvice private val log: KLogger = KotlinLogging.logger {} @@ -42,7 +45,7 @@ class ExceptionControllerAdvice( ) return ResponseEntity - .status(httpStatus) + .status(httpStatus.value()) .body(errorResponse) } @@ -73,7 +76,7 @@ class ExceptionControllerAdvice( ) return ResponseEntity - .status(httpStatus) + .status(httpStatus.value()) .body(errorResponse) } @@ -97,7 +100,7 @@ class ExceptionControllerAdvice( ) return ResponseEntity - .status(httpStatus) + .status(httpStatus.value()) .body(errorResponse) } diff --git a/service/src/main/kotlin/com/sangdol/roomescape/common/util/TransactionExecutionUtil.kt b/service/src/main/kotlin/com/sangdol/roomescape/common/util/TransactionExecutionUtil.kt index d4428190..fb05ec7b 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/common/util/TransactionExecutionUtil.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/common/util/TransactionExecutionUtil.kt @@ -6,8 +6,8 @@ import org.springframework.stereotype.Component import org.springframework.transaction.PlatformTransactionManager import org.springframework.transaction.TransactionDefinition import org.springframework.transaction.support.TransactionTemplate -import com.sangdol.roomescape.common.exception.CommonErrorCode -import com.sangdol.roomescape.common.exception.RoomescapeException +import com.sangdol.common.types.exception.CommonErrorCode +import com.sangdol.common.types.exception.RoomescapeException private val log: KLogger = KotlinLogging.logger {} diff --git a/service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentErrorCode.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentErrorCode.kt index 2c2676e1..9d2ea09a 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentErrorCode.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentErrorCode.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.payment.exception -import org.springframework.http.HttpStatus -import com.sangdol.roomescape.common.exception.ErrorCode +import com.sangdol.common.types.web.HttpStatus +import com.sangdol.common.types.exception.ErrorCode enum class PaymentErrorCode( override val httpStatus: HttpStatus, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentException.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentException.kt index 7bb10717..3bddd08c 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/exception/PaymentException.kt @@ -1,6 +1,6 @@ package com.sangdol.roomescape.payment.exception -import com.sangdol.roomescape.common.exception.RoomescapeException +import com.sangdol.common.types.exception.RoomescapeException class PaymentException( override val errorCode: PaymentErrorCode, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayClient.kt b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayClient.kt index 53c56a59..49194b30 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayClient.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/payment/infrastructure/client/TosspayClient.kt @@ -1,6 +1,8 @@ package com.sangdol.roomescape.payment.infrastructure.client import com.fasterxml.jackson.databind.ObjectMapper +import com.sangdol.roomescape.payment.exception.PaymentErrorCode +import com.sangdol.roomescape.payment.exception.PaymentException import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.http.HttpMethod @@ -10,8 +12,6 @@ import org.springframework.http.client.ClientHttpResponse import org.springframework.stereotype.Component import org.springframework.web.client.ResponseErrorHandler import org.springframework.web.client.RestClient -import com.sangdol.roomescape.payment.exception.PaymentErrorCode -import com.sangdol.roomescape.payment.exception.PaymentException import java.net.URI private val log: KLogger = KotlinLogging.logger {} diff --git a/service/src/main/kotlin/com/sangdol/roomescape/region/exception/RegionException.kt b/service/src/main/kotlin/com/sangdol/roomescape/region/exception/RegionException.kt index 41168e50..b7201c9b 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/region/exception/RegionException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/region/exception/RegionException.kt @@ -1,8 +1,8 @@ package com.sangdol.roomescape.region.exception -import org.springframework.http.HttpStatus -import com.sangdol.roomescape.common.exception.ErrorCode -import com.sangdol.roomescape.common.exception.RoomescapeException +import com.sangdol.common.types.web.HttpStatus +import com.sangdol.common.types.exception.ErrorCode +import com.sangdol.common.types.exception.RoomescapeException class RegionException( override val errorCode: RegionErrorCode, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationErrorCode.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationErrorCode.kt index 9b502a46..a91594e7 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationErrorCode.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationErrorCode.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.reservation.exception -import org.springframework.http.HttpStatus -import com.sangdol.roomescape.common.exception.ErrorCode +import com.sangdol.common.types.web.HttpStatus +import com.sangdol.common.types.exception.ErrorCode enum class ReservationErrorCode( override val httpStatus: HttpStatus, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationException.kt b/service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationException.kt index 3a25e7d2..f3cb36ab 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/reservation/exception/ReservationException.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.reservation.exception -import com.sangdol.roomescape.common.exception.ErrorCode -import com.sangdol.roomescape.common.exception.RoomescapeException +import com.sangdol.common.types.exception.ErrorCode +import com.sangdol.common.types.exception.RoomescapeException class ReservationException( override val errorCode: ErrorCode, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleErrorCode.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleErrorCode.kt index 264055d8..0194f2fa 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleErrorCode.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleErrorCode.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.schedule.exception -import org.springframework.http.HttpStatus -import com.sangdol.roomescape.common.exception.ErrorCode +import com.sangdol.common.types.web.HttpStatus +import com.sangdol.common.types.exception.ErrorCode enum class ScheduleErrorCode( override val httpStatus: HttpStatus, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleException.kt b/service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleException.kt index a79df67c..6133383a 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/schedule/exception/ScheduleException.kt @@ -1,5 +1,5 @@ -import com.sangdol.roomescape.common.exception.ErrorCode -import com.sangdol.roomescape.common.exception.RoomescapeException +import com.sangdol.common.types.exception.ErrorCode +import com.sangdol.common.types.exception.RoomescapeException class ScheduleException( override val errorCode: ErrorCode, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/store/exception/StoreException.kt b/service/src/main/kotlin/com/sangdol/roomescape/store/exception/StoreException.kt index 6531d154..fad3d383 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/store/exception/StoreException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/store/exception/StoreException.kt @@ -1,8 +1,8 @@ package com.sangdol.roomescape.store.exception -import org.springframework.http.HttpStatus -import com.sangdol.roomescape.common.exception.ErrorCode -import com.sangdol.roomescape.common.exception.RoomescapeException +import com.sangdol.common.types.web.HttpStatus +import com.sangdol.common.types.exception.ErrorCode +import com.sangdol.common.types.exception.RoomescapeException class StoreException( override val errorCode: StoreErrorCode, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeErrorCode.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeErrorCode.kt index 9210b958..03673549 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeErrorCode.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeErrorCode.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.theme.exception -import org.springframework.http.HttpStatus -import com.sangdol.roomescape.common.exception.ErrorCode +import com.sangdol.common.types.web.HttpStatus +import com.sangdol.common.types.exception.ErrorCode enum class ThemeErrorCode( override val httpStatus: HttpStatus, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeException.kt b/service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeException.kt index 286cda16..594fc212 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/theme/exception/ThemeException.kt @@ -1,6 +1,6 @@ package com.sangdol.roomescape.theme.exception -import com.sangdol.roomescape.common.exception.RoomescapeException +import com.sangdol.common.types.exception.RoomescapeException class ThemeException( override val errorCode: ThemeErrorCode, diff --git a/service/src/main/kotlin/com/sangdol/roomescape/user/exception/UserException.kt b/service/src/main/kotlin/com/sangdol/roomescape/user/exception/UserException.kt index 4561b724..05f4963a 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/user/exception/UserException.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/user/exception/UserException.kt @@ -1,8 +1,8 @@ package com.sangdol.roomescape.user.exception -import org.springframework.http.HttpStatus -import com.sangdol.roomescape.common.exception.ErrorCode -import com.sangdol.roomescape.common.exception.RoomescapeException +import com.sangdol.common.types.web.HttpStatus +import com.sangdol.common.types.exception.ErrorCode +import com.sangdol.common.types.exception.RoomescapeException class UserException( override val errorCode: UserErrorCode,