From 06977fb29c301552beab41ab7226d22719499be1 Mon Sep 17 00:00:00 2001 From: pricelees Date: Mon, 14 Jul 2025 10:15:23 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20system/exception=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EB=82=B4=20=ED=81=B4=EB=9E=98=EC=8A=A4=EB=A5=BC=20?= =?UTF-8?q?common/exception=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/roomescape/common/dto/response/ErrorResponse.java | 2 +- .../roomescape/{system => common}/exception/ErrorType.java | 2 +- .../exception/ExceptionControllerAdvice.java | 2 +- .../{system => common}/exception/RoomEscapeException.java | 2 +- src/main/java/roomescape/member/business/MemberService.kt | 4 ++-- .../java/roomescape/payment/client/TossPaymentClient.java | 4 ++-- .../java/roomescape/payment/domain/CanceledPayment.java | 4 ++-- src/main/java/roomescape/payment/domain/Payment.java | 4 ++-- .../java/roomescape/payment/service/PaymentService.java | 4 ++-- .../reservation/controller/ReservationController.java | 2 +- .../java/roomescape/reservation/domain/Reservation.java | 4 ++-- .../java/roomescape/reservation/domain/ReservationTime.java | 4 ++-- .../reservation/dto/request/ReservationTimeRequest.java | 4 ++-- .../roomescape/reservation/service/ReservationService.java | 4 ++-- .../reservation/service/ReservationTimeService.java | 4 ++-- .../roomescape/system/auth/infrastructure/jwt/JwtHandler.kt | 4 ++-- .../roomescape/system/auth/web/support/AuthInterceptors.kt | 4 ++-- src/main/java/roomescape/theme/service/ThemeService.java | 4 ++-- .../roomescape/payment/client/TossPaymentClientTest.java | 6 ++---- .../java/roomescape/payment/domain/CanceledPaymentTest.java | 2 +- src/test/java/roomescape/payment/domain/PaymentTest.java | 2 +- .../java/roomescape/payment/service/PaymentServiceTest.java | 2 +- .../java/roomescape/reservation/domain/ReservationTest.java | 2 +- .../roomescape/reservation/domain/ReservationTimeTest.java | 2 +- .../reservation/service/ReservationServiceTest.java | 2 +- .../reservation/service/ReservationTimeServiceTest.java | 2 +- .../java/roomescape/system/auth/business/AuthServiceTest.kt | 4 ++-- .../system/auth/infrastructure/jwt/JwtHandlerTest.kt | 4 ++-- .../java/roomescape/system/auth/web/AuthControllerTest.kt | 2 +- .../java/roomescape/theme/service/ThemeServiceTest.java | 2 +- src/test/java/roomescape/util/RoomescapeApiTest.kt | 4 ++-- 31 files changed, 48 insertions(+), 50 deletions(-) rename src/main/java/roomescape/{system => common}/exception/ErrorType.java (98%) rename src/main/java/roomescape/{system => common}/exception/ExceptionControllerAdvice.java (98%) rename src/main/java/roomescape/{system => common}/exception/RoomEscapeException.java (96%) diff --git a/src/main/java/roomescape/common/dto/response/ErrorResponse.java b/src/main/java/roomescape/common/dto/response/ErrorResponse.java index 3510e61e..bfa03d71 100644 --- a/src/main/java/roomescape/common/dto/response/ErrorResponse.java +++ b/src/main/java/roomescape/common/dto/response/ErrorResponse.java @@ -1,7 +1,7 @@ package roomescape.common.dto.response; import io.swagger.v3.oas.annotations.media.Schema; -import roomescape.system.exception.ErrorType; +import roomescape.common.exception.ErrorType; @Schema(name = "예외 응답", description = "예외 발생 시 응답에 사용됩니다.") public record ErrorResponse( diff --git a/src/main/java/roomescape/system/exception/ErrorType.java b/src/main/java/roomescape/common/exception/ErrorType.java similarity index 98% rename from src/main/java/roomescape/system/exception/ErrorType.java rename to src/main/java/roomescape/common/exception/ErrorType.java index b99be8d1..499335ae 100644 --- a/src/main/java/roomescape/system/exception/ErrorType.java +++ b/src/main/java/roomescape/common/exception/ErrorType.java @@ -1,4 +1,4 @@ -package roomescape.system.exception; +package roomescape.common.exception; public enum ErrorType { diff --git a/src/main/java/roomescape/system/exception/ExceptionControllerAdvice.java b/src/main/java/roomescape/common/exception/ExceptionControllerAdvice.java similarity index 98% rename from src/main/java/roomescape/system/exception/ExceptionControllerAdvice.java rename to src/main/java/roomescape/common/exception/ExceptionControllerAdvice.java index 1017b070..cdcfc3cf 100644 --- a/src/main/java/roomescape/system/exception/ExceptionControllerAdvice.java +++ b/src/main/java/roomescape/common/exception/ExceptionControllerAdvice.java @@ -1,4 +1,4 @@ -package roomescape.system.exception; +package roomescape.common.exception; import java.util.stream.Collectors; diff --git a/src/main/java/roomescape/system/exception/RoomEscapeException.java b/src/main/java/roomescape/common/exception/RoomEscapeException.java similarity index 96% rename from src/main/java/roomescape/system/exception/RoomEscapeException.java rename to src/main/java/roomescape/common/exception/RoomEscapeException.java index 2f00a8e5..960d2f95 100644 --- a/src/main/java/roomescape/system/exception/RoomEscapeException.java +++ b/src/main/java/roomescape/common/exception/RoomEscapeException.java @@ -1,4 +1,4 @@ -package roomescape.system.exception; +package roomescape.common.exception; import java.util.Optional; diff --git a/src/main/java/roomescape/member/business/MemberService.kt b/src/main/java/roomescape/member/business/MemberService.kt index f52269f4..605a86fd 100644 --- a/src/main/java/roomescape/member/business/MemberService.kt +++ b/src/main/java/roomescape/member/business/MemberService.kt @@ -8,8 +8,8 @@ import roomescape.member.infrastructure.persistence.Member import roomescape.member.infrastructure.persistence.MemberRepository import roomescape.member.web.MembersResponse import roomescape.member.web.toResponse -import roomescape.system.exception.ErrorType -import roomescape.system.exception.RoomEscapeException +import roomescape.common.exception.ErrorType +import roomescape.common.exception.RoomEscapeException @Service @Transactional(readOnly = true) diff --git a/src/main/java/roomescape/payment/client/TossPaymentClient.java b/src/main/java/roomescape/payment/client/TossPaymentClient.java index 49c9397a..daabbd58 100644 --- a/src/main/java/roomescape/payment/client/TossPaymentClient.java +++ b/src/main/java/roomescape/payment/client/TossPaymentClient.java @@ -19,8 +19,8 @@ import roomescape.payment.dto.request.PaymentRequest; import roomescape.payment.dto.response.PaymentCancelResponse; import roomescape.payment.dto.response.PaymentResponse; import roomescape.payment.dto.response.TossPaymentErrorResponse; -import roomescape.system.exception.ErrorType; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomEscapeException; @Component public class TossPaymentClient { diff --git a/src/main/java/roomescape/payment/domain/CanceledPayment.java b/src/main/java/roomescape/payment/domain/CanceledPayment.java index dc2056ec..4e8494ed 100644 --- a/src/main/java/roomescape/payment/domain/CanceledPayment.java +++ b/src/main/java/roomescape/payment/domain/CanceledPayment.java @@ -8,8 +8,8 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import roomescape.system.exception.ErrorType; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomEscapeException; @Entity public class CanceledPayment { diff --git a/src/main/java/roomescape/payment/domain/Payment.java b/src/main/java/roomescape/payment/domain/Payment.java index 92c1eac1..9a9eb59b 100644 --- a/src/main/java/roomescape/payment/domain/Payment.java +++ b/src/main/java/roomescape/payment/domain/Payment.java @@ -13,8 +13,8 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; import roomescape.reservation.domain.Reservation; -import roomescape.system.exception.ErrorType; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomEscapeException; @Entity public class Payment { diff --git a/src/main/java/roomescape/payment/service/PaymentService.java b/src/main/java/roomescape/payment/service/PaymentService.java index e3c6332e..7594d156 100644 --- a/src/main/java/roomescape/payment/service/PaymentService.java +++ b/src/main/java/roomescape/payment/service/PaymentService.java @@ -16,8 +16,8 @@ import roomescape.payment.dto.response.PaymentCancelResponse; import roomescape.payment.dto.response.PaymentResponse; import roomescape.payment.dto.response.ReservationPaymentResponse; import roomescape.reservation.domain.Reservation; -import roomescape.system.exception.ErrorType; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomEscapeException; @Service @Transactional diff --git a/src/main/java/roomescape/reservation/controller/ReservationController.java b/src/main/java/roomescape/reservation/controller/ReservationController.java index 025b9cb3..9e72bbaf 100644 --- a/src/main/java/roomescape/reservation/controller/ReservationController.java +++ b/src/main/java/roomescape/reservation/controller/ReservationController.java @@ -42,7 +42,7 @@ import roomescape.system.auth.web.support.LoginRequired; import roomescape.system.auth.web.support.MemberId; import roomescape.common.dto.response.ErrorResponse; import roomescape.common.dto.response.RoomEscapeApiResponse; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.RoomEscapeException; @RestController @Tag(name = "3. 예약 API", description = "예약 및 대기 정보를 추가 / 조회 / 삭제할 때 사용합니다.") diff --git a/src/main/java/roomescape/reservation/domain/Reservation.java b/src/main/java/roomescape/reservation/domain/Reservation.java index 7d300176..fdc69252 100644 --- a/src/main/java/roomescape/reservation/domain/Reservation.java +++ b/src/main/java/roomescape/reservation/domain/Reservation.java @@ -16,8 +16,8 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import roomescape.member.infrastructure.persistence.Member; -import roomescape.system.exception.ErrorType; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomEscapeException; import roomescape.theme.domain.Theme; @Entity diff --git a/src/main/java/roomescape/reservation/domain/ReservationTime.java b/src/main/java/roomescape/reservation/domain/ReservationTime.java index 5d3f2705..f994b857 100644 --- a/src/main/java/roomescape/reservation/domain/ReservationTime.java +++ b/src/main/java/roomescape/reservation/domain/ReservationTime.java @@ -8,8 +8,8 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import roomescape.system.exception.ErrorType; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomEscapeException; @Entity public class ReservationTime { diff --git a/src/main/java/roomescape/reservation/dto/request/ReservationTimeRequest.java b/src/main/java/roomescape/reservation/dto/request/ReservationTimeRequest.java index 00db2360..3078216c 100644 --- a/src/main/java/roomescape/reservation/dto/request/ReservationTimeRequest.java +++ b/src/main/java/roomescape/reservation/dto/request/ReservationTimeRequest.java @@ -8,8 +8,8 @@ import io.micrometer.common.util.StringUtils; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import roomescape.reservation.domain.ReservationTime; -import roomescape.system.exception.ErrorType; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomEscapeException; @Schema(name = "예약 시간 저장 요청", description = "예약 시간 저장 요청시 사용됩니다.") public record ReservationTimeRequest( diff --git a/src/main/java/roomescape/reservation/service/ReservationService.java b/src/main/java/roomescape/reservation/service/ReservationService.java index 20a856c6..c79cd285 100644 --- a/src/main/java/roomescape/reservation/service/ReservationService.java +++ b/src/main/java/roomescape/reservation/service/ReservationService.java @@ -22,8 +22,8 @@ import roomescape.reservation.dto.request.WaitingRequest; import roomescape.reservation.dto.response.MyReservationsResponse; import roomescape.reservation.dto.response.ReservationResponse; import roomescape.reservation.dto.response.ReservationsResponse; -import roomescape.system.exception.ErrorType; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomEscapeException; import roomescape.theme.domain.Theme; import roomescape.theme.service.ThemeService; diff --git a/src/main/java/roomescape/reservation/service/ReservationTimeService.java b/src/main/java/roomescape/reservation/service/ReservationTimeService.java index 3dd3342e..a9149299 100644 --- a/src/main/java/roomescape/reservation/service/ReservationTimeService.java +++ b/src/main/java/roomescape/reservation/service/ReservationTimeService.java @@ -16,8 +16,8 @@ import roomescape.reservation.dto.response.ReservationTimeInfoResponse; import roomescape.reservation.dto.response.ReservationTimeInfosResponse; import roomescape.reservation.dto.response.ReservationTimeResponse; import roomescape.reservation.dto.response.ReservationTimesResponse; -import roomescape.system.exception.ErrorType; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomEscapeException; @Service @Transactional diff --git a/src/main/java/roomescape/system/auth/infrastructure/jwt/JwtHandler.kt b/src/main/java/roomescape/system/auth/infrastructure/jwt/JwtHandler.kt index 4afd8e3e..bf81b3d2 100644 --- a/src/main/java/roomescape/system/auth/infrastructure/jwt/JwtHandler.kt +++ b/src/main/java/roomescape/system/auth/infrastructure/jwt/JwtHandler.kt @@ -4,8 +4,8 @@ import io.jsonwebtoken.* import org.springframework.beans.factory.annotation.Value import org.springframework.http.HttpStatus import org.springframework.stereotype.Component -import roomescape.system.exception.ErrorType -import roomescape.system.exception.RoomEscapeException +import roomescape.common.exception.ErrorType +import roomescape.common.exception.RoomEscapeException import java.util.* @Component diff --git a/src/main/java/roomescape/system/auth/web/support/AuthInterceptors.kt b/src/main/java/roomescape/system/auth/web/support/AuthInterceptors.kt index 7ef82712..326aed85 100644 --- a/src/main/java/roomescape/system/auth/web/support/AuthInterceptors.kt +++ b/src/main/java/roomescape/system/auth/web/support/AuthInterceptors.kt @@ -9,8 +9,8 @@ import org.springframework.web.servlet.HandlerInterceptor import roomescape.member.business.MemberService import roomescape.member.infrastructure.persistence.Member import roomescape.system.auth.infrastructure.jwt.JwtHandler -import roomescape.system.exception.ErrorType -import roomescape.system.exception.RoomEscapeException +import roomescape.common.exception.ErrorType +import roomescape.common.exception.RoomEscapeException private fun Any.isIrrelevantWith(annotationType: Class): Boolean { if (this !is HandlerMethod) { diff --git a/src/main/java/roomescape/theme/service/ThemeService.java b/src/main/java/roomescape/theme/service/ThemeService.java index d15bf703..95cc267d 100644 --- a/src/main/java/roomescape/theme/service/ThemeService.java +++ b/src/main/java/roomescape/theme/service/ThemeService.java @@ -8,8 +8,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import roomescape.reservation.domain.repository.ReservationRepository; -import roomescape.system.exception.ErrorType; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomEscapeException; import roomescape.theme.domain.Theme; import roomescape.theme.domain.repository.ThemeRepository; import roomescape.theme.dto.ThemeRequest; diff --git a/src/test/java/roomescape/payment/client/TossPaymentClientTest.java b/src/test/java/roomescape/payment/client/TossPaymentClientTest.java index 2e37c791..76f9acb3 100644 --- a/src/test/java/roomescape/payment/client/TossPaymentClientTest.java +++ b/src/test/java/roomescape/payment/client/TossPaymentClientTest.java @@ -1,8 +1,6 @@ package roomescape.payment.client; -import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.AssertionsForClassTypes.*; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.springframework.test.web.client.match.MockRestRequestMatchers.*; import static org.springframework.test.web.client.response.MockRestResponseCreators.*; @@ -22,8 +20,8 @@ import roomescape.payment.dto.request.PaymentCancelRequest; import roomescape.payment.dto.request.PaymentRequest; import roomescape.payment.dto.response.PaymentCancelResponse; import roomescape.payment.dto.response.PaymentResponse; -import roomescape.system.exception.ErrorType; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.ErrorType; +import roomescape.common.exception.RoomEscapeException; @RestClientTest(TossPaymentClient.class) class TossPaymentClientTest { diff --git a/src/test/java/roomescape/payment/domain/CanceledPaymentTest.java b/src/test/java/roomescape/payment/domain/CanceledPaymentTest.java index 5ec19814..438b799d 100644 --- a/src/test/java/roomescape/payment/domain/CanceledPaymentTest.java +++ b/src/test/java/roomescape/payment/domain/CanceledPaymentTest.java @@ -7,7 +7,7 @@ import java.time.OffsetDateTime; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.RoomEscapeException; class CanceledPaymentTest { diff --git a/src/test/java/roomescape/payment/domain/PaymentTest.java b/src/test/java/roomescape/payment/domain/PaymentTest.java index 1544cbb0..735ce3d0 100644 --- a/src/test/java/roomescape/payment/domain/PaymentTest.java +++ b/src/test/java/roomescape/payment/domain/PaymentTest.java @@ -18,7 +18,7 @@ import roomescape.member.infrastructure.persistence.Role; import roomescape.reservation.domain.Reservation; import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.domain.ReservationTime; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.RoomEscapeException; import roomescape.theme.domain.Theme; class PaymentTest { diff --git a/src/test/java/roomescape/payment/service/PaymentServiceTest.java b/src/test/java/roomescape/payment/service/PaymentServiceTest.java index 66719b95..e396436c 100644 --- a/src/test/java/roomescape/payment/service/PaymentServiceTest.java +++ b/src/test/java/roomescape/payment/service/PaymentServiceTest.java @@ -25,7 +25,7 @@ import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.domain.repository.ReservationRepository; import roomescape.reservation.domain.repository.ReservationTimeRepository; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.RoomEscapeException; import roomescape.theme.domain.Theme; import roomescape.theme.domain.repository.ThemeRepository; diff --git a/src/test/java/roomescape/reservation/domain/ReservationTest.java b/src/test/java/roomescape/reservation/domain/ReservationTest.java index 757b27a5..7add91d8 100644 --- a/src/test/java/roomescape/reservation/domain/ReservationTest.java +++ b/src/test/java/roomescape/reservation/domain/ReservationTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.params.provider.MethodSource; import roomescape.member.infrastructure.persistence.Member; import roomescape.member.infrastructure.persistence.Role; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.RoomEscapeException; import roomescape.theme.domain.Theme; public class ReservationTest { diff --git a/src/test/java/roomescape/reservation/domain/ReservationTimeTest.java b/src/test/java/roomescape/reservation/domain/ReservationTimeTest.java index 4cdd9dd4..4a3bd27a 100644 --- a/src/test/java/roomescape/reservation/domain/ReservationTimeTest.java +++ b/src/test/java/roomescape/reservation/domain/ReservationTimeTest.java @@ -4,7 +4,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.RoomEscapeException; class ReservationTimeTest { diff --git a/src/test/java/roomescape/reservation/service/ReservationServiceTest.java b/src/test/java/roomescape/reservation/service/ReservationServiceTest.java index 17cacf6d..6d8c2e5b 100644 --- a/src/test/java/roomescape/reservation/service/ReservationServiceTest.java +++ b/src/test/java/roomescape/reservation/service/ReservationServiceTest.java @@ -26,7 +26,7 @@ import roomescape.reservation.domain.repository.ReservationTimeRepository; import roomescape.reservation.dto.request.ReservationRequest; import roomescape.reservation.dto.request.WaitingRequest; import roomescape.reservation.dto.response.ReservationResponse; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.RoomEscapeException; import roomescape.theme.domain.Theme; import roomescape.theme.domain.repository.ThemeRepository; import roomescape.theme.service.ThemeService; diff --git a/src/test/java/roomescape/reservation/service/ReservationTimeServiceTest.java b/src/test/java/roomescape/reservation/service/ReservationTimeServiceTest.java index 73682f55..a8432198 100644 --- a/src/test/java/roomescape/reservation/service/ReservationTimeServiceTest.java +++ b/src/test/java/roomescape/reservation/service/ReservationTimeServiceTest.java @@ -22,7 +22,7 @@ import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.domain.repository.ReservationRepository; import roomescape.reservation.domain.repository.ReservationTimeRepository; import roomescape.reservation.dto.request.ReservationTimeRequest; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.RoomEscapeException; import roomescape.theme.domain.Theme; import roomescape.theme.domain.repository.ThemeRepository; diff --git a/src/test/java/roomescape/system/auth/business/AuthServiceTest.kt b/src/test/java/roomescape/system/auth/business/AuthServiceTest.kt index 0cd2701f..65631864 100644 --- a/src/test/java/roomescape/system/auth/business/AuthServiceTest.kt +++ b/src/test/java/roomescape/system/auth/business/AuthServiceTest.kt @@ -14,8 +14,8 @@ import roomescape.member.infrastructure.persistence.Member import roomescape.member.infrastructure.persistence.MemberRepository import roomescape.system.auth.infrastructure.jwt.JwtHandler import roomescape.system.auth.service.AuthService -import roomescape.system.exception.ErrorType -import roomescape.system.exception.RoomEscapeException +import roomescape.common.exception.ErrorType +import roomescape.common.exception.RoomEscapeException class AuthServiceTest : BehaviorSpec({ diff --git a/src/test/java/roomescape/system/auth/infrastructure/jwt/JwtHandlerTest.kt b/src/test/java/roomescape/system/auth/infrastructure/jwt/JwtHandlerTest.kt index 6d3a5b61..548852f4 100644 --- a/src/test/java/roomescape/system/auth/infrastructure/jwt/JwtHandlerTest.kt +++ b/src/test/java/roomescape/system/auth/infrastructure/jwt/JwtHandlerTest.kt @@ -6,8 +6,8 @@ import io.kotest.assertions.throwables.shouldThrow import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.shouldBe import roomescape.util.JwtFixture -import roomescape.system.exception.ErrorType -import roomescape.system.exception.RoomEscapeException +import roomescape.common.exception.ErrorType +import roomescape.common.exception.RoomEscapeException import java.util.* import kotlin.random.Random diff --git a/src/test/java/roomescape/system/auth/web/AuthControllerTest.kt b/src/test/java/roomescape/system/auth/web/AuthControllerTest.kt index bd8a1313..0069c8ae 100644 --- a/src/test/java/roomescape/system/auth/web/AuthControllerTest.kt +++ b/src/test/java/roomescape/system/auth/web/AuthControllerTest.kt @@ -6,7 +6,7 @@ import org.hamcrest.Matchers.`is` import org.springframework.data.repository.findByIdOrNull import roomescape.util.MemberFixture import roomescape.util.RoomescapeApiTest -import roomescape.system.exception.ErrorType +import roomescape.common.exception.ErrorType class AuthControllerTest : RoomescapeApiTest() { diff --git a/src/test/java/roomescape/theme/service/ThemeServiceTest.java b/src/test/java/roomescape/theme/service/ThemeServiceTest.java index 3ef8b8b7..56f217a0 100644 --- a/src/test/java/roomescape/theme/service/ThemeServiceTest.java +++ b/src/test/java/roomescape/theme/service/ThemeServiceTest.java @@ -22,7 +22,7 @@ import roomescape.reservation.dto.request.ReservationTimeRequest; import roomescape.reservation.dto.response.ReservationTimeResponse; import roomescape.reservation.service.ReservationService; import roomescape.reservation.service.ReservationTimeService; -import roomescape.system.exception.RoomEscapeException; +import roomescape.common.exception.RoomEscapeException; import roomescape.theme.domain.Theme; import roomescape.theme.domain.repository.ThemeRepository; import roomescape.theme.dto.ThemeRequest; diff --git a/src/test/java/roomescape/util/RoomescapeApiTest.kt b/src/test/java/roomescape/util/RoomescapeApiTest.kt index 03990f90..6bb02b5d 100644 --- a/src/test/java/roomescape/util/RoomescapeApiTest.kt +++ b/src/test/java/roomescape/util/RoomescapeApiTest.kt @@ -15,8 +15,8 @@ import org.springframework.http.HttpStatus import roomescape.member.infrastructure.persistence.Member import roomescape.member.infrastructure.persistence.MemberRepository import roomescape.system.auth.infrastructure.jwt.JwtHandler -import roomescape.system.exception.ErrorType -import roomescape.system.exception.RoomEscapeException +import roomescape.common.exception.ErrorType +import roomescape.common.exception.RoomEscapeException const val NOT_LOGGED_IN_USERID: Long = 0;