Merge pull request #28 from lotteon2/hotfix

Hotfix
lotteon2 · Jan 20, 2024 · cfd055b · cfd055b
2 parents 8194cdb + 4eefd90
commit cfd055b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 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
@@ -4,10 +4,12 @@
 import bloomingblooms.domain.payment.KakaopayApproveRequestDto;
 import bloomingblooms.domain.payment.KakaopayReadyRequestDto;
 import bloomingblooms.domain.payment.KakaopayReadyResponseDto;
+import bloomingblooms.domain.payment.PaymentInfoDto;
 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.service.KakaopayService;
 import kr.bb.payment.service.PaymentService;
@@ -41,8 +43,8 @@ public CommonResponse<LocalDateTime> payApprove(
   }
 
   @PostMapping("/paymentInfo")
-  CommonResponse<PaymentInfoMapDto> getPaymentInfo(@RequestBody PaymentInfoRequestDto paymentInfoRequestDto ){
-    return CommonResponse.success(paymentService.getPaymentInfo(paymentInfoRequestDto.getOrderGroupIds()));
+  CommonResponse<List<PaymentInfoDto>> getPaymentInfo(@RequestBody List<String> orderGroupIds ){
+    return CommonResponse.success(paymentService.getPaymentInfo(orderGroupIds));
   }
 
   @GetMapping(value = "/paymentDate")

diff --git a/src/main/java/kr/bb/payment/repository/PaymentRepository.java b/src/main/java/kr/bb/payment/repository/PaymentRepository.java
@@ -7,6 +7,6 @@
 
 public interface PaymentRepository extends JpaRepository<Payment, Long> {
     Payment findByOrderId(String orderId);
-    @Query("select p from Payment p where p.orderId in :orderIds")
+    @Query("select p from Payment p where p.orderId in :orderIds order by p.createdAt desc")
     List<Payment> findAllByOrderIds(List<String> orderIds);
 }
diff --git a/src/main/java/kr/bb/payment/service/PaymentService.java b/src/main/java/kr/bb/payment/service/PaymentService.java
@@ -3,7 +3,6 @@
 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;
@@ -83,9 +82,9 @@ public void saveDeliveryIds(Map<Long, Long> oldDeliveryIdsMap, List<Long> newDel
   }
 
   @Transactional
-  public PaymentInfoMapDto getPaymentInfo(List<String> orderGroupIds ) {
+  public List<PaymentInfoDto> getPaymentInfo(List<String> orderGroupIds ) {
     List<Payment> allPaymentsByOrderIds = paymentRepository.findAllByOrderIds(orderGroupIds);
-    Map<String, PaymentInfoDto> paymentInfoDtoMap = allPaymentsByOrderIds.stream()
+    return allPaymentsByOrderIds.stream()
             .map(
                     payment -> {
                       return PaymentInfoDto.builder()
@@ -94,10 +93,7 @@ public PaymentInfoMapDto getPaymentInfo(List<String> orderGroupIds ) {
                               .createdAt(payment.getCreatedAt())
                               .build();
                     })
-            .collect(Collectors.toMap(PaymentInfoDto::getOrderGroupId, dto -> dto));
-    return PaymentInfoMapDto.builder()
-            .paymentInfoDtoMap(paymentInfoDtoMap)
-            .build();
+            .collect(Collectors.toList());
   }
 
   @Transactional

diff --git a/src/test/java/kr/bb/payment/service/PaymentServiceTest.java b/src/test/java/kr/bb/payment/service/PaymentServiceTest.java
@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-import bloomingblooms.domain.payment.PaymentInfoMapDto;
+import bloomingblooms.domain.payment.PaymentInfoDto;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,8 +15,8 @@ public class PaymentServiceTest {
     @Autowired private PaymentService paymentService;
     @Test
     void getPaymentInfoTest(){
-        PaymentInfoMapDto paymentInfoMapDto = paymentService.getPaymentInfo(List.of("임시주문번호"));
-        assertThat(paymentInfoMapDto.getPaymentInfoDtoMap().size()).isEqualTo(0);
+        List<PaymentInfoDto> paymentInfo = paymentService.getPaymentInfo(List.of("임시주문번호"));
+        assertThat(paymentInfo.size()).isEqualTo(0);
     }
 
     @Test