Merge pull request #205 from JA-yeong-eop-JA-moeu-JA/fix/#204-coupon

tl1l1l1s · web-flow · commit 126c4d358dc5 · 2025-08-23T07:49:39.000+09:00
✨ feat: 쿠폰 적용 관련, 팀 결제 관련 수정 사항 적용
diff --git a/src/main/java/com/jajaja/domain/cart/entity/Cart.java b/src/main/java/com/jajaja/domain/cart/entity/Cart.java
@@ -2,6 +2,7 @@
 
 import com.jajaja.domain.coupon.entity.Coupon;
 import com.jajaja.domain.member.entity.Member;
+import com.jajaja.domain.member.entity.MemberCoupon;
 import com.jajaja.global.apiPayload.code.status.ErrorStatus;
 import com.jajaja.global.apiPayload.exception.custom.BadRequestException;
 import com.jajaja.global.common.domain.BaseEntity;
@@ -26,10 +27,10 @@ public class Cart extends BaseEntity {
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "member_id")
     private Member member;
-    
-    @OneToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "coupon_id")
-    private Coupon coupon;
+	
+	@OneToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "member_coupon_id")
+	private MemberCoupon memberCoupon;
     
     @OneToMany(mappedBy = "cart", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<CartProduct> cartProducts = new ArrayList<>();
@@ -71,17 +72,17 @@ public void deleteAllCartProductsByProductId(Long productId) {
     /**
      * Cart에 쿠폰을 적용합니다.
      */
-    public void applyCoupon(Coupon coupon) {
-        this.coupon = coupon;
-    }
-
-    /**
+	public void applyCoupon(MemberCoupon memberCoupon) {
+		this.memberCoupon = memberCoupon;
+	}
+	
+	/**
      * Cart에서 쿠폰을 제거합니다.
      */
-    public void removeCoupon() {
-        this.coupon = null;
-    }
-
+	public void removeCoupon() {
+		this.memberCoupon = null;
+	}
+	
     /**
      * 장바구니의 총 금액을 계산합니다.
      */
@@ -90,4 +91,11 @@ public int calculateTotalAmount() {
                 .mapToInt(cp -> cp.getUnitPrice() * cp.getQuantity())
                 .sum();
     }
+	
+	/**
+	 * 적용된 쿠폰 정보를 가져옵니다.
+	 */
+	public Coupon getCoupon() {
+		return this.memberCoupon != null ? this.memberCoupon.getCoupon() : null;
+	}
 }
diff --git a/src/main/java/com/jajaja/domain/cart/service/CartCommandServiceImpl.java b/src/main/java/com/jajaja/domain/cart/service/CartCommandServiceImpl.java
@@ -7,9 +7,6 @@
 import com.jajaja.domain.cart.entity.Cart;
 import com.jajaja.domain.cart.entity.CartProduct;
 import com.jajaja.domain.cart.repository.CartProductRepository;
-import com.jajaja.domain.coupon.service.CouponCommonService;
-import com.jajaja.domain.member.entity.MemberCoupon;
-import com.jajaja.domain.member.repository.MemberCouponRepository;
 import com.jajaja.domain.product.entity.Product;
 import com.jajaja.domain.product.entity.ProductOption;
 import com.jajaja.domain.product.repository.ProductOptionRepository;
@@ -38,8 +35,6 @@ public class CartCommandServiceImpl implements CartCommandService {
 	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;
 	
@@ -49,7 +44,7 @@ public CartResponseDto addOrUpdateCartProduct(Long memberId, List<CartProductAdd
 		List<CartProductResponseDto> items = request.stream().map(req -> {
 			log.info("[CartCommandService] 사용자 {}의 장바구니에 아이템 {} 추가/수정", memberId, req.productId());
 			
-			CartOpterationContext context = prepareCartOperationContext(req.productId(), req.optionId());
+			CartOperationContext 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());
@@ -73,11 +68,8 @@ public CartResponseDto addOrUpdateCartProduct(Long memberId, List<CartProductAdd
 			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());
+		PriceInfoDto priceInfo = PriceInfoDto.noDiscount(cart.calculateTotalAmount());
 		
-		revalidateAppliedCouponIfExists(cart);
 		return CartConverter.toCartResponseDto(cart, items, priceInfo);
 	}
 	
@@ -91,7 +83,6 @@ public void deleteCartProduct(Long memberId, Long productId, Long optionId) {
 		} catch (IllegalArgumentException e) {
 			throw new CartHandler(ErrorStatus.CART_PRODUCT_NOT_FOUND);
 		}
-		revalidateAppliedCouponIfExists(cart);
 	}
 
 	@Override
@@ -110,17 +101,15 @@ public void deleteCartProducts(Long memberId, List<Long> cartProductIds) {
 		
 		cartProductRepository.deleteAll(cartProductsToDelete);
 		cart.getCartProducts().removeAll(cartProductsToDelete);
-		
-		revalidateAppliedCouponIfExists(cart);
 	}
 	
 	/**
 	*  장바구니 내 아이템 명령 실행에 필요한 도메인 객체를 불러오는 과정입니다.
 	 *  option null 처리 등 중복되는 로직 때문에 생성하였습니다.
 	 *
-	 * @return 	Cart, Product, ProductOption을 포함한 CartOpterationContext
+	 * @return 	Cart, Product, ProductOption을 포함한 CartOperationContext
 	* */
-	private CartOpterationContext prepareCartOperationContext(Long productId, Long optionId) {
+	private CartOperationContext prepareCartOperationContext(Long productId, Long optionId) {
 Product product = productRepository.findById(productId)
 				.orElseThrow(() -> new CartHandler(ErrorStatus.PRODUCT_NOT_FOUND));
 		
@@ -133,39 +122,8 @@ private CartOpterationContext prepareCartOperationContext(Long productId, Long o
 			option = null;
 		}
 		
-		return new CartOpterationContext(product, option);
+		return new CartOperationContext(product, option);
 	}
 	
-	private record CartOpterationContext(Product product, ProductOption productOption) {}
-	
-	/**
-	 * 장바구니에 쿠폰이 적용되어 있는 경우 쿠폰 적용 조건을 재검증합니다.
-	 * 조건에 맞지 않으면 쿠폰을 자동으로 해제합니다.
-	 */
-	private void revalidateAppliedCouponIfExists(Cart cart) {
-		if (cart.getCoupon() == null) {
-			return;
-		}
-		
-		try {
-			MemberCoupon memberCoupon = memberCouponRepository.findByMemberAndCoupon(cart.getMember(), cart.getCoupon())
-					.orElse(null);
-			
-			if (memberCoupon == null) {
-				log.warn("[CartCommandService] 적용된 쿠폰의 MemberCoupon 정보를 찾을 수 없어 쿠폰을 해제합니다. cartId: {}, couponId: {}", 
-						cart.getId(), cart.getCoupon().getId());
-				cart.removeCoupon();
-				return;
-			}
-			
-			couponCommonService.validateCouponEligibility(cart, cart.getCoupon());
-			log.info("[CartCommandService] 적용된 쿠폰이 여전히 유효합니다. cartId: {}, couponId: {}", 
-					cart.getId(), cart.getCoupon().getId());
-			
-		} catch (Exception e) {
-			log.warn("[CartCommandService] 장바구니 변경으로 인해 쿠폰 조건이 맞지 않아 쿠폰을 해제합니다. cartId: {}, couponId: {}, reason: {}", 
-					cart.getId(), cart.getCoupon().getId(), e.getMessage());
-			cart.removeCoupon();
-		}
-	}
+	private record CartOperationContext(Product product, ProductOption productOption) {}
 }
diff --git a/src/main/java/com/jajaja/domain/coupon/controller/CouponController.java b/src/main/java/com/jajaja/domain/coupon/controller/CouponController.java
@@ -1,5 +1,6 @@
 package com.jajaja.domain.coupon.controller;
 
+import com.jajaja.domain.coupon.dto.CouponApplyRequestDto;
 import com.jajaja.domain.coupon.dto.CouponApplyResponseDto;
 import com.jajaja.domain.coupon.dto.PagingCouponListResponseDto;
 import com.jajaja.domain.coupon.service.CouponCommandService;
@@ -9,6 +10,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -38,14 +40,14 @@ public ApiResponse<PagingCouponListResponseDto> getMyCoupons(
 	
 	@Operation(
 			summary = "쿠폰 적용/수정 API | by 엠마/신윤지",
-			description = "선택한 쿠폰을 장바구니에 적용합니다."
+			description = "선택한 쿠폰을 장바구니의 선택된 상품들에 적용합니다."
 	)
-	@PostMapping("/{couponId}/apply")
+	@PostMapping("/apply")
 	public ApiResponse<CouponApplyResponseDto> applyCoupon(
 			@Auth Long memberId,
-			@PathVariable Long couponId
+			@Valid @RequestBody CouponApplyRequestDto request
 	) {
-		return ApiResponse.onSuccess(couponCommandService.applyCouponToCart(memberId, couponId));
+		return ApiResponse.onSuccess(couponCommandService.applyCouponToCart(memberId, request));
 	}
 	
 	@Operation(
diff --git a/src/main/java/com/jajaja/domain/coupon/dto/CouponApplyRequestDto.java b/src/main/java/com/jajaja/domain/coupon/dto/CouponApplyRequestDto.java
@@ -0,0 +1,14 @@
+package com.jajaja.domain.coupon.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
+
+public record CouponApplyRequestDto(
+    @NotNull(message = "쿠폰 ID는 필수입니다.")
+    Long couponId,
+    
+    @NotEmpty(message = "적용할 장바구니 상품 목록은 필수입니다.")
+    List<Long> items
+) {}
diff --git a/src/main/java/com/jajaja/domain/coupon/entity/Coupon.java b/src/main/java/com/jajaja/domain/coupon/entity/Coupon.java
@@ -1,6 +1,5 @@
 package com.jajaja.domain.coupon.entity;
 
-import com.jajaja.domain.cart.entity.Cart;
 import com.jajaja.domain.coupon.entity.enums.ConditionType;
 import com.jajaja.domain.coupon.entity.enums.DiscountType;
 import com.jajaja.domain.order.entity.Order;
@@ -52,8 +51,4 @@ public class Coupon extends BaseEntity {
 
     @OneToMany(mappedBy = "coupon", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<MemberCoupon> memberCoupons = new ArrayList<>();
-
-    @OneToOne(mappedBy = "coupon", fetch = FetchType.LAZY)
-    private Cart cart;
-
 }
diff --git a/src/main/java/com/jajaja/domain/coupon/service/CouponCommandService.java b/src/main/java/com/jajaja/domain/coupon/service/CouponCommandService.java
@@ -1,8 +1,9 @@
 package com.jajaja.domain.coupon.service;
 
+import com.jajaja.domain.coupon.dto.CouponApplyRequestDto;
 import com.jajaja.domain.coupon.dto.CouponApplyResponseDto;
 
 public interface CouponCommandService {
-    CouponApplyResponseDto applyCouponToCart(Long memberId, Long couponId);
+    CouponApplyResponseDto applyCouponToCart(Long memberId, CouponApplyRequestDto request);
     void unapplyCoupon(Long memberId);
 }
diff --git a/src/main/java/com/jajaja/domain/coupon/service/CouponCommandServiceImpl.java b/src/main/java/com/jajaja/domain/coupon/service/CouponCommandServiceImpl.java
@@ -1,7 +1,10 @@
 package com.jajaja.domain.coupon.service;
 
 import com.jajaja.domain.cart.entity.Cart;
+import com.jajaja.domain.cart.entity.CartProduct;
+import com.jajaja.domain.cart.repository.CartProductRepository;
 import com.jajaja.domain.cart.repository.CartRepository;
+import com.jajaja.domain.coupon.dto.CouponApplyRequestDto;
 import com.jajaja.domain.coupon.dto.CouponApplyResponseDto;
 import com.jajaja.domain.coupon.entity.Coupon;
 import com.jajaja.domain.coupon.entity.enums.CouponStatus;
@@ -16,6 +19,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Service
 @Transactional
 @RequiredArgsConstructor
@@ -24,26 +29,30 @@ public class CouponCommandServiceImpl implements CouponCommandService{
 	private final MemberRepository memberRepository;
 	private final CouponRepository couponRepository;
 	private final CartRepository cartRepository;
+	private final CartProductRepository cartProductRepository;
 	private final MemberCouponRepository memberCouponRepository;
 	private final CouponCommonService couponCommonService;
 	
 	@Override
-	public CouponApplyResponseDto applyCouponToCart(Long memberId, Long couponId) {
+	public CouponApplyResponseDto applyCouponToCart(Long memberId, CouponApplyRequestDto request) {
 		Member member = memberRepository.findById(memberId)
 				.orElseThrow(() -> new CouponHandler(ErrorStatus.MEMBER_NOT_FOUND));
-		Coupon coupon = validateAndGetCoupon(couponId);
+		Coupon coupon = validateAndGetCoupon(request.couponId());
 		
 		MemberCoupon memberCoupon = validateCouponOwnership(member, coupon);
 		validateCouponStatus(memberCoupon);
+		
 		Cart cart = cartRepository.findByMemberId(memberId);
 		if (cart == null) {
 			throw new CouponHandler(ErrorStatus.CART_NOT_FOUND);
 		}
 		
-		couponCommonService.validateCouponEligibility(cart, coupon);
-		cart.applyCoupon(coupon);
+		List<CartProduct> selectedItems = validateAndGetSelectedItems(cart, request.items());
+		couponCommonService.validateCouponForSelectedItems(selectedItems, coupon);
+		cart.applyCoupon(memberCoupon);
 		
-		return CouponApplyResponseDto.withDiscount(cart.getId(), coupon.getId(), coupon.getName(), couponCommonService.calculateDiscount(cart, coupon));
+		return CouponApplyResponseDto.withDiscount(cart.getId(), coupon.getId(), coupon.getName(), 
+				couponCommonService.calculateDiscountForSelectedItems(selectedItems, coupon));
 	}
 	
 	@Override
@@ -83,4 +92,24 @@ private void validateCouponStatus(MemberCoupon memberCoupon) {
 			throw new CouponHandler(ErrorStatus.COUPON_NOT_AVAILABLE);
 		}
 	}
+	
+	/**
+	 * 선택된 장바구니 상품들을 검증하고 반환합니다.
+	 */
+	private List<CartProduct> validateAndGetSelectedItems(Cart cart, List<Long> cartProductIds) {
+		List<CartProduct> selectedItems = cartProductRepository.findAllById(cartProductIds);
+		
+		if (selectedItems.size() != cartProductIds.size()) {
+			throw new CouponHandler(ErrorStatus.CART_PRODUCT_NOT_FOUND);
+		}
+		
+		// 선택된 상품들이 모두 해당 장바구니의 상품인지 확인
+		for (CartProduct item : selectedItems) {
+			if (!item.getCart().getId().equals(cart.getId())) {
+				throw new CouponHandler(ErrorStatus.CART_PRODUCT_NOT_FOUND);
+			}
+		}
+		
+		return selectedItems;
+	}
 }
diff --git a/src/main/java/com/jajaja/domain/coupon/service/CouponCommonService.java b/src/main/java/com/jajaja/domain/coupon/service/CouponCommonService.java
diff --git a/src/main/java/com/jajaja/domain/member/entity/MemberCoupon.java b/src/main/java/com/jajaja/domain/member/entity/MemberCoupon.java
diff --git a/src/main/java/com/jajaja/domain/order/service/OrderCommandServiceImpl.java b/src/main/java/com/jajaja/domain/order/service/OrderCommandServiceImpl.java

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`package com.jajaja.domain.coupon.service;`
`2`	`2`
	`3`	`+import com.jajaja.domain.coupon.dto.CouponApplyRequestDto;`
`3`	`4`	`import com.jajaja.domain.coupon.dto.CouponApplyResponseDto;`
`4`	`5`
`5`	`6`	`public interface CouponCommandService {`
`6`		`- CouponApplyResponseDto applyCouponToCart(Long memberId, Long couponId);`
	`7`	`+ CouponApplyResponseDto applyCouponToCart(Long memberId, CouponApplyRequestDto request);`
`7`	`8`	`void unapplyCoupon(Long memberId);`
`8`	`9`	`}`