Merge pull request #27 from lotteon2/hotfix

fix: Feign통신 MVN 공통Dto로 변환
lotteon2 · Jan 20, 2024 · 8194cdb · 8194cdb
2 parents a9a452a + 4b399a8
commit 8194cdb
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 41 deletions.
diff --git 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
@@ -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;
@@ -42,8 +41,8 @@ public CommonResponse<LocalDateTime> payApprove(
  }
 
  @PostMapping("/paymentInfo")
- CommonResponse<PaymentInfoMapDto> getPaymentInfo(@RequestBody List<String> orderGroupIds ){
- return CommonResponse.success(paymentService.getPaymentInfo(orderGroupIds));
+ CommonResponse<PaymentInfoMapDto> getPaymentInfo(@RequestBody PaymentInfoRequestDto paymentInfoRequestDto ){
+ return CommonResponse.success(paymentService.getPaymentInfo(paymentInfoRequestDto.getOrderGroupIds()));
  }
 
  @GetMapping(value = "/paymentDate")

diff --git a/src/main/java/kr/bb/payment/dto/request/PaymentInfoMapDto.java b/src/main/java/kr/bb/payment/dto/request/PaymentInfoMapDto.java
diff --git a/src/main/java/kr/bb/payment/dto/request/PaymentInfoRequestDto.java b/src/main/java/kr/bb/payment/dto/request/PaymentInfoRequestDto.java
diff --git 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
@@ -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;