Merge pull request #606 from Podo-Store/develop

[FIX] 환불 수량 오류

Author: pipi-shortstocking

src/main/java/PodoeMarket/podoemarket/common/repository/RefundRepository.java

@@ -9,16 +9,6 @@
 import java.util.UUID;
 
 public interface RefundRepository extends JpaRepository<RefundEntity, Long> {
-    int countByOrderId(Long orderId);
-
-    @Query("""
-    SELECT r.order.id, COUNT(r)
-    FROM RefundEntity r
-    WHERE r.order.id IN :orderIds
-    GROUP BY r.order.id
-""")
-    List<Object[]> countByOrderIds(@Param("orderIds") List<Long> orderIds);
-
     @Query("""
     SELECT COALESCE(SUM(r.quantity), 0)
     FROM RefundEntity r
@@ -38,4 +28,20 @@ SELECT COALESCE(SUM(r.price), 0)
     WHERE r.order.id = :orderId
 """)
     long sumRefundPriceByOrder(@Param("orderId") Long orderId);
+
+    @Query("""
+    SELECT COALESCE(SUM(r.quantity), 0)
+    FROM RefundEntity r
+    WHERE r.order.id = :orderId
+""")
+    int sumRefundQuantityByOrderId(@Param("orderId") Long orderId);
+
+    @Query("""
+    SELECT r.order.id, COALESCE(SUM(r.quantity), 0)
+    FROM RefundEntity r
+    WHERE r.order.id IN :orderIds
+    GROUP BY r.order.id
+""")
+    List<Object[]> sumRefundQuantityByOrderIds(@Param("orderIds") List<Long> orderIds);
+
 }

src/main/java/PodoeMarket/podoemarket/profile/service/MypageService.java

@@ -286,15 +286,15 @@ public OrderPerformanceResponseDTO getUserOrderPerformances(UserEntity userInfo)
 
             final Map<UUID, Integer> performanceDateCountMap = getPerformanceDateCountMap(allOrderItems);
 
-            final Map<Long, Integer> refundCountMap = getRefundCountMap(allOrderItems);
+            final Map<Long, Integer> refundQuantityMap = getRefundQuantityMap(allOrderItems);
 
             // 날짜별로 주문 항목을 그룹화하기 위한 맵 선언
             final Map<LocalDate, List<OrderPerformanceResponseDTO.DatePerformanceOrderDTO.OrderPerformanceDTO>> OrderItems = new HashMap<>();
 
             for (OrderItemEntity orderItem : allOrderItems) {
                 int dateCount = performanceDateCountMap.getOrDefault(orderItem.getId(), 0);
 
-                int refundCount = refundCountMap.getOrDefault(orderItem.getOrder().getId(), 0);
+                int refundCount = refundQuantityMap.getOrDefault(orderItem.getOrder().getId(), 0);
 
                 // 각 주문 항목에 대한 제품 정보 가져옴
                 final OrderPerformanceResponseDTO.DatePerformanceOrderDTO.OrderPerformanceDTO orderItemDTO = new OrderPerformanceResponseDTO.DatePerformanceOrderDTO.OrderPerformanceDTO();
@@ -386,7 +386,7 @@ public ApplyResponseDTO getApplyInfo(final UUID orderItemId) {
             applyResponseDTO.setImagePath(orderItem.getProduct().getImagePath() != null ? bucketURL + URLEncoder.encode(orderItem.getProduct().getImagePath(), StandardCharsets.UTF_8): "");
             applyResponseDTO.setTitle(orderItem.getProduct().getTitle());
             applyResponseDTO.setWriter(orderItem.getProduct().getWriter());
-            applyResponseDTO.setPerformanceAmount(orderItem.getPerformanceAmount() - refundRepo.countByOrderId(orderItem.getOrder().getId()));
+            applyResponseDTO.setPerformanceAmount(orderItem.getPerformanceAmount() - refundRepo.sumRefundQuantityByOrderId(orderItem.getOrder().getId()));
 
             ApplyResponseDTO.ApplicantDTO applicantDTO = ApplyResponseDTO.ApplicantDTO.builder()
                     .name(applicant.getName())
@@ -415,7 +415,7 @@ public void processPerformanceApplication(final ApplyRequestDTO dto) {
             final OrderItemEntity orderItem = getOrderItem(dto.getOrderItemId());
             expire(orderItem.getCreatedAt());
 
-            int availableAmount = orderItem.getPerformanceAmount() - performanceDateRepo.countByOrderItemId(dto.getOrderItemId()) - refundRepo.countByOrderId(orderItem.getOrder().getId());
+            int availableAmount = orderItem.getPerformanceAmount() - performanceDateRepo.countByOrderItemId(dto.getOrderItemId()) - refundRepo.sumRefundQuantityByOrderId(orderItem.getOrder().getId());
             if(dto.getPerformanceDate().size() > availableAmount)
                 throw new RuntimeException("공연권 구매량 초과");
 
@@ -490,7 +490,8 @@ public RefundResponseDTO getRefundInfo(final UUID orderItemId) {
         try {
             final OrderItemEntity orderItem = getOrderItem(orderItemId);
 
-            final int possibleAmount = orderItem.getPerformanceAmount() - performanceDateRepo.countByOrderItemId(orderItemId) - refundRepo.countByOrderId(orderItem.getOrder().getId());
+            final int refundAmount = refundRepo.sumRefundQuantityByOrderId(orderItem.getOrder().getId());
+            final int possibleAmount = orderItem.getPerformanceAmount() - performanceDateRepo.countByOrderItemId(orderItemId) - refundAmount;
             final long possiblePrice = orderItem.getProduct().getPerformancePrice() * possibleAmount;
             String encodedScriptImage = orderItem.getProduct().getImagePath() != null
                     ? bucketURL + URLEncoder.encode(orderItem.getProduct().getImagePath(), StandardCharsets.UTF_8)
@@ -898,7 +899,7 @@ private Map<UUID, Integer> getPerformanceDateCountMap(List<OrderItemEntity> orde
                 ));
     }
 
-    private Map<Long, Integer> getRefundCountMap(List<OrderItemEntity> orderItems) {
+    private Map<Long, Integer> getRefundQuantityMap(List<OrderItemEntity> orderItems) {
         List<Long> orderIds = orderItems.stream()
                 .map(oi -> oi.getOrder().getId())
                 .distinct()
@@ -907,12 +908,11 @@ private Map<Long, Integer> getRefundCountMap(List<OrderItemEntity> orderItems) {
         if (orderIds.isEmpty())
             return Map.of();
 
-        return refundRepo.countByOrderIds(orderIds)
+        return refundRepo.sumRefundQuantityByOrderIds(orderIds)
                 .stream()
                 .collect(Collectors.toMap(
-                        row -> (Long) row[0],
-                        row -> ((Long) row[1]).intValue()
+                        row -> (Long) row[0], // orderId
+                        row -> ((Long) row[1]).intValue() // sum(quantity)
                 ));
     }
-
 }