test: 테스트 코드 작성 (#78)

* test: 토스 페이먼츠 클라이언트 테스트 추가 (#72)

* build: MockWebServer 의존성 추가

* feat: MockHttpServer 헬퍼 클래스 추가

* test: 결제 승인 테스트 코드 작성

* test: 결제 승인 실패 테스트 코드 작성

* test: 테스트 이름 변경

* test: 결제 승인 테스트에서 요청 헤더 검증 로직 추가

* test: 결제 승인 테스트에서 요청 바디 검증 로직 추가

* test: 결제 승인 테스트에서 요청 헤더 검증 로직 추가

* test: 테스트 클래스명 변경

* test: 결제 취소 요청 성공 테스트 코드 작성

* test: 결제 취소 실패 성공 테스트 코드 작성

* test: 테스트 컨테이너 추가 (#75)

* build: testContainer 관련 의존성 추가

* test: 테스트 컨테이너 추가

* test: DBInitializer 추가

* test: 결제 API 인수 테스트 성공 케이스 작성 (#76)

* feat: UserFixture 추가

* feat: JWT 토큰 발급 메소드 추가

- Jwt 클래스 네이밍 수정
- 테스트 메소드 추가

* fix: MockMvc 접근 제어자 수정

* feat: Cart Fixture 추가

* chore: 코드 포멧팅

* feat: CartMenuItemFixture 추가

* feat: OrderableShopFixture 추가

* feat: OrderableShopMenuFixture 추가

* feat: OrderShopMenuPriceFixture 추가

* feat: 주문가능상점메뉴, 주문가능상점메뉴가격 리파지토리 클래스 추가

* feat: 주문번호 생성 Fake 객체 추가

* feat: 주문번호 생성 Fake 객체 추가

* feat: 장바구니 연간관계 메소드 추가

* test: 임시 배달 결제 정보 저장 API 통합 테스트 작성

* test: 임시 포장 결제 정보 저장 API 통합 테스트 작성

* test: 배달 결제 승인 API 통합 테스트 작성

* test: 포장 결제 승인 API 통합 테스트 작성

* feat: PaymentIdempotencyKeyFixture 추가

* test: 결제 취소 API 통합 테스트 작성

* test: 리파지토리 검증 로직 추가

* test: 결제 API 테스트 클래스 분리

* chore: 코드 포멧팅

* feat: 주문 번호 생성 클래스 MockBean으로 변경

* build: 테스트 application.yml 추가

Author: Soundbar91

.gitignore

@@ -36,5 +36,5 @@ out/
 ### VS Code ###
 .vscode/
 
-application.yml
+**/src/main/resources/application.yml
 logs

build.gradle

@@ -47,6 +47,10 @@ dependencies {
 
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'com.squareup.okhttp3:mockwebserver'
+	testImplementation 'org.testcontainers:testcontainers:1.19.3'
+	testImplementation 'org.testcontainers:junit-jupiter:1.19.3'
+	testImplementation 'org.testcontainers:mysql'
 }
 
 clean {

src/main/java/in/koreatech/koin/domain/order/cart/model/Cart.java

@@ -7,7 +7,9 @@
 import java.util.List;
 import java.util.Optional;
 
-import in.koreatech.koin.domain.order.cart.exception.CartAccessDeniedException;
+import in.koreatech.koin.domain.order.shop.model.entity.menu.OrderableShopMenu;
+import in.koreatech.koin.domain.order.shop.model.entity.menu.OrderableShopMenuOption;
+import in.koreatech.koin.domain.order.shop.model.entity.menu.OrderableShopMenuPrice;
 import in.koreatech.koin.domain.order.shop.model.entity.shop.OrderableShop;
 import in.koreatech.koin.domain.user.model.User;
 import in.koreatech.payment.common.model.BaseEntity;
@@ -22,6 +24,7 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -47,9 +50,45 @@ public class Cart extends BaseEntity {
     @OneToMany(mappedBy = "cart", cascade = CascadeType.ALL, orphanRemoval = true)
     List<CartMenuItem> cartMenuItems = new ArrayList<>();
 
+    @Builder
+    private Cart(
+        User user,
+        OrderableShop orderableShop
+    ) {
+        this.user = user;
+        this.orderableShop = orderableShop;
+    }
+
     public Integer calculateItemsAmount() {
         return this.cartMenuItems.stream()
             .mapToInt(CartMenuItem::calculateTotalAmount)
             .sum();
     }
+
+    // TODO. 코인 서버와 동일 로직으로 변경
+    public void addItem(OrderableShopMenu menu, OrderableShopMenuPrice price, List<OrderableShopMenuOption> options,
+        Integer quantity) {
+        // 장바구니에 옵션 까지 전부 동일한 메뉴가 이미 존재 하는 경우, 담긴 상품 수량 증가
+        Optional<CartMenuItem> existingItem = findSameItem(menu, price, options);
+
+        if (existingItem.isPresent()) {
+            existingItem.get().increaseQuantity(quantity);
+        } else {
+            this.cartMenuItems.add(CartMenuItem.builder()
+                .cart(this)
+                .orderableShopMenu(menu)
+                .orderableShopMenuPrice(price)
+                .quantity(quantity)
+                .isModified(false)
+                .build()
+            );
+        }
+    }
+
+    private Optional<CartMenuItem> findSameItem(OrderableShopMenu menu, OrderableShopMenuPrice price,
+        List<OrderableShopMenuOption> options) {
+        return this.cartMenuItems.stream()
+            .filter(item -> item.isSameItem(menu, price, options))
+            .findFirst();
+    }
 }

src/main/java/in/koreatech/koin/domain/order/cart/model/CartMenuItem.java

@@ -7,6 +7,7 @@
 import java.util.List;
 
 import in.koreatech.koin.domain.order.shop.model.entity.menu.OrderableShopMenu;
+import in.koreatech.koin.domain.order.shop.model.entity.menu.OrderableShopMenuOption;
 import in.koreatech.koin.domain.order.shop.model.entity.menu.OrderableShopMenuPrice;
 import in.koreatech.payment.common.model.BaseEntity;
 import jakarta.persistence.CascadeType;
@@ -55,11 +56,55 @@ public class CartMenuItem extends BaseEntity {
     @OneToMany(mappedBy = "cartMenuItem", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<CartMenuItemOption> cartMenuItemOptions = new ArrayList<>();
 
+    @Builder
+    private CartMenuItem(
+        Cart cart,
+        OrderableShopMenu orderableShopMenu,
+        OrderableShopMenuPrice orderableShopMenuPrice,
+        Integer quantity,
+        Boolean isModified
+    ) {
+        this.cart = cart;
+        this.orderableShopMenu = orderableShopMenu;
+        this.orderableShopMenuPrice = orderableShopMenuPrice;
+        this.quantity = quantity;
+        this.isModified = isModified;
+    }
+
     public Integer calculateTotalAmount() {
         int totalOptionPrice = this.cartMenuItemOptions.stream()
             .mapToInt(CartMenuItemOption::getOptionPrice)
             .sum();
 
         return (this.orderableShopMenuPrice.getPrice() + totalOptionPrice) * this.quantity;
     }
+
+    public void increaseQuantity(Integer amount) {
+        this.quantity += amount;
+    }
+
+    public boolean isSameItem(OrderableShopMenu menu, OrderableShopMenuPrice price, List<OrderableShopMenuOption> options) {
+        // 메뉴와 가격 ID가 다른 경우
+        if (!this.orderableShopMenu.getId().equals(menu.getId()) || !this.orderableShopMenuPrice.getId().equals(price.getId())) {
+            return false;
+        }
+
+        // 선택한 옵션의 개수가 다른 경우
+        if (this.cartMenuItemOptions.size() != options.size()) {
+            return false;
+        }
+
+        // 선택한 옵션의 구성이 다른 경우 (정렬 후 비교)
+        List<Integer> existingOptionIds = this.cartMenuItemOptions.stream()
+            .map(opt -> opt.getOrderableShopMenuOption().getId())
+            .sorted()
+            .toList();
+
+        List<Integer> newOptionIds = options.stream()
+            .map(OrderableShopMenuOption::getId)
+            .sorted()
+            .toList();
+
+        return existingOptionIds.equals(newOptionIds);
+    }
 }

src/main/java/in/koreatech/koin/domain/order/cart/repository/CartRepository.java

@@ -20,4 +20,6 @@ default Cart getCartByUserId(Integer userId) {
     }
 
     void deleteByUserId(Integer userId);
+
+    Cart save(Cart cart);
 }

src/main/java/in/koreatech/koin/domain/order/repository/PaymentCancelRepository.java

@@ -1,10 +1,14 @@
 package in.koreatech.koin.domain.order.repository;
 
+import java.util.List;
+
 import org.springframework.data.repository.Repository;
 
 import in.koreatech.koin.domain.order.model.PaymentCancel;
 
 public interface PaymentCancelRepository extends Repository<PaymentCancel, Integer> {
 
     void saveAll(Iterable<PaymentCancel> paymentCancels);
+
+    List<PaymentCancel> findAllByPaymentId(Integer paymentId);
 }

src/main/java/in/koreatech/koin/domain/order/shop/model/entity/menu/OrderableShopMenu.java

@@ -64,4 +64,25 @@ public class OrderableShopMenu extends BaseEntity {
 
     @OneToMany(mappedBy = "menu", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<OrderableShopMenuImage> menuImages = new ArrayList<>();
+
+    @Builder
+    private OrderableShopMenu(
+        OrderableShop orderableShop,
+        String name,
+        String description,
+        Boolean isSoldOut,
+        Boolean isDeleted,
+        List<OrderableShopMenuOptionGroupMap> menuOptionGroupMap,
+        List<OrderableShopMenuPrice> menuPrices,
+        List<OrderableShopMenuImage> menuImages
+    ) {
+        this.orderableShop = orderableShop;
+        this.name = name;
+        this.description = description;
+        this.isSoldOut = isSoldOut;
+        this.isDeleted = isDeleted;
+        this.menuOptionGroupMap = menuOptionGroupMap;
+        this.menuPrices = menuPrices;
+        this.menuImages = menuImages;
+    }
 }

src/main/java/in/koreatech/koin/domain/order/shop/model/entity/menu/OrderableShopMenuPrice.java

@@ -14,6 +14,7 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -41,4 +42,17 @@ public class OrderableShopMenuPrice extends BaseEntity {
 
     @Column(name = "is_deleted", nullable = false)
     private Boolean isDeleted = false;
+
+    @Builder
+    private OrderableShopMenuPrice(
+        OrderableShopMenu menu,
+        String name,
+        Integer price,
+        Boolean isDeleted
+    ) {
+        this.menu = menu;
+        this.name = name;
+        this.price = price;
+        this.isDeleted = isDeleted;
+    }
 }

src/main/java/in/koreatech/koin/domain/order/shop/model/entity/shop/OrderableShop.java

@@ -64,4 +64,23 @@ public class OrderableShop extends BaseEntity {
     public Integer calculateDeliveryFee(Integer orderAmount) {
         return this.shop.getBaseDeliveryTips().calculateDeliveryTip(orderAmount);
     }
+
+    @Builder
+    private OrderableShop(
+        Shop shop,
+        boolean delivery,
+        boolean takeout,
+        boolean serviceEvent,
+        Integer minimumOrderAmount,
+        boolean isDeleted,
+        List<OrderableShopMenuGroup> menuGroups
+    ) {
+        this.shop = shop;
+        this.delivery = delivery;
+        this.takeout = takeout;
+        this.serviceEvent = serviceEvent;
+        this.minimumOrderAmount = minimumOrderAmount;
+        this.isDeleted = isDeleted;
+        this.menuGroups = menuGroups;
+    }
 }

src/main/java/in/koreatech/koin/domain/order/shop/model/entity/shop/ShopOperation.java

@@ -14,6 +14,7 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -38,4 +39,15 @@ public class ShopOperation {
 
     @Column(name = "is_deleted", nullable = false)
     private boolean isDeleted = false;
+
+    @Builder
+    private ShopOperation(
+        Shop shop,
+        boolean isOpen,
+        boolean isDeleted
+    ) {
+        this.shop = shop;
+        this.isOpen = isOpen;
+        this.isDeleted = isDeleted;
+    }
 }