From 74a74022e76fa58a33a3d952e16afe87eb41fee3 Mon Sep 17 00:00:00 2001 From: Joowon Lim Date: Sat, 2 Dec 2023 01:20:43 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Fix:=20=EC=82=AC=EC=9E=A5=EB=8B=98=20?= =?UTF-8?q?=EA=B0=80=EA=B2=8C=20=EC=97=B0=EA=B4=80=EA=B4=80=EA=B3=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/readyvery/readyverydemo/domain/CeoInfo.java | 9 +++++---- .../java/com/readyvery/readyverydemo/domain/Store.java | 8 ++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/readyvery/readyverydemo/domain/CeoInfo.java b/src/main/java/com/readyvery/readyverydemo/domain/CeoInfo.java index bac174c..10591e2 100644 --- 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/Store.java b/src/main/java/com/readyvery/readyverydemo/domain/Store.java index 1fb4d5f..64a5555 100644 --- 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 ceoInfos = new ArrayList(); //가게 메뉴 카테고리 연관관계 매핑 @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) From 29c7c00fcea8de53fedd0f2fa3859b6601d70fd1 Mon Sep 17 00:00:00 2001 From: Joowon Lim Date: Sat, 2 Dec 2023 03:39:13 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Fix:=20=EC=9E=A5=EB=B0=94=EA=B5=AC=EB=8B=88?= =?UTF-8?q?=20=EC=B6=A9=EB=8F=8C=20=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/readyvery/readyverydemo/domain/Coupon.java | 1 + .../com/readyvery/readyverydemo/src/order/OrderServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/readyvery/readyverydemo/domain/Coupon.java b/src/main/java/com/readyvery/readyverydemo/domain/Coupon.java index dd94844..1ccd31b 100644 --- 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 orders = new ArrayList(); } diff --git a/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java b/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java index e4afa24..16dc88e 100644 --- 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 cartOptions = cartAddReq.getOptions().stream() .map(option -> makeCartOption(cartItem, option))