Merge pull request #185 from JA-yeong-eop-JA-moeu-JA/feat/#184-cart

✨ feat: 장바구니 상품 추가/수정 시 반환값 수정, 결제시간이 만료된 주문의 상태가 자동으로 변경되는 scheduler 추가

Author: tl1l1l1s

src/main/java/com/jajaja/domain/cart/controller/CartController.java

@@ -35,9 +35,8 @@ public ApiResponse<CartResponseDto> getCart(@Auth Long memberId) {
 			summary = "장바구니 아이템 추가 및 수정 API | by 엠마/신윤지",
 			description = "장바구니에 아이템을 추가하거나 수량을 수정합니다.")
 	@PostMapping("/products")
-	public ApiResponse<String> addOrUpdateCartProduct(@Auth Long memberId, @RequestBody @Valid List<CartProductAddRequestDto> request) {
-		cartCommandService.addOrUpdateCartProduct(memberId, request);
-		return ApiResponse.onSuccess("성공적으로 장바구니에 상품이 추가/수정되었습니다.");
+	public ApiResponse<CartResponseDto> addOrUpdateCartProduct(@Auth Long memberId, @RequestBody @Valid List<CartProductAddRequestDto> request) {
+		return ApiResponse.onSuccess(cartCommandService.addOrUpdateCartProduct(memberId, request));
 	}
 
 	@Operation(

src/main/java/com/jajaja/domain/cart/service/CartCommandService.java

@@ -1,11 +1,12 @@
 package com.jajaja.domain.cart.service;
 
 import com.jajaja.domain.cart.dto.CartProductAddRequestDto;
+import com.jajaja.domain.cart.dto.CartResponseDto;
 
 import java.util.List;
 
 public interface CartCommandService {
-	void addOrUpdateCartProduct(Long memberId, List<CartProductAddRequestDto> request);
+	CartResponseDto addOrUpdateCartProduct(Long memberId, List<CartProductAddRequestDto> request);
 	void deleteCartProduct(Long memberId, Long productId, Long optionId);
 	void deleteCartProducts(Long memberId, List<Long> cartProductIds);
 }

src/main/java/com/jajaja/domain/cart/service/CartCommandServiceImpl.java

@@ -1,6 +1,9 @@
 package com.jajaja.domain.cart.service;
 
+import com.jajaja.domain.cart.converter.CartConverter;
 import com.jajaja.domain.cart.dto.CartProductAddRequestDto;
+import com.jajaja.domain.cart.dto.CartProductResponseDto;
+import com.jajaja.domain.cart.dto.CartResponseDto;
 import com.jajaja.domain.cart.entity.Cart;
 import com.jajaja.domain.cart.entity.CartProduct;
 import com.jajaja.domain.cart.repository.CartProductRepository;
@@ -11,8 +14,12 @@
 import com.jajaja.domain.product.entity.ProductOption;
 import com.jajaja.domain.product.repository.ProductOptionRepository;
 import com.jajaja.domain.product.repository.ProductRepository;
+import com.jajaja.domain.product.service.ProductCommonService;
+import com.jajaja.domain.team.entity.enums.TeamStatus;
+import com.jajaja.domain.team.repository.TeamCommandRepository;
 import com.jajaja.global.apiPayload.code.status.ErrorStatus;
 import com.jajaja.global.apiPayload.exception.handler.CartHandler;
+import com.jajaja.global.common.dto.PriceInfoDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -27,38 +34,51 @@
 @Transactional
 public class CartCommandServiceImpl implements CartCommandService {
 
-	private final CartCommonService cartCommonService;
-	private final CouponCommonService couponCommonService;
 	private final CartProductRepository cartProductRepository;
 	private final ProductRepository productRepository;
+	private final TeamCommandRepository teamRepository;
 	private final ProductOptionRepository productOptionRepository;
 	private final MemberCouponRepository memberCouponRepository;
+	private final CouponCommonService couponCommonService;
+	private final ProductCommonService productCommonService;
+	private final CartCommonService cartCommonService;
 
 	@Override
-	public void addOrUpdateCartProduct(Long memberId, List<CartProductAddRequestDto> request) {
+	public CartResponseDto addOrUpdateCartProduct(Long memberId, List<CartProductAddRequestDto> request) {
 		Cart cart = cartCommonService.findCart(memberId);
-		request.forEach(req -> {
+		List<CartProductResponseDto> items = request.stream().map(req -> {
 			log.info("[CartCommandService] 사용자 {}의 장바구니에 아이템 {} 추가/수정", memberId, req.productId());
 
 			CartOpterationContext context = prepareCartOperationContext(req.productId(), req.optionId());
 
 			Optional<CartProduct> existingItem = req.optionId() != null ? cartProductRepository.findByCartIdAndProductIdAndProductOptionId(cart.getId(), context.product().getId(), context.productOption.getId())
 					: cartProductRepository.findByCartIdAndProductIdAndProductOptionIsNull(cart.getId(), context.product().getId());
 
-			existingItem.ifPresentOrElse(
-					item -> {
+			CartProduct cartProduct = existingItem
+					.map(item -> {
 						log.info("[CartCommandService] 기존 아이템 {}의 옵션과 수량을 변경합니다.", item.getId());
 						item.update(context.productOption(), req.quantity());
-					},
-					() -> {
+						return item;
+					})
+					.orElseGet(() -> {
 						log.info("[CartCommandService] 장바구니에 새로 아이템 {}를 추가합니다.", req.productId());
 						CartProduct newCartProduct = CartProduct.create(cart, context.product(), context.productOption(), req.quantity());
 						cart.addCartProduct(newCartProduct);
-						cartProductRepository.save( newCartProduct);
-					}
-			);
-		});
+						cartProductRepository.save(newCartProduct);
+						return newCartProduct;
+					});
+			
+			boolean isTeamAvailable = teamRepository.existsByProductIdAndStatus(
+					cartProduct.getProduct().getId(), TeamStatus.MATCHING);
+			return CartProductResponseDto.of(cartProduct, productCommonService.calculateDiscountedPrice(cartProduct.getUnitPrice(), cartProduct.getProduct().getDiscountRate()), isTeamAvailable);
+		}).toList();
+		
+		PriceInfoDto priceInfo = cart.getCoupon() != null ?
+				couponCommonService.calculateDiscount(cart, cart.getCoupon()) :
+				PriceInfoDto.noDiscount(cart.calculateTotalAmount());
+		
 		revalidateAppliedCouponIfExists(cart);
+		return CartConverter.toCartResponseDto(cart, items, priceInfo);
 	}
 
 	@Override

src/main/java/com/jajaja/domain/order/repository/OrderRepository.java

@@ -2,15 +2,18 @@
 
 import com.jajaja.domain.member.entity.Member;
 import com.jajaja.domain.order.entity.Order;
+import com.jajaja.domain.order.entity.enums.OrderStatus;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 public interface OrderRepository extends JpaRepository<Order, Long>, OrderRepositoryCustom {
-
     @EntityGraph(attributePaths = {"orderProducts", "orderProducts.product", "orderProducts.productOption", "team", "delivery"})
     Optional<Order> findById(Long id);
     Optional<Order> findByOrderId(String orderId);
     Boolean existsByMember(Member member);
+    List<Order> findOrdersByOrderStatusAndCreatedAtBefore(OrderStatus orderStatus, LocalDateTime createdAtBefore);
 }

src/main/java/com/jajaja/domain/order/service/OrderCommandService.java

@@ -11,5 +11,5 @@ public interface OrderCommandService {
     OrderPrepareResponseDto prepareOrder(Long memberId, OrderPrepareRequestDto request);
     OrderApproveResponseDto approveOrder(Long memberId, OrderApproveRequestDto request);
     OrderRefundResponseDto refundOrder(Long memberId, OrderRefundRequestDto request);
-    void startShipping(Long orderId);
-}
+    void expireOrder();
+    void startShipping(Long orderId);}

src/main/java/com/jajaja/domain/order/service/OrderCommandServiceImpl.java

@@ -36,6 +36,7 @@
 import com.jajaja.global.config.RestTemplateConfig;
 import com.jajaja.global.config.TossPaymentsConfig;
 
+import java.time.LocalDateTime;
 import java.util.*;
 
 import lombok.RequiredArgsConstructor;
@@ -351,6 +352,18 @@ public OrderRefundResponseDto refundOrder(Long memberId, OrderRefundRequestDto r
         }
     }
 
+    @Override
+    public void expireOrder() {
+        orderRepository.findOrdersByOrderStatusAndCreatedAtBefore(OrderStatus.READY, LocalDateTime.now().minusMinutes(10))
+                .forEach(order -> {
+                    if (order.getOrderStatus() == OrderStatus.READY) {
+                        order.updateStatus(OrderStatus.EXPIRED);
+                        order.getOrderProducts().forEach(orderProduct ->
+                            orderProduct.updateStatus(OrderStatus.EXPIRED));
+                    }
+                });
+    }
+    
     private Member findMember(Long memberId) {
         return memberRepository.findById(memberId)
                 .orElseThrow(() -> new BadRequestException(ErrorStatus.MEMBER_NOT_FOUND));

src/main/java/com/jajaja/global/scheduler/OrderExpireScheduler.java

@@ -0,0 +1,22 @@
+package com.jajaja.global.scheduler;
+
+import com.jajaja.domain.order.service.OrderCommandService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class OrderExpireScheduler {
+
+	private final OrderCommandService orderCommandService;
+	
+	@Scheduled(fixedDelay = 60000)
+	public void expireOrders() {
+		log.info("[OrderExpireScheduler] 만료된 주문 처리 스케줄러 시작");
+		orderCommandService.expireOrder();
+		log.info("[OrderExpireScheduler] 만료된 주문 처리 스케줄러 완료");
+	}
+}