From 667a4be6034c869cfc0c36b7ab322b2b2a3724c8 Mon Sep 17 00:00:00 2001 From: binarywoo27 Date: Sat, 20 Jan 2024 14:10:05 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20Feign=ED=86=B5=EC=8B=A0=20@RequestBo?= =?UTF-8?q?dy=20Dto=ED=83=80=EC=9E=85=EC=9C=BC=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/clientcontroller/OrderClientController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/kr/bb/payment/controller/clientcontroller/OrderClientController.java b/src/main/java/kr/bb/payment/controller/clientcontroller/OrderClientController.java index 8ecf36a..08c9c07 100644 --- a/src/main/java/kr/bb/payment/controller/clientcontroller/OrderClientController.java +++ b/src/main/java/kr/bb/payment/controller/clientcontroller/OrderClientController.java @@ -42,8 +42,8 @@ public CommonResponse payApprove( } @PostMapping("/paymentInfo") - CommonResponse getPaymentInfo(@RequestBody List orderGroupIds ){ - return CommonResponse.success(paymentService.getPaymentInfo(orderGroupIds)); + CommonResponse getPaymentInfo(@RequestBody PaymentInfoRequestDto paymentInfoRequestDto ){ + return CommonResponse.success(paymentService.getPaymentInfo(paymentInfoRequestDto.getOrderGroupIds())); } @GetMapping(value = "/paymentDate") From 4b399a842021908e29bf9cee0b63c0191dfe2ce1 Mon Sep 17 00:00:00 2001 From: binarywoo27 Date: Sat, 20 Jan 2024 15:25:40 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20Feign=ED=86=B5=EC=8B=A0=20MVN=20?= =?UTF-8?q?=EA=B3=B5=ED=86=B5Dto=EB=A1=9C=20=EB=B3=80=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../clientcontroller/OrderClientController.java | 5 ++--- .../payment/dto/request/PaymentInfoMapDto.java | 16 ---------------- .../dto/request/PaymentInfoRequestDto.java | 15 --------------- .../kr/bb/payment/service/PaymentService.java | 3 +-- .../bb/payment/service/PaymentServiceTest.java | 3 +-- 6 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 src/main/java/kr/bb/payment/dto/request/PaymentInfoMapDto.java delete mode 100644 src/main/java/kr/bb/payment/dto/request/PaymentInfoRequestDto.java diff --git a/build.gradle b/build.gradle index f004856..0509f66 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' implementation 'org.springframework.kafka:spring-kafka' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'io.github.lotteon-maven:blooming-blooms-utils:202401140749' + implementation 'io.github.lotteon-maven:blooming-blooms-utils:202401200516' runtimeOnly 'com.h2database:h2' implementation 'mysql:mysql-connector-java:8.0.33' testImplementation 'org.mock-server:mockserver-netty:5.11.2' // 사용 중인 MockServer 버전 diff --git a/src/main/java/kr/bb/payment/controller/clientcontroller/OrderClientController.java b/src/main/java/kr/bb/payment/controller/clientcontroller/OrderClientController.java index 08c9c07..30c554b 100644 --- a/src/main/java/kr/bb/payment/controller/clientcontroller/OrderClientController.java +++ b/src/main/java/kr/bb/payment/controller/clientcontroller/OrderClientController.java @@ -4,12 +4,11 @@ import bloomingblooms.domain.payment.KakaopayApproveRequestDto; import bloomingblooms.domain.payment.KakaopayReadyRequestDto; import bloomingblooms.domain.payment.KakaopayReadyResponseDto; +import bloomingblooms.domain.payment.PaymentInfoMapDto; import bloomingblooms.response.CommonResponse; +import bloomingblooms.domain.payment.PaymentInfoRequestDto; import java.time.LocalDateTime; -import java.util.List; import kr.bb.payment.dto.request.KakaopayCancelRequestDto; -import kr.bb.payment.dto.request.PaymentInfoMapDto; -import kr.bb.payment.dto.request.PaymentInfoRequestDto; import kr.bb.payment.service.KakaopayService; import kr.bb.payment.service.PaymentService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/kr/bb/payment/dto/request/PaymentInfoMapDto.java b/src/main/java/kr/bb/payment/dto/request/PaymentInfoMapDto.java deleted file mode 100644 index eba6793..0000000 --- a/src/main/java/kr/bb/payment/dto/request/PaymentInfoMapDto.java +++ /dev/null @@ -1,16 +0,0 @@ -package kr.bb.payment.dto.request; - -import bloomingblooms.domain.payment.PaymentInfoDto; -import java.util.Map; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class PaymentInfoMapDto { - Map paymentInfoDtoMap; -} diff --git a/src/main/java/kr/bb/payment/dto/request/PaymentInfoRequestDto.java b/src/main/java/kr/bb/payment/dto/request/PaymentInfoRequestDto.java deleted file mode 100644 index 9fbf9a0..0000000 --- a/src/main/java/kr/bb/payment/dto/request/PaymentInfoRequestDto.java +++ /dev/null @@ -1,15 +0,0 @@ -package kr.bb.payment.dto.request; - -import java.util.List; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@AllArgsConstructor -@NoArgsConstructor -@Getter -@Builder -public class PaymentInfoRequestDto { - private List orderGroupIds; -} diff --git a/src/main/java/kr/bb/payment/service/PaymentService.java b/src/main/java/kr/bb/payment/service/PaymentService.java index 7eb1d57..9472d11 100644 --- a/src/main/java/kr/bb/payment/service/PaymentService.java +++ b/src/main/java/kr/bb/payment/service/PaymentService.java @@ -3,13 +3,12 @@ import bloomingblooms.domain.notification.order.OrderType; import bloomingblooms.domain.payment.KakaopayApproveRequestDto; import bloomingblooms.domain.payment.PaymentInfoDto; +import bloomingblooms.domain.payment.PaymentInfoMapDto; import java.time.LocalDateTime; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import javax.persistence.EntityNotFoundException; -import kr.bb.payment.dto.request.PaymentInfoMapDto; -import kr.bb.payment.dto.request.PaymentInfoRequestDto; import kr.bb.payment.dto.response.KakaopayApproveResponseDto; import kr.bb.payment.entity.Payment; import kr.bb.payment.entity.Subscription; diff --git a/src/test/java/kr/bb/payment/service/PaymentServiceTest.java b/src/test/java/kr/bb/payment/service/PaymentServiceTest.java index 944bfb7..1383223 100644 --- a/src/test/java/kr/bb/payment/service/PaymentServiceTest.java +++ b/src/test/java/kr/bb/payment/service/PaymentServiceTest.java @@ -2,9 +2,8 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import bloomingblooms.domain.payment.PaymentInfoMapDto; import java.util.List; -import kr.bb.payment.dto.request.PaymentInfoMapDto; -import kr.bb.payment.dto.request.PaymentInfoRequestDto; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest;