From 62d3f859ac21275dc05e147bb13e99084c3276a8 Mon Sep 17 00:00:00 2001 From: pricelees Date: Tue, 15 Jul 2025 16:51:16 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20payment=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?UTF-8?q?=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{service => business}/PaymentService.java | 18 +++++++++--------- .../client}/PaymentConfig.java | 4 +--- .../client/PaymentProperties.java | 2 +- .../client/TossPaymentClient.java | 12 ++++++------ .../persistence}/CanceledPayment.java | 2 +- .../CanceledPaymentRepository.java | 4 +--- .../persistence}/Payment.java | 2 +- .../persistence}/PaymentRepository.java | 4 +--- .../dto/request/PaymentCancelRequest.java | 2 +- .../{ => web}/dto/request/PaymentRequest.java | 2 +- .../dto/response/PaymentCancelResponse.java | 4 +++- .../dto/response/PaymentResponse.java | 2 +- .../response/ReservationPaymentResponse.java | 4 ++-- .../response/TossPaymentErrorResponse.java | 2 +- .../PaymentCancelResponseDeserializer.java | 4 +++- .../controller/ReservationController.java | 10 +++++----- .../dto/request/ReservationRequest.java | 2 +- .../ReservationWithPaymentService.java | 10 +++++----- .../PaymentServiceTest.java | 12 ++++++------ .../client/SampleTossPaymentConst.java | 6 +++--- .../client/TossPaymentClientTest.java | 12 +++++++----- .../persistence}/CanceledPaymentTest.java | 2 +- .../persistence}/PaymentTest.java | 4 ++-- ...PaymentCancelResponseDeserializerTest.java | 4 +++- .../controller/ReservationControllerTest.java | 19 ++++++++++--------- .../ReservationWithPaymentServiceTest.java | 8 ++++---- 26 files changed, 80 insertions(+), 77 deletions(-) rename src/main/java/roomescape/payment/{service => business}/PaymentService.java (84%) rename src/main/java/roomescape/payment/{ => infrastructure/client}/PaymentConfig.java (94%) rename src/main/java/roomescape/payment/{ => infrastructure}/client/PaymentProperties.java (93%) rename src/main/java/roomescape/payment/{ => infrastructure}/client/TossPaymentClient.java (89%) rename src/main/java/roomescape/payment/{domain => infrastructure/persistence}/CanceledPayment.java (96%) rename src/main/java/roomescape/payment/{domain/repository => infrastructure/persistence}/CanceledPaymentRepository.java (71%) rename src/main/java/roomescape/payment/{domain => infrastructure/persistence}/Payment.java (98%) rename src/main/java/roomescape/payment/{domain/repository => infrastructure/persistence}/PaymentRepository.java (76%) rename src/main/java/roomescape/payment/{ => web}/dto/request/PaymentCancelRequest.java (67%) rename src/main/java/roomescape/payment/{ => web}/dto/request/PaymentRequest.java (69%) rename src/main/java/roomescape/payment/{ => web}/dto/response/PaymentCancelResponse.java (71%) rename src/main/java/roomescape/payment/{ => web}/dto/response/PaymentResponse.java (77%) rename src/main/java/roomescape/payment/{ => web}/dto/response/ReservationPaymentResponse.java (83%) rename src/main/java/roomescape/payment/{ => web}/dto/response/TossPaymentErrorResponse.java (61%) rename src/main/java/roomescape/payment/{dto/response => web/support}/PaymentCancelResponseDeserializer.java (91%) rename src/test/java/roomescape/payment/{service => business}/PaymentServiceTest.java (95%) rename src/test/java/roomescape/payment/{ => infrastructure}/client/SampleTossPaymentConst.java (96%) rename src/test/java/roomescape/payment/{ => infrastructure}/client/TossPaymentClientTest.java (91%) rename src/test/java/roomescape/payment/{domain => infrastructure/persistence}/CanceledPaymentTest.java (91%) rename src/test/java/roomescape/payment/{domain => infrastructure/persistence}/PaymentTest.java (98%) rename src/test/java/roomescape/payment/{dto/response => web/support}/PaymentCancelResponseDeserializerTest.java (93%) diff --git a/src/main/java/roomescape/payment/service/PaymentService.java b/src/main/java/roomescape/payment/business/PaymentService.java similarity index 84% rename from src/main/java/roomescape/payment/service/PaymentService.java rename to src/main/java/roomescape/payment/business/PaymentService.java index e4761559..add0f3ae 100644 --- a/src/main/java/roomescape/payment/service/PaymentService.java +++ b/src/main/java/roomescape/payment/business/PaymentService.java @@ -1,4 +1,4 @@ -package roomescape.payment.service; +package roomescape.payment.business; import java.time.OffsetDateTime; import java.util.Optional; @@ -9,14 +9,14 @@ import org.springframework.transaction.annotation.Transactional; import roomescape.common.exception.ErrorType; import roomescape.common.exception.RoomescapeException; -import roomescape.payment.domain.CanceledPayment; -import roomescape.payment.domain.Payment; -import roomescape.payment.domain.repository.CanceledPaymentRepository; -import roomescape.payment.domain.repository.PaymentRepository; -import roomescape.payment.dto.request.PaymentCancelRequest; -import roomescape.payment.dto.response.PaymentCancelResponse; -import roomescape.payment.dto.response.PaymentResponse; -import roomescape.payment.dto.response.ReservationPaymentResponse; +import roomescape.payment.infrastructure.persistence.CanceledPayment; +import roomescape.payment.infrastructure.persistence.CanceledPaymentRepository; +import roomescape.payment.infrastructure.persistence.Payment; +import roomescape.payment.infrastructure.persistence.PaymentRepository; +import roomescape.payment.web.dto.request.PaymentCancelRequest; +import roomescape.payment.web.dto.response.PaymentCancelResponse; +import roomescape.payment.web.dto.response.PaymentResponse; +import roomescape.payment.web.dto.response.ReservationPaymentResponse; import roomescape.reservation.domain.Reservation; @Service diff --git a/src/main/java/roomescape/payment/PaymentConfig.java b/src/main/java/roomescape/payment/infrastructure/client/PaymentConfig.java similarity index 94% rename from src/main/java/roomescape/payment/PaymentConfig.java rename to src/main/java/roomescape/payment/infrastructure/client/PaymentConfig.java index bed158a8..b566d0a2 100644 --- a/src/main/java/roomescape/payment/PaymentConfig.java +++ b/src/main/java/roomescape/payment/infrastructure/client/PaymentConfig.java @@ -1,4 +1,4 @@ -package roomescape.payment; +package roomescape.payment.infrastructure.client; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -12,8 +12,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.web.client.RestClient; -import roomescape.payment.client.PaymentProperties; - @Configuration @EnableConfigurationProperties(PaymentProperties.class) public class PaymentConfig { diff --git a/src/main/java/roomescape/payment/client/PaymentProperties.java b/src/main/java/roomescape/payment/infrastructure/client/PaymentProperties.java similarity index 93% rename from src/main/java/roomescape/payment/client/PaymentProperties.java rename to src/main/java/roomescape/payment/infrastructure/client/PaymentProperties.java index 24584579..cd5e047d 100644 --- a/src/main/java/roomescape/payment/client/PaymentProperties.java +++ b/src/main/java/roomescape/payment/infrastructure/client/PaymentProperties.java @@ -1,4 +1,4 @@ -package roomescape.payment.client; +package roomescape.payment.infrastructure.client; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/roomescape/payment/client/TossPaymentClient.java b/src/main/java/roomescape/payment/infrastructure/client/TossPaymentClient.java similarity index 89% rename from src/main/java/roomescape/payment/client/TossPaymentClient.java rename to src/main/java/roomescape/payment/infrastructure/client/TossPaymentClient.java index 9ba7c8bc..f746bdb1 100644 --- a/src/main/java/roomescape/payment/client/TossPaymentClient.java +++ b/src/main/java/roomescape/payment/infrastructure/client/TossPaymentClient.java @@ -1,4 +1,4 @@ -package roomescape.payment.client; +package roomescape.payment.infrastructure.client; import java.io.IOException; import java.io.InputStream; @@ -16,11 +16,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import roomescape.common.exception.ErrorType; import roomescape.common.exception.RoomescapeException; -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.payment.dto.response.TossPaymentErrorResponse; +import roomescape.payment.web.dto.request.PaymentCancelRequest; +import roomescape.payment.web.dto.request.PaymentRequest; +import roomescape.payment.web.dto.response.PaymentCancelResponse; +import roomescape.payment.web.dto.response.PaymentResponse; +import roomescape.payment.web.dto.response.TossPaymentErrorResponse; @Component public class TossPaymentClient { diff --git a/src/main/java/roomescape/payment/domain/CanceledPayment.java b/src/main/java/roomescape/payment/infrastructure/persistence/CanceledPayment.java similarity index 96% rename from src/main/java/roomescape/payment/domain/CanceledPayment.java rename to src/main/java/roomescape/payment/infrastructure/persistence/CanceledPayment.java index 5d4750f9..5e252675 100644 --- a/src/main/java/roomescape/payment/domain/CanceledPayment.java +++ b/src/main/java/roomescape/payment/infrastructure/persistence/CanceledPayment.java @@ -1,4 +1,4 @@ -package roomescape.payment.domain; +package roomescape.payment.infrastructure.persistence; import java.time.OffsetDateTime; diff --git a/src/main/java/roomescape/payment/domain/repository/CanceledPaymentRepository.java b/src/main/java/roomescape/payment/infrastructure/persistence/CanceledPaymentRepository.java similarity index 71% rename from src/main/java/roomescape/payment/domain/repository/CanceledPaymentRepository.java rename to src/main/java/roomescape/payment/infrastructure/persistence/CanceledPaymentRepository.java index e3e05a47..903a51c8 100644 --- a/src/main/java/roomescape/payment/domain/repository/CanceledPaymentRepository.java +++ b/src/main/java/roomescape/payment/infrastructure/persistence/CanceledPaymentRepository.java @@ -1,11 +1,9 @@ -package roomescape.payment.domain.repository; +package roomescape.payment.infrastructure.persistence; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import roomescape.payment.domain.CanceledPayment; - public interface CanceledPaymentRepository extends JpaRepository { Optional findByPaymentKey(String paymentKey); diff --git a/src/main/java/roomescape/payment/domain/Payment.java b/src/main/java/roomescape/payment/infrastructure/persistence/Payment.java similarity index 98% rename from src/main/java/roomescape/payment/domain/Payment.java rename to src/main/java/roomescape/payment/infrastructure/persistence/Payment.java index 42094431..889f290f 100644 --- a/src/main/java/roomescape/payment/domain/Payment.java +++ b/src/main/java/roomescape/payment/infrastructure/persistence/Payment.java @@ -1,4 +1,4 @@ -package roomescape.payment.domain; +package roomescape.payment.infrastructure.persistence; import java.time.OffsetDateTime; diff --git a/src/main/java/roomescape/payment/domain/repository/PaymentRepository.java b/src/main/java/roomescape/payment/infrastructure/persistence/PaymentRepository.java similarity index 76% rename from src/main/java/roomescape/payment/domain/repository/PaymentRepository.java rename to src/main/java/roomescape/payment/infrastructure/persistence/PaymentRepository.java index 7d55352f..136593b7 100644 --- a/src/main/java/roomescape/payment/domain/repository/PaymentRepository.java +++ b/src/main/java/roomescape/payment/infrastructure/persistence/PaymentRepository.java @@ -1,11 +1,9 @@ -package roomescape.payment.domain.repository; +package roomescape.payment.infrastructure.persistence; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import roomescape.payment.domain.Payment; - public interface PaymentRepository extends JpaRepository { Optional findByReservationId(Long reservationId); diff --git a/src/main/java/roomescape/payment/dto/request/PaymentCancelRequest.java b/src/main/java/roomescape/payment/web/dto/request/PaymentCancelRequest.java similarity index 67% rename from src/main/java/roomescape/payment/dto/request/PaymentCancelRequest.java rename to src/main/java/roomescape/payment/web/dto/request/PaymentCancelRequest.java index 4641575b..bf925405 100644 --- a/src/main/java/roomescape/payment/dto/request/PaymentCancelRequest.java +++ b/src/main/java/roomescape/payment/web/dto/request/PaymentCancelRequest.java @@ -1,4 +1,4 @@ -package roomescape.payment.dto.request; +package roomescape.payment.web.dto.request; public record PaymentCancelRequest(String paymentKey, Long amount, String cancelReason) { } diff --git a/src/main/java/roomescape/payment/dto/request/PaymentRequest.java b/src/main/java/roomescape/payment/web/dto/request/PaymentRequest.java similarity index 69% rename from src/main/java/roomescape/payment/dto/request/PaymentRequest.java rename to src/main/java/roomescape/payment/web/dto/request/PaymentRequest.java index d7f2ea82..bcda7c41 100644 --- a/src/main/java/roomescape/payment/dto/request/PaymentRequest.java +++ b/src/main/java/roomescape/payment/web/dto/request/PaymentRequest.java @@ -1,4 +1,4 @@ -package roomescape.payment.dto.request; +package roomescape.payment.web.dto.request; public record PaymentRequest(String paymentKey, String orderId, Long amount, String paymentType) { } diff --git a/src/main/java/roomescape/payment/dto/response/PaymentCancelResponse.java b/src/main/java/roomescape/payment/web/dto/response/PaymentCancelResponse.java similarity index 71% rename from src/main/java/roomescape/payment/dto/response/PaymentCancelResponse.java rename to src/main/java/roomescape/payment/web/dto/response/PaymentCancelResponse.java index 1c6e2e0e..acf10776 100644 --- a/src/main/java/roomescape/payment/dto/response/PaymentCancelResponse.java +++ b/src/main/java/roomescape/payment/web/dto/response/PaymentCancelResponse.java @@ -1,9 +1,11 @@ -package roomescape.payment.dto.response; +package roomescape.payment.web.dto.response; import java.time.OffsetDateTime; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import roomescape.payment.web.support.PaymentCancelResponseDeserializer; + @JsonDeserialize(using = PaymentCancelResponseDeserializer.class) public record PaymentCancelResponse( String cancelStatus, diff --git a/src/main/java/roomescape/payment/dto/response/PaymentResponse.java b/src/main/java/roomescape/payment/web/dto/response/PaymentResponse.java similarity index 77% rename from src/main/java/roomescape/payment/dto/response/PaymentResponse.java rename to src/main/java/roomescape/payment/web/dto/response/PaymentResponse.java index afee9601..45fac13d 100644 --- a/src/main/java/roomescape/payment/dto/response/PaymentResponse.java +++ b/src/main/java/roomescape/payment/web/dto/response/PaymentResponse.java @@ -1,4 +1,4 @@ -package roomescape.payment.dto.response; +package roomescape.payment.web.dto.response; import java.time.OffsetDateTime; diff --git a/src/main/java/roomescape/payment/dto/response/ReservationPaymentResponse.java b/src/main/java/roomescape/payment/web/dto/response/ReservationPaymentResponse.java similarity index 83% rename from src/main/java/roomescape/payment/dto/response/ReservationPaymentResponse.java rename to src/main/java/roomescape/payment/web/dto/response/ReservationPaymentResponse.java index 479d25e8..f62854b5 100644 --- a/src/main/java/roomescape/payment/dto/response/ReservationPaymentResponse.java +++ b/src/main/java/roomescape/payment/web/dto/response/ReservationPaymentResponse.java @@ -1,8 +1,8 @@ -package roomescape.payment.dto.response; +package roomescape.payment.web.dto.response; import java.time.OffsetDateTime; -import roomescape.payment.domain.Payment; +import roomescape.payment.infrastructure.persistence.Payment; import roomescape.reservation.dto.response.ReservationResponse; public record ReservationPaymentResponse(Long id, String orderId, String paymentKey, Long totalAmount, diff --git a/src/main/java/roomescape/payment/dto/response/TossPaymentErrorResponse.java b/src/main/java/roomescape/payment/web/dto/response/TossPaymentErrorResponse.java similarity index 61% rename from src/main/java/roomescape/payment/dto/response/TossPaymentErrorResponse.java rename to src/main/java/roomescape/payment/web/dto/response/TossPaymentErrorResponse.java index 2e066de9..7f5163ee 100644 --- a/src/main/java/roomescape/payment/dto/response/TossPaymentErrorResponse.java +++ b/src/main/java/roomescape/payment/web/dto/response/TossPaymentErrorResponse.java @@ -1,4 +1,4 @@ -package roomescape.payment.dto.response; +package roomescape.payment.web.dto.response; public record TossPaymentErrorResponse(String code, String message) { } diff --git a/src/main/java/roomescape/payment/dto/response/PaymentCancelResponseDeserializer.java b/src/main/java/roomescape/payment/web/support/PaymentCancelResponseDeserializer.java similarity index 91% rename from src/main/java/roomescape/payment/dto/response/PaymentCancelResponseDeserializer.java rename to src/main/java/roomescape/payment/web/support/PaymentCancelResponseDeserializer.java index 96bba21d..60993797 100644 --- a/src/main/java/roomescape/payment/dto/response/PaymentCancelResponseDeserializer.java +++ b/src/main/java/roomescape/payment/web/support/PaymentCancelResponseDeserializer.java @@ -1,4 +1,4 @@ -package roomescape.payment.dto.response; +package roomescape.payment.web.support; import java.io.IOException; import java.time.OffsetDateTime; @@ -9,6 +9,8 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; +import roomescape.payment.web.dto.response.PaymentCancelResponse; + public class PaymentCancelResponseDeserializer extends StdDeserializer { private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern( diff --git a/src/main/java/roomescape/reservation/controller/ReservationController.java b/src/main/java/roomescape/reservation/controller/ReservationController.java index 89dcb95a..01709713 100644 --- a/src/main/java/roomescape/reservation/controller/ReservationController.java +++ b/src/main/java/roomescape/reservation/controller/ReservationController.java @@ -30,11 +30,11 @@ import roomescape.auth.web.support.MemberId; import roomescape.common.dto.response.RoomescapeApiResponse; import roomescape.common.dto.response.RoomescapeErrorResponse; import roomescape.common.exception.RoomescapeException; -import roomescape.payment.client.TossPaymentClient; -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.payment.infrastructure.client.TossPaymentClient; +import roomescape.payment.web.dto.request.PaymentCancelRequest; +import roomescape.payment.web.dto.request.PaymentRequest; +import roomescape.payment.web.dto.response.PaymentCancelResponse; +import roomescape.payment.web.dto.response.PaymentResponse; import roomescape.reservation.dto.request.AdminReservationRequest; import roomescape.reservation.dto.request.ReservationRequest; import roomescape.reservation.dto.request.WaitingRequest; diff --git a/src/main/java/roomescape/reservation/dto/request/ReservationRequest.java b/src/main/java/roomescape/reservation/dto/request/ReservationRequest.java index 28f1a363..06bbbecf 100644 --- a/src/main/java/roomescape/reservation/dto/request/ReservationRequest.java +++ b/src/main/java/roomescape/reservation/dto/request/ReservationRequest.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; -import roomescape.payment.dto.request.PaymentRequest; +import roomescape.payment.web.dto.request.PaymentRequest; @Schema(name = "회원의 예약 저장 요청", description = "회원의 예약 요청시 사용됩니다.") public record ReservationRequest( diff --git a/src/main/java/roomescape/reservation/service/ReservationWithPaymentService.java b/src/main/java/roomescape/reservation/service/ReservationWithPaymentService.java index 785182a8..5721d742 100644 --- a/src/main/java/roomescape/reservation/service/ReservationWithPaymentService.java +++ b/src/main/java/roomescape/reservation/service/ReservationWithPaymentService.java @@ -5,11 +5,11 @@ import java.time.OffsetDateTime; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import roomescape.payment.dto.request.PaymentCancelRequest; -import roomescape.payment.dto.response.PaymentCancelResponse; -import roomescape.payment.dto.response.PaymentResponse; -import roomescape.payment.dto.response.ReservationPaymentResponse; -import roomescape.payment.service.PaymentService; +import roomescape.payment.business.PaymentService; +import roomescape.payment.web.dto.request.PaymentCancelRequest; +import roomescape.payment.web.dto.response.PaymentCancelResponse; +import roomescape.payment.web.dto.response.PaymentResponse; +import roomescape.payment.web.dto.response.ReservationPaymentResponse; import roomescape.reservation.domain.Reservation; import roomescape.reservation.dto.request.ReservationRequest; import roomescape.reservation.dto.response.ReservationResponse; diff --git a/src/test/java/roomescape/payment/service/PaymentServiceTest.java b/src/test/java/roomescape/payment/business/PaymentServiceTest.java similarity index 95% rename from src/test/java/roomescape/payment/service/PaymentServiceTest.java rename to src/test/java/roomescape/payment/business/PaymentServiceTest.java index 19f28cde..d81b0d90 100644 --- a/src/test/java/roomescape/payment/service/PaymentServiceTest.java +++ b/src/test/java/roomescape/payment/business/PaymentServiceTest.java @@ -1,4 +1,4 @@ -package roomescape.payment.service; +package roomescape.payment.business; import static org.assertj.core.api.Assertions.*; @@ -13,19 +13,19 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.jdbc.Sql; import org.springframework.test.context.jdbc.Sql.ExecutionPhase; +import roomescape.common.exception.RoomescapeException; import roomescape.member.infrastructure.persistence.Member; import roomescape.member.infrastructure.persistence.MemberRepository; import roomescape.member.infrastructure.persistence.Role; -import roomescape.payment.domain.repository.CanceledPaymentRepository; -import roomescape.payment.dto.request.PaymentCancelRequest; -import roomescape.payment.dto.response.PaymentResponse; -import roomescape.payment.dto.response.ReservationPaymentResponse; +import roomescape.payment.infrastructure.persistence.CanceledPaymentRepository; +import roomescape.payment.web.dto.request.PaymentCancelRequest; +import roomescape.payment.web.dto.response.PaymentResponse; +import roomescape.payment.web.dto.response.ReservationPaymentResponse; import roomescape.reservation.domain.Reservation; import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.domain.ReservationTime; import roomescape.reservation.domain.repository.ReservationRepository; import roomescape.reservation.domain.repository.ReservationTimeRepository; -import roomescape.common.exception.RoomescapeException; import roomescape.theme.domain.Theme; import roomescape.theme.domain.repository.ThemeRepository; diff --git a/src/test/java/roomescape/payment/client/SampleTossPaymentConst.java b/src/test/java/roomescape/payment/infrastructure/client/SampleTossPaymentConst.java similarity index 96% rename from src/test/java/roomescape/payment/client/SampleTossPaymentConst.java rename to src/test/java/roomescape/payment/infrastructure/client/SampleTossPaymentConst.java index 688cc27f..99923a11 100644 --- a/src/test/java/roomescape/payment/client/SampleTossPaymentConst.java +++ b/src/test/java/roomescape/payment/infrastructure/client/SampleTossPaymentConst.java @@ -1,7 +1,7 @@ -package roomescape.payment.client; +package roomescape.payment.infrastructure.client; -import roomescape.payment.dto.request.PaymentCancelRequest; -import roomescape.payment.dto.request.PaymentRequest; +import roomescape.payment.web.dto.request.PaymentCancelRequest; +import roomescape.payment.web.dto.request.PaymentRequest; public class SampleTossPaymentConst { diff --git a/src/test/java/roomescape/payment/client/TossPaymentClientTest.java b/src/test/java/roomescape/payment/infrastructure/client/TossPaymentClientTest.java similarity index 91% rename from src/test/java/roomescape/payment/client/TossPaymentClientTest.java rename to src/test/java/roomescape/payment/infrastructure/client/TossPaymentClientTest.java index 98418893..6a844547 100644 --- a/src/test/java/roomescape/payment/client/TossPaymentClientTest.java +++ b/src/test/java/roomescape/payment/infrastructure/client/TossPaymentClientTest.java @@ -1,6 +1,8 @@ -package roomescape.payment.client; +package roomescape.payment.infrastructure.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.*; @@ -14,12 +16,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.test.web.client.MockRestServiceServer; -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.common.exception.ErrorType; import roomescape.common.exception.RoomescapeException; +import roomescape.payment.web.dto.request.PaymentCancelRequest; +import roomescape.payment.web.dto.request.PaymentRequest; +import roomescape.payment.web.dto.response.PaymentCancelResponse; +import roomescape.payment.web.dto.response.PaymentResponse; @RestClientTest(TossPaymentClient.class) class TossPaymentClientTest { diff --git a/src/test/java/roomescape/payment/domain/CanceledPaymentTest.java b/src/test/java/roomescape/payment/infrastructure/persistence/CanceledPaymentTest.java similarity index 91% rename from src/test/java/roomescape/payment/domain/CanceledPaymentTest.java rename to src/test/java/roomescape/payment/infrastructure/persistence/CanceledPaymentTest.java index 019c4da3..6a9b0e8e 100644 --- a/src/test/java/roomescape/payment/domain/CanceledPaymentTest.java +++ b/src/test/java/roomescape/payment/infrastructure/persistence/CanceledPaymentTest.java @@ -1,4 +1,4 @@ -package roomescape.payment.domain; +package roomescape.payment.infrastructure.persistence; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/roomescape/payment/domain/PaymentTest.java b/src/test/java/roomescape/payment/infrastructure/persistence/PaymentTest.java similarity index 98% rename from src/test/java/roomescape/payment/domain/PaymentTest.java rename to src/test/java/roomescape/payment/infrastructure/persistence/PaymentTest.java index 7b2030d7..e43aac43 100644 --- a/src/test/java/roomescape/payment/domain/PaymentTest.java +++ b/src/test/java/roomescape/payment/infrastructure/persistence/PaymentTest.java @@ -1,4 +1,4 @@ -package roomescape.payment.domain; +package roomescape.payment.infrastructure.persistence; import static org.assertj.core.api.Assertions.*; @@ -13,12 +13,12 @@ import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.NullAndEmptySource; import org.junit.jupiter.params.provider.NullSource; +import roomescape.common.exception.RoomescapeException; import roomescape.member.infrastructure.persistence.Member; import roomescape.member.infrastructure.persistence.Role; import roomescape.reservation.domain.Reservation; import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.domain.ReservationTime; -import roomescape.common.exception.RoomescapeException; import roomescape.theme.domain.Theme; class PaymentTest { diff --git a/src/test/java/roomescape/payment/dto/response/PaymentCancelResponseDeserializerTest.java b/src/test/java/roomescape/payment/web/support/PaymentCancelResponseDeserializerTest.java similarity index 93% rename from src/test/java/roomescape/payment/dto/response/PaymentCancelResponseDeserializerTest.java rename to src/test/java/roomescape/payment/web/support/PaymentCancelResponseDeserializerTest.java index 7ada8331..c88f9e96 100644 --- a/src/test/java/roomescape/payment/dto/response/PaymentCancelResponseDeserializerTest.java +++ b/src/test/java/roomescape/payment/web/support/PaymentCancelResponseDeserializerTest.java @@ -1,4 +1,4 @@ -package roomescape.payment.dto.response; +package roomescape.payment.web.support; import static org.junit.jupiter.api.Assertions.*; @@ -9,6 +9,8 @@ import org.junit.jupiter.api.Test; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; +import roomescape.payment.web.dto.response.PaymentCancelResponse; + class PaymentCancelResponseDeserializerTest { private ObjectMapper objectMapper; diff --git a/src/test/java/roomescape/reservation/controller/ReservationControllerTest.java b/src/test/java/roomescape/reservation/controller/ReservationControllerTest.java index b5f625b1..44978828 100644 --- a/src/test/java/roomescape/reservation/controller/ReservationControllerTest.java +++ b/src/test/java/roomescape/reservation/controller/ReservationControllerTest.java @@ -2,6 +2,7 @@ package roomescape.reservation.controller; import static org.assertj.core.api.Assertions.*; import static org.hamcrest.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -35,15 +36,15 @@ import io.restassured.http.Header; import roomescape.member.infrastructure.persistence.Member; import roomescape.member.infrastructure.persistence.MemberRepository; import roomescape.member.infrastructure.persistence.Role; -import roomescape.payment.client.TossPaymentClient; -import roomescape.payment.domain.CanceledPayment; -import roomescape.payment.domain.Payment; -import roomescape.payment.domain.repository.CanceledPaymentRepository; -import roomescape.payment.domain.repository.PaymentRepository; -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.payment.infrastructure.client.TossPaymentClient; +import roomescape.payment.infrastructure.persistence.CanceledPayment; +import roomescape.payment.infrastructure.persistence.CanceledPaymentRepository; +import roomescape.payment.infrastructure.persistence.Payment; +import roomescape.payment.infrastructure.persistence.PaymentRepository; +import roomescape.payment.web.dto.request.PaymentCancelRequest; +import roomescape.payment.web.dto.request.PaymentRequest; +import roomescape.payment.web.dto.response.PaymentCancelResponse; +import roomescape.payment.web.dto.response.PaymentResponse; import roomescape.reservation.domain.Reservation; import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.domain.ReservationTime; diff --git a/src/test/java/roomescape/reservation/service/ReservationWithPaymentServiceTest.java b/src/test/java/roomescape/reservation/service/ReservationWithPaymentServiceTest.java index fe0bec73..478b1d38 100644 --- a/src/test/java/roomescape/reservation/service/ReservationWithPaymentServiceTest.java +++ b/src/test/java/roomescape/reservation/service/ReservationWithPaymentServiceTest.java @@ -16,10 +16,10 @@ import org.springframework.test.context.jdbc.Sql.ExecutionPhase; import roomescape.member.infrastructure.persistence.Member; import roomescape.member.infrastructure.persistence.MemberRepository; import roomescape.member.infrastructure.persistence.Role; -import roomescape.payment.domain.repository.CanceledPaymentRepository; -import roomescape.payment.domain.repository.PaymentRepository; -import roomescape.payment.dto.request.PaymentCancelRequest; -import roomescape.payment.dto.response.PaymentResponse; +import roomescape.payment.infrastructure.persistence.CanceledPaymentRepository; +import roomescape.payment.infrastructure.persistence.PaymentRepository; +import roomescape.payment.web.dto.request.PaymentCancelRequest; +import roomescape.payment.web.dto.response.PaymentResponse; import roomescape.reservation.domain.Reservation; import roomescape.reservation.domain.ReservationStatus; import roomescape.reservation.domain.ReservationTime;