🐛 Fix[#2]: CASCADE 반영

9oormthon-univ · Nov 23, 2024 · c5708a3 · c5708a3
1 parent ad11637
commit c5708a3
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 23 deletions.
diff --git a/src/main/java/com/groom/swipo/domain/payment/entity/Pay.java b/src/main/java/com/groom/swipo/domain/payment/entity/Pay.java
@@ -37,12 +37,12 @@ public class Pay extends BaseEntity {
 	private Integer totalPay;
 
 	// 유저 id
-	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
 	@JoinColumn(name = "user_id")
 	private User user;
 
 	// 페이 내역
-	@OneToMany(mappedBy = "pay", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "pay", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<Paylist> paylists = new ArrayList<>();
 
 	@Builder

diff --git a/src/main/java/com/groom/swipo/domain/point/entity/Card.java b/src/main/java/com/groom/swipo/domain/point/entity/Card.java
@@ -54,7 +54,7 @@ public class Card extends BaseEntity {
 	private User user;
 
 	// 카드 이용내역
-	@OneToMany(mappedBy = "card", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "card", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<Cardlist> cardlists = new ArrayList<>();
 
 	@Builder

diff --git a/src/main/java/com/groom/swipo/domain/point/entity/Cardlist.java b/src/main/java/com/groom/swipo/domain/point/entity/Cardlist.java
@@ -39,7 +39,9 @@ public class Cardlist extends BaseEntity {
 	private Store store;
 
 	@Builder
-	private Cardlist(long value) {
+	private Cardlist(long value, Card card, Store store) {
 		this.value = value;
+		this.card = card;
+		this.store = store;
 	}
 }
diff --git a/src/main/java/com/groom/swipo/domain/point/entity/MyPiece.java b/src/main/java/com/groom/swipo/domain/point/entity/MyPiece.java
@@ -45,11 +45,14 @@ public class MyPiece extends BaseEntity {
 	private Store store;
 
 	@Builder
-	private MyPiece(Boolean isDeleted) {
+	private MyPiece(Boolean isDeleted, User user, Piece piece, Store store) {
 		this.isDeleted = isDeleted;
+		this.user = user;
+		this.piece = piece;
+		this.store = store;
 	}
 
 	public void setIsDeleted(boolean isDeleted) {
 		this.isDeleted = isDeleted;
 	}
-}
+}
diff --git a/src/main/java/com/groom/swipo/domain/point/entity/Piece.java b/src/main/java/com/groom/swipo/domain/point/entity/Piece.java
@@ -28,11 +28,11 @@ public class Piece {
 	private String name;
 
 	// 내 조각
-	@OneToMany(mappedBy = "piece", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "piece", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<MyPiece> myPieces = new ArrayList<>();
 
 	@Builder
 	private Piece(String name) {
 		this.name = name;
 	}
-}
+}
diff --git a/src/main/java/com/groom/swipo/domain/store/entity/Store.java b/src/main/java/com/groom/swipo/domain/store/entity/Store.java
@@ -63,38 +63,39 @@ public class Store extends BaseEntity {
 
 	// 연관관계
 	// 페이 이용내역
-	@OneToMany(mappedBy = "store", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "store", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<Paylist> paylists = new ArrayList<>();
 
 	// 보유 조각
-	@OneToMany(mappedBy = "store", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "store", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<MyPiece> myPieces = new ArrayList<>();
 
 	// 리뷰
-	@OneToMany(mappedBy = "store", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "store", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<Reviews> reviews = new ArrayList<>();
 
 	// 위시리스트
-	@OneToMany(mappedBy = "store", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "store", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<Wishlist> wishlists = new ArrayList<>();
 
 	// 가게 이미지
-	@OneToMany(mappedBy = "store", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "store", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<StoreImage> storeImages = new ArrayList<>();
 
 	// 카드 이용내역
-	@OneToMany(mappedBy = "store", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "store", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<Cardlist> cardlists = new ArrayList<>();
 
 	// 기타
 	@Builder
-	private Store(String name, StoreType type, StoreCategory category, String address, Double latitude,
+	private Store(String name, StoreType type, StoreCategory category, String address, Double latitude, Area area,
 		Double longitude, Integer percent) {
 		this.name = name;
 		this.type = type;
 		this.category = category;
 		this.address = address;
 		this.latitude = latitude;
+		this.area = area;
 		this.longitude = longitude;
 		this.percent = percent;
 	}

diff --git a/src/main/java/com/groom/swipo/domain/store/entity/StoreImage.java b/src/main/java/com/groom/swipo/domain/store/entity/StoreImage.java
@@ -33,7 +33,8 @@ public class StoreImage extends BaseEntity {
 	private Store store;
 
 	@Builder
-	private StoreImage(String url) {
+	private StoreImage(String url, Store store) {
 		this.url = url;
+		this.store = store;
 	}
-}
+}
diff --git a/src/main/java/com/groom/swipo/domain/user/entity/User.java b/src/main/java/com/groom/swipo/domain/user/entity/User.java
@@ -78,27 +78,27 @@ public class User extends BaseEntity {
 
 	// 밑에 연관관계 적어두기
 	// 페이 충전내역
-	@OneToMany(mappedBy = "user", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<PayChargelist> payChargelists = new ArrayList<>();
 
 	// 보유조각
-	@OneToMany(mappedBy = "user", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<MyPiece> myPieces = new ArrayList<>();
 
 	// 리뷰
-	@OneToMany(mappedBy = "user", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<Reviews> reviews = new ArrayList<>();
 
 	// 관심
-	@OneToMany(mappedBy = "user", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<Wishlist> wishlists = new ArrayList<>();
 
 	// 카드
-	@OneToMany(mappedBy = "user", cascade = CascadeType.PERSIST)
+	@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<Card> Cards = new ArrayList<>();
 
 	// 페이
-	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
 	@JoinColumn(name = "pay_id")
 	private Pay pay;