Merge branch 'develop' of https://github.com/9oormthon-univ/2024_DANP…

…OONG_TEAM_42_BE into develop

src/main/java/com/groom/swipo/domain/payment/dto/response/PaymentPageResponse.java

@@ -10,13 +10,15 @@
 public record PaymentPageResponse(
 	Integer totalPoint,
 	Integer totalPay,
-	Integer percent
+	Integer percent,
+	String customImage
 ) {
 	public static PaymentPageResponse of(Card card, User user, Store store) {
 		return PaymentPageResponse.builder()
 			.totalPoint(card.getTotalPoint())
 			.totalPay(user.getPay().getTotalPay())
 			.percent(store.getPercent())
+			.customImage(card.getCustomImage())
 			.build();
 	}
 }

src/main/java/com/groom/swipo/domain/payment/entity/Pay.java

@@ -37,7 +37,7 @@ public class Pay extends BaseEntity {
 	private Integer totalPay;
 
 	// 유저 id
-	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
+	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 	@JoinColumn(name = "user_id")
 	private User user;
 

src/main/java/com/groom/swipo/domain/user/entity/User.java

@@ -98,7 +98,7 @@ public class User extends BaseEntity {
 	private List<Card> Cards = new ArrayList<>();
 
 	// 페이
-	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
+	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 	@JoinColumn(name = "pay_id")
 	private Pay pay;