Merge pull request #76 from JA-yeong-eop-JA-moeu-JA/dev

🚀 deploy: dev -> main 병합

Author: munjji

.github/workflows/ci-cd.yml

@@ -107,4 +107,4 @@ jobs:
             if [ ! -z "$LATEST_IMAGE_ID" ]; then
               sudo docker rmi $LATEST_IMAGE_ID
             fi
-            exit 1
+            exit 1

build.gradle

@@ -21,6 +21,7 @@ configurations {
 
 repositories {
 	mavenCentral()
+	maven { url 'https://jitpack.io' }
 }
 
 dependencies {
@@ -54,6 +55,9 @@ dependencies {
 	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
 	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
+	// iamport
+	implementation 'com.github.iamport:iamport-rest-client-java:0.2.23'
+
 	// S3
 	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 }

src/main/java/com/jajaja/domain/cart/entity/CartProduct.java

@@ -70,6 +70,13 @@ private void recalculateTotalPrice() {
         this.totalPrice = unitPrice * this.quantity;
     }
 
+    /**
+     * 단위가격을 반환합니다.
+     */
+    public int getUnitPrice() {
+        return (this.productOption != null) ? this.productOption.getPrice() : this.product.getPrice();
+    }
+    
     /**
      *  Cart에서 CartProduct를 추가할 때 부모가 누구인지 알려주기 위해 호출하는 연관관계 편의 메소드입니다.
      */

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

@@ -5,6 +5,7 @@
 import java.util.List;
 
 public interface CartCommandService {
-	public void addOrUpdateCartProduct(Long memberId, List<CartProductAddRequestDto> request);
-	public void deleteCartProduct(Long memberId, Long productId, Long optionId);
+	void 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

@@ -73,6 +73,26 @@ public void deleteCartProduct(Long memberId, Long productId, Long optionId) {
 		}
 		revalidateAppliedCouponIfExists(cart);
 	}
+
+	@Override
+	public void deleteCartProducts(Long memberId, List<Long> cartProductIds) {
+		log.info("[CartCommandService] 사용자 {}의 장바구니에서 선택된 아이템들 삭제: {}", memberId, cartProductIds);
+		Cart cart = cartCommonService.findCart(memberId);
+		
+		List<CartProduct> cartProductsToDelete = cartProductRepository.findAllById(cartProductIds);
+		
+		// 해당 카트의 상품인지 검증
+		cartProductsToDelete.forEach(cartProduct -> {
+			if (!cartProduct.getCart().getId().equals(cart.getId())) {
+				throw new CartHandler(ErrorStatus.CART_PRODUCT_NOT_FOUND);
+			}
+		});
+		
+		cartProductRepository.deleteAll(cartProductsToDelete);
+		cart.getCartProducts().removeAll(cartProductsToDelete);
+		
+		revalidateAppliedCouponIfExists(cart);
+	}
 
 	/**
 	*  장바구니 내 아이템 명령 실행에 필요한 도메인 객체를 불러오는 과정입니다.

src/main/java/com/jajaja/domain/coupon/service/CouponCommonService.java

@@ -35,6 +35,17 @@ public void validateCouponEligibility(Cart cart, Coupon coupon) {
         validateCartNotEmpty(cart);
     }
 
+    /**
+     * 선택된 아이템들을 대상으로 쿠폰 적용 가능 여부를 검증합니다.
+     * 주문 생성 시 사용합니다.
+     */
+    public void validateCouponForSelectedItems(List<CartProduct> selectedItems, Coupon coupon) {
+        validateCouponStatus(coupon);
+        validateMinOrderAmountForSelectedItems(selectedItems, coupon);
+        validateCouponConditionsForSelectedItems(selectedItems, coupon);
+        validateSelectedItemsNotEmpty(selectedItems);
+    }
+
     /**
      * 쿠폰 할인 금액을 계산합니다.
      */
@@ -242,4 +253,79 @@ private Map<Long, List<String>> getProductCategoryMap(Cart cart) {
 
         return productCategoryMap;
     }
+
+    private void validateMinOrderAmountForSelectedItems(List<CartProduct> selectedItems, Coupon coupon) {
+        if (coupon.getMinOrderAmount() != null) {
+            int selectedItemsAmount = selectedItems.stream()
+                    .mapToInt(CartProduct::getTotalPrice)
+                    .sum();
+            
+            if (selectedItemsAmount <= coupon.getMinOrderAmount()) {
+                throw new CouponHandler(ErrorStatus.COUPON_MIN_ORDER_AMOUNT_NOT_MET);
+            }
+        }
+    }
+
+    private void validateCouponConditionsForSelectedItems(List<CartProduct> selectedItems, Coupon coupon) {
+        ConditionType conditionType = coupon.getConditionType();
+        String conditionValues = coupon.getConditionValues();
+        
+        switch (conditionType) {
+            case ALL:
+                break;
+            case BRAND:
+                validateBrandConditionForSelectedItems(selectedItems, conditionValues);
+                break;
+            case CATEGORY:
+                validateCategoryConditionForSelectedItems(selectedItems, conditionValues);
+                break;
+            default:
+                throw new CouponHandler(ErrorStatus.INVALID_COUPON_TYPE);
+        }
+    }
+
+    private void validateBrandConditionForSelectedItems(List<CartProduct> selectedItems, String brandNames) {
+        List<String> allowedBrands = parseConditionValues(brandNames);
+        if (allowedBrands.isEmpty()) {
+            return;
+        }
+        
+        boolean hasValidBrand = selectedItems.stream()
+                .anyMatch(cartProduct -> {
+                    return matchesBrandCondition(cartProduct.getProduct().getStore(), allowedBrands);
+                });
+        
+        if (!hasValidBrand) {
+            throw new CouponHandler(ErrorStatus.COUPON_BRAND_CONDITION_NOT_MET);
+        }
+    }
+
+    private void validateCategoryConditionForSelectedItems(List<CartProduct> selectedItems, String categoryNames) {
+        List<String> allowedCategories = parseConditionValues(categoryNames);
+        if (allowedCategories.isEmpty()) {
+            return;
+        }
+        
+        validateSelectedItemsNotEmpty(selectedItems);
+        
+        List<Long> productIds = selectedItems.stream()
+                .map(cp -> cp.getProduct().getId())
+                .toList();
+        
+        List<String> productCategoryNames = couponValidationRepository.findCategoryNamesByProductIds(productIds)
+                .stream()
+                .map(result -> (String) result[1])
+                .toList();
+        
+        boolean hasValidCategory = matchesCategoryCondition(productCategoryNames, allowedCategories);
+        if (!hasValidCategory) {
+            throw new CouponHandler(ErrorStatus.COUPON_CATEGORY_CONDITION_NOT_MET);
+        }
+    }
+
+    private void validateSelectedItemsNotEmpty(List<CartProduct> selectedItems) {
+        if (selectedItems == null || selectedItems.isEmpty()) {
+            throw new CouponHandler(ErrorStatus.CART_EMPTY);
+        }
+    }
 }

src/main/java/com/jajaja/domain/delivery/dto/DeliveryInfoDto.java

@@ -0,0 +1,23 @@
+package com.jajaja.domain.delivery.dto;
+
+import com.jajaja.domain.order.entity.Order;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalDate;
+
+@Getter
+@Builder
+public class DeliveryInfoDto {
+    private Long addressId;
+    private String deliveryRequest;
+    private String estimatedDeliveryDate;
+
+    public static DeliveryInfoDto of(Order order) {
+        return DeliveryInfoDto.builder()
+                .addressId(order.getDelivery().getId())
+                .deliveryRequest(order.getDeliveryRequest())
+                .estimatedDeliveryDate(LocalDate.now().plusDays(2).toString())
+                .build();
+    }
+}

src/main/java/com/jajaja/domain/delivery/entity/Delivery.java

@@ -32,7 +32,7 @@ public class Delivery extends BaseEntity {
     @Column(nullable = false, length = 255)
     private String addressDetail;
 
-    @Column(length = 5)
+    @Column(nullable = false, length = 5)
     private String zipcode;
 
     @Column(length = 255)

src/main/java/com/jajaja/domain/member/entity/Member.java

@@ -44,6 +44,9 @@ public class Member extends BaseEntity {
 
     @Column(nullable = false)
     private String email;
+    
+    @Column(nullable = false)
+    private Integer point;
 
     @OneToOne(mappedBy = "member", fetch = FetchType.LAZY)
     private MemberBusinessCategory memberBusinessCategory;
@@ -83,8 +86,8 @@ public void updatePhone(String phone) {
     public void updateEmail(String email) {
         this.email = email;
     }
-
-    public void updateProfileUrl(String profileUrl) {
-        this.profileUrl = profileUrl;
-    }
+  
+    public void updatePoint(int point) { this.point = point; }
+    
+    public void updateProfileUrl(String profileUrl) { this.profileUrl = profileUrl; }
 }

src/main/java/com/jajaja/domain/member/entity/MemberCoupon.java

@@ -6,6 +6,8 @@
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.time.LocalDateTime;
+
 @Entity
 @Getter
 @Builder
@@ -21,11 +23,19 @@ public class MemberCoupon extends BaseEntity {
     @Column(nullable = false, length = 20)
     private CouponStatus status;
 
+    @Column
+    private LocalDateTime usedAt;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "member_id")
     private Member member;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "coupon_id")
     private Coupon coupon;
+
+    public void use() {
+        this.status = CouponStatus.USED;
+        this.usedAt = LocalDateTime.now();
+    }
 }