fix: order delete error fix

TEAM-SYLUV · Aug 2, 2024 · 21ee379 · 21ee379
1 parent 1049a40
commit 21ee379
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/api-module/src/main/java/com/likelion/apimodule/order/application/OrderDeleteUseCase.java b/api-module/src/main/java/com/likelion/apimodule/order/application/OrderDeleteUseCase.java
@@ -6,9 +6,11 @@
 import com.likelion.coremodule.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
+@Transactional
 public class OrderDeleteUseCase {
 
     private final OrderQueryService orderQueryService;
@@ -20,7 +22,7 @@ public void deleteMyOrder(String accessToken, Long orderId) {
         String email = jwtUtil.getEmail(accessToken);
         User user = userQueryService.findByEmail(email);
 
-        orderQueryService.deleteMyOrder(orderId);
+        orderQueryService.deleteMyOrder(orderId, user.getUserId());
     }
 
 }
diff --git a/core-module/src/main/java/com/likelion/coremodule/order/service/OrderQueryService.java b/core-module/src/main/java/com/likelion/coremodule/order/service/OrderQueryService.java
@@ -6,6 +6,9 @@
 import com.likelion.coremodule.order.exception.OrderException;
 import com.likelion.coremodule.order.repository.OrderItemRepository;
 import com.likelion.coremodule.order.repository.OrderRepository;
+import com.likelion.coremodule.review.domain.Review;
+import com.likelion.coremodule.review.repository.ReviewImageRepository;
+import com.likelion.coremodule.review.repository.ReviewRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -17,6 +20,8 @@ public class OrderQueryService {
 
     private final OrderRepository orderRepository;
     private final OrderItemRepository orderItemRepository;
+    private final ReviewRepository reviewRepository;
+    private final ReviewImageRepository reviewImageRepository;
 
     public List<Order> findOrderByUserId(Long userId) {
         return orderRepository.findOrdersByUserUserId(userId);
@@ -46,7 +51,14 @@ public void saveOrderItem(OrderItem orderItem) {
         orderItemRepository.save(orderItem);
     }
 
-    public void deleteMyOrder(Long orderId) {
+    public void deleteMyOrder(Long orderId, Long userId) {
+
+        if (reviewRepository.findReviewByOrderIdAndUserUserId(orderId, userId) != null) {
+            Review review = reviewRepository.findReviewByOrderIdAndUserUserId(orderId, userId);
+            reviewImageRepository.deleteAllByReviewId(review.getId());
+            reviewRepository.deleteAllByOrderId(orderId);
+        }
+
         orderRepository.deleteById(orderId);
         orderItemRepository.deleteAllByOrderId(orderId);
     }

diff --git a/...module/src/main/java/com/likelion/coremodule/review/repository/ReviewImageRepository.java b/...module/src/main/java/com/likelion/coremodule/review/repository/ReviewImageRepository.java
@@ -8,4 +8,6 @@
 public interface ReviewImageRepository extends JpaRepository<ReviewImage, Long> {
 
     List<ReviewImage> findAllByReviewId(Long reviewId);
+
+    void deleteAllByReviewId(Long reviewId);
 }
diff --git a/core-module/src/main/java/com/likelion/coremodule/review/repository/ReviewRepository.java b/core-module/src/main/java/com/likelion/coremodule/review/repository/ReviewRepository.java
@@ -10,4 +10,6 @@ public interface ReviewRepository extends JpaRepository<Review, Long> {
     List<Review> findAllByOrderId(Long orderId);
 
     Review findReviewByOrderIdAndUserUserId(Long orderId, Long userId);
+
+    void deleteAllByOrderId(Long orderId);
 }