Merge pull request #24 from lotteon2/fix/develop

🐛 Feign 통신 반환 타입 List->Map으로 수정
lotteon2 · Jan 19, 2024 · a08ef77 · a08ef77
2 parents 5a74237 + c23aaa2
commit a08ef77
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 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
@@ -8,6 +8,7 @@
 import bloomingblooms.response.CommonResponse;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import kr.bb.payment.dto.request.KakaopayCancelRequestDto;
 import kr.bb.payment.service.KakaopayService;
 import kr.bb.payment.service.PaymentService;
@@ -41,7 +42,7 @@ public CommonResponse<LocalDateTime> payApprove(
   }
 
   @PostMapping("/paymentInfo")
-  CommonResponse<List<PaymentInfoDto>> getPaymentInfo(@RequestBody List<String> orderGroupIds){
+  CommonResponse<Map<String, PaymentInfoDto>> getPaymentInfo(@RequestBody List<String> orderGroupIds){
     return CommonResponse.success(paymentService.getPaymentInfo(orderGroupIds));
   }
 

diff --git a/src/main/java/kr/bb/payment/service/PaymentService.java b/src/main/java/kr/bb/payment/service/PaymentService.java
@@ -82,7 +82,7 @@ public void saveDeliveryIds(Map<Long, Long> oldDeliveryIdsMap, List<Long> newDel
   }
 
   @Transactional
-  public List<PaymentInfoDto> getPaymentInfo(List<String> orderGroupIds) {
+  public Map<String, PaymentInfoDto> getPaymentInfo(List<String> orderGroupIds) {
     List<Payment> allPaymentsByOrderIds = paymentRepository.findAllByOrderIds(orderGroupIds);
     return allPaymentsByOrderIds.stream()
         .map(
@@ -93,7 +93,7 @@ public List<PaymentInfoDto> getPaymentInfo(List<String> orderGroupIds) {
                   .createdAt(payment.getCreatedAt())
                   .build();
             })
-        .collect(Collectors.toList());
+        .collect(Collectors.toMap(PaymentInfoDto::getOrderGroupId, dto -> dto));
   }
 
   @Transactional

diff --git a/src/test/java/kr/bb/payment/service/PaymentServiceTest.java b/src/test/java/kr/bb/payment/service/PaymentServiceTest.java
@@ -4,6 +4,7 @@
 
 import bloomingblooms.domain.payment.PaymentInfoDto;
 import java.util.List;
+import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -15,7 +16,7 @@ public class PaymentServiceTest {
     @Autowired private PaymentService paymentService;
     @Test
     void getPaymentInfoTest(){
-        List<PaymentInfoDto> paymentInfo = paymentService.getPaymentInfo(List.of("임시주문번호"));
+        Map<String, PaymentInfoDto> paymentInfo = paymentService.getPaymentInfo(List.of("임시주문번호"));
         assertThat(paymentInfo.size()).isEqualTo(0);
     }