Merge pull request #21 from duongminhhieu/feature

refactor: check product isAvailable before create order
duongminhhieu · Jun 5, 2024 · aaf5cbc · aaf5cbc
2 parents a13f061 + f0cadb8
commit aaf5cbc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/com/learning/yasminishop/cart/CartItemRepository.java b/src/main/java/com/learning/yasminishop/cart/CartItemRepository.java
@@ -13,4 +13,5 @@
 public interface CartItemRepository extends JpaRepository<CartItem, String>{
     Optional<CartItem> findByProductAndUser(Product product, User user);
     List<CartItem> findAllByUserOrderByLastModifiedDateDesc(User user);
+    List<CartItem> findAllByUserAndProductIsAvailable(User user, Boolean isAvailable);
 }
diff --git a/src/main/java/com/learning/yasminishop/order/OrderService.java b/src/main/java/com/learning/yasminishop/order/OrderService.java
@@ -51,7 +51,7 @@ public OrderResponse create(OrderRequest orderRequest) {
         User user = userRepository.findByEmail(email).orElseThrow(() -> new AppException(ErrorCode.USER_NOT_FOUND));
 
         // get the cart items of the user
-        List<CartItem> cartItems = cartItemRepository.findAllByUserOrderByLastModifiedDateDesc(user);
+        List<CartItem> cartItems = cartItemRepository.findAllByUserAndProductIsAvailable(user, true);
         Set<String> cartItemRequestIds = orderRequest.getCartItemIds();
 
         // Extract IDs from cartItems