Merge pull request #616 from Podo-Store/develop

[REFACTOR] 결제 정상화

Author: pipi-shortstocking

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

@@ -14,8 +14,6 @@
 import java.util.UUID;
 
 public interface OrderItemRepository extends JpaRepository<OrderItemEntity, Long> {
-    List<OrderItemEntity> findByProductIdAndUserId(UUID productId, UUID userId);
-
     List<OrderItemEntity> findByOrderId(Long id);
 
     @Query("""
@@ -25,7 +23,7 @@ public interface OrderItemRepository extends JpaRepository<OrderItemEntity, Long
     WHERE oi.user.id = :userId
     AND oi.script = true
     AND o.orderStatus = :status
-""")
+    """)
     List<OrderItemEntity> findPaidScriptOrderItems(
             @Param("userId") UUID userId,
             @Param("status") OrderStatus status,
@@ -39,7 +37,7 @@ List<OrderItemEntity> findPaidScriptOrderItems(
     WHERE oi.user.id = :userId
     AND oi.performanceAmount > 0
     AND o.orderStatus = :status
-""")
+    """)
     List<OrderItemEntity> findPaidPerformanceOrderItems(
             @Param("userId") UUID userId,
             @Param("status") OrderStatus status,
@@ -51,16 +49,13 @@ List<OrderItemEntity> findPaidPerformanceOrderItems(
     @Query("SELECT COUNT(o) FROM OrderItemEntity o WHERE o.product.id = :productId AND o.script = true")
     int sumScriptByProductId(@Param("productId") UUID productId);
 
-    @Query("SELECT COALESCE(SUM(o.performanceAmount), 0) FROM OrderItemEntity o WHERE o.product.id = :productId")
-    int sumPerformanceAmountByProductId(@Param("productId") UUID productId);
-
     @Query("""
     SELECT COALESCE(SUM(oi.performanceAmount), 0)
     FROM OrderItemEntity oi
     JOIN oi.order o
     WHERE oi.product.id = :productId
     AND o.orderStatus = :status
-""")
+    """)
     long sumPaidPerformanceAmountByProductId(@Param("productId") UUID productId, @Param("status") OrderStatus status);
 
     List<OrderItemEntity> findAllByProductId(UUID productId);
@@ -75,7 +70,15 @@ SELECT COALESCE(SUM(oi.performanceAmount), 0)
 """)
     Page<OrderItemEntity> findOrderItemsByKeyword(@Param("keyword") String keyword, Pageable pageable);
 
-    Boolean existsByProductIdAndUserId(UUID productId, UUID userId);
-
     Boolean existsByProduct_IdAndUser_IdAndScriptTrueAndOrder_OrderStatusAndCreatedAtAfter(UUID productId, UUID userId, OrderStatus status, LocalDateTime oneYearAgo);
+
+    @Query("""
+    SELECT MAX(o.createdAt)
+    FROM OrderItemEntity o
+    WHERE o.product.id = :productId
+    AND o.user.id = :userId
+    AND o.script = true
+    AND o.order.orderStatus = :status
+    """)
+    LocalDateTime findLastScriptPurchaseDate(@Param("productId") UUID productId, @Param("userId") UUID userId, @Param("status") OrderStatus status);
 }

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

@@ -1,9 +1,9 @@
 package PodoeMarket.podoemarket.common.repository;
 
 import PodoeMarket.podoemarket.common.entity.PdfDownloadLogEntity;
-import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.UUID;
@@ -15,7 +15,7 @@ public interface PdfDownloadLogRepository extends JpaRepository<PdfDownloadLogEn
     WHERE p.orderItemId IN :orderItemIds
     AND p.userId = :userId
 """)
-    List<UUID> findDownloadedOrderItemIds(@Param("orderItemIds") List<UUID> orderItemIds,  @Param("userId") UUID userId);
+    List<UUID> findDownloadedOrderItemIds(@Param("orderItemIds") List<UUID> orderItemIds, @Param("userId") UUID userId);
 
-    Boolean existsByOrderItemIdAndUserId(UUID orderItemId, UUID userId);
+    boolean existsByOrderItemIdAndUserId(UUID orderItemId, UUID userId);
 }

src/main/java/PodoeMarket/podoemarket/order/service/OrderService.java

@@ -16,6 +16,7 @@
 
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
 import java.util.*;
 
 @RequiredArgsConstructor
@@ -180,23 +181,22 @@ protected OrdersEntity orderCreate(final OrdersEntity ordersEntity, final OrderR
 
                 // 대본권 구매 확인
                 if (!product.getScript() && orderItemDTO.getScript())
-                    throw new RuntimeException("대본권 구매 조건 위반");
+                    throw new RuntimeException("해당 상품은 대본권 제공하지 않음");
 
                 // 공연권 구매 확인
                 if (!product.getPerformance() && (orderItemDTO.getPerformanceAmount() > 0))
-                    throw new RuntimeException("공연권 구매 조건 위반");
+                    throw new RuntimeException("해당 상품은 공연권 제공하지 않음");
 
-                if(orderItemRepo.existsByProductIdAndUserId(orderItemDTO.getProductId(), user.getId())) {
-                    final List<OrderItemEntity> items = orderItemRepo.findByProductIdAndUserId(orderItemDTO.getProductId(), user.getId());
+                // 대본 중복 구매 방지
+                if(orderItemDTO.getScript()) {
+                    LocalDateTime lastPurchase = orderItemRepo.findLastScriptPurchaseDate(product.getId(), user.getId(), OrderStatus.PAID);
 
-                    for(OrderItemEntity item : items) {
-                        // 대본권 제한
-                        if(orderItemDTO.getScript() && item.getScript())
-                            throw new RuntimeException("<" + product.getTitle() + "> 대본은 이미 구매했음");
+                    if(lastPurchase != null) {
+                        LocalDateTime expireDate = lastPurchase.plusMonths(3);
+
+                        if (expireDate.isAfter(LocalDateTime.now()))
+                            throw new RuntimeException("<" + product.getTitle() + "> 대본은 아직 권리기간 내입니다.");
                     }
-                } else {
-                    if(!orderItemDTO.getScript() && orderItemDTO.getPerformanceAmount() > 0)
-                        throw new RuntimeException("대본권을 구매해야 함");
                 }
 
                 final long scriptPrice = orderItemDTO.getScript() ? product.getScriptPrice() : 0;

src/main/java/PodoeMarket/podoemarket/profile/controller/MypageController.java

@@ -15,8 +15,6 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;

src/main/java/PodoeMarket/podoemarket/profile/controller/WorkController.java

@@ -14,7 +14,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.UUID;
 
 @RequiredArgsConstructor