Merge pull request #117 from marinesnow34/takeout

Fix: 장바구니 충돌 순서 변경
readyvery · Dec 1, 2023 · 3f17afb · 3f17afb
2 parents 17ced30 + 29c7c00
commit 3f17afb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/src/main/java/com/readyvery/readyverydemo/domain/CeoInfo.java b/src/main/java/com/readyvery/readyverydemo/domain/CeoInfo.java
@@ -1,17 +1,17 @@
 package com.readyvery.readyverydemo.domain;
 
-import static jakarta.persistence.FetchType.*;
-
 import java.time.LocalDateTime;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.OneToOne;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -79,7 +79,8 @@ public class CeoInfo extends BaseTimeEntity {
 	private LocalDateTime lastLoginDate;
 
 	// 사장님 가게 연관관계 매핑
-	@OneToOne(mappedBy = "ceoInfo", fetch = LAZY)
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "store_idx")
 	private Store store;
 
 }
diff --git a/src/main/java/com/readyvery/readyverydemo/domain/Coupon.java b/src/main/java/com/readyvery/readyverydemo/domain/Coupon.java
@@ -51,6 +51,7 @@ public class Coupon extends BaseTimeEntity {
 	@Version
 	private Long version;
 
+	@Builder.Default
 	@OneToMany(mappedBy = "coupon", fetch = FetchType.LAZY)
 	private List<Order> orders = new ArrayList<Order>();
 }
diff --git a/src/main/java/com/readyvery/readyverydemo/domain/Store.java b/src/main/java/com/readyvery/readyverydemo/domain/Store.java
@@ -8,13 +8,10 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -77,9 +74,8 @@ public class Store extends BaseTimeEntity {
 	private Grade grade;
 
 	//가게 사장님 연관관계 매핑
-	@OneToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "ceo_idx")
-	private CeoInfo ceoInfo;
+	@OneToMany(mappedBy = "store")
+	private List<CeoInfo> ceoInfos = new ArrayList<CeoInfo>();
 
 	//가게 메뉴 카테고리 연관관계 매핑
 	@OneToMany(mappedBy = "store", cascade = CascadeType.ALL)

diff --git a/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java b/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java
@@ -102,8 +102,8 @@ public CartAddRes addCart(CustomUserDetails userDetails, CartAddReq cartAddReq)
 		Cart cart = cartRepository.findByUserInfoAndIsDeletedFalseAndIsOrderedFalse(user)
 			.orElseGet(() -> makeCart(user, store, cartAddReq.getInout()));
 
-		verifyCart(cart, cartAddReq.getInout());
 		verifyItemsInCart(cart, store, cartAddReq.getInout());
+		verifyCart(cart, cartAddReq.getInout());
 		CartItem cartItem = makeCartItem(cart, foodie, cartAddReq.getCount());
 		List<CartOption> cartOptions = cartAddReq.getOptions().stream()
 			.map(option -> makeCartOption(cartItem, option))