From 4173afd13ca9cb805ce4cc1ba93af281128dc128 Mon Sep 17 00:00:00 2001 From: LeeJaeHyeok97 Date: Wed, 17 Jan 2024 15:56:14 +0900 Subject: [PATCH] =?UTF-8?q?=20[FIX]:=20=EC=96=91=EB=B0=A9=ED=96=A5=20?= =?UTF-8?q?=EC=97=B0=EA=B4=80=EA=B4=80=EA=B3=84=20=EC=84=A4=EC=A0=95,=20ca?= =?UTF-8?q?scade=20ALL=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/finfellows/domain/bookmark/domain/CmaBookmark.java | 1 - .../domain/bookmark/domain/FinancialProductBookmark.java | 1 - .../domain/bookmark/domain/NewsContentBookmark.java | 1 - .../domain/bookmark/domain/PolicyInfoBookmark.java | 1 - .../finfellows/domain/bookmark/domain/PostBookmark.java | 1 - .../finfellows/domain/newscontent/domain/NewsContent.java | 7 +++++++ .../finfellows/domain/policyinfo/domain/PolicyInfo.java | 7 +++++++ .../java/com/finfellows/domain/product/domain/CMA.java | 7 +++++++ .../finfellows/domain/product/domain/FinancialProduct.java | 5 +++++ 9 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/finfellows/domain/bookmark/domain/CmaBookmark.java b/src/main/java/com/finfellows/domain/bookmark/domain/CmaBookmark.java index d2b84f5..813249c 100644 --- a/src/main/java/com/finfellows/domain/bookmark/domain/CmaBookmark.java +++ b/src/main/java/com/finfellows/domain/bookmark/domain/CmaBookmark.java @@ -31,7 +31,6 @@ public class CmaBookmark extends BaseEntity { // 금융 뭐하지 id @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "cma_id") - @OnDelete(action = OnDeleteAction.CASCADE) private CMA cma; @Builder diff --git a/src/main/java/com/finfellows/domain/bookmark/domain/FinancialProductBookmark.java b/src/main/java/com/finfellows/domain/bookmark/domain/FinancialProductBookmark.java index 891a311..d2e7de2 100644 --- a/src/main/java/com/finfellows/domain/bookmark/domain/FinancialProductBookmark.java +++ b/src/main/java/com/finfellows/domain/bookmark/domain/FinancialProductBookmark.java @@ -30,7 +30,6 @@ public class FinancialProductBookmark extends BaseEntity { // 금융 뭐하지 id @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "financial_product_id") - @OnDelete(action = OnDeleteAction.CASCADE) private FinancialProduct financialProduct; @Builder diff --git a/src/main/java/com/finfellows/domain/bookmark/domain/NewsContentBookmark.java b/src/main/java/com/finfellows/domain/bookmark/domain/NewsContentBookmark.java index 51ad5f1..d15c937 100644 --- a/src/main/java/com/finfellows/domain/bookmark/domain/NewsContentBookmark.java +++ b/src/main/java/com/finfellows/domain/bookmark/domain/NewsContentBookmark.java @@ -29,7 +29,6 @@ public class NewsContentBookmark extends BaseEntity { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "news_content_id") - @OnDelete(action = OnDeleteAction.CASCADE) private NewsContent newsContent; @Builder diff --git a/src/main/java/com/finfellows/domain/bookmark/domain/PolicyInfoBookmark.java b/src/main/java/com/finfellows/domain/bookmark/domain/PolicyInfoBookmark.java index 0bab32c..ff64470 100644 --- a/src/main/java/com/finfellows/domain/bookmark/domain/PolicyInfoBookmark.java +++ b/src/main/java/com/finfellows/domain/bookmark/domain/PolicyInfoBookmark.java @@ -30,7 +30,6 @@ public class PolicyInfoBookmark extends BaseEntity { // 금융 고마워 id @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "policy_info_id") - @OnDelete(action = OnDeleteAction.CASCADE) private PolicyInfo policyInfo; @Builder diff --git a/src/main/java/com/finfellows/domain/bookmark/domain/PostBookmark.java b/src/main/java/com/finfellows/domain/bookmark/domain/PostBookmark.java index c5d7dd4..ba58a27 100644 --- a/src/main/java/com/finfellows/domain/bookmark/domain/PostBookmark.java +++ b/src/main/java/com/finfellows/domain/bookmark/domain/PostBookmark.java @@ -30,7 +30,6 @@ public class PostBookmark extends BaseEntity { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "post_id") - @OnDelete(action = OnDeleteAction.CASCADE) private Post post; @Enumerated(EnumType.STRING) diff --git a/src/main/java/com/finfellows/domain/newscontent/domain/NewsContent.java b/src/main/java/com/finfellows/domain/newscontent/domain/NewsContent.java index 3a83299..6c9d2e7 100644 --- a/src/main/java/com/finfellows/domain/newscontent/domain/NewsContent.java +++ b/src/main/java/com/finfellows/domain/newscontent/domain/NewsContent.java @@ -1,5 +1,6 @@ package com.finfellows.domain.newscontent.domain; +import com.finfellows.domain.bookmark.domain.NewsContentBookmark; import com.finfellows.domain.common.BaseEntity; import com.finfellows.domain.post.domain.ContentType; @@ -11,6 +12,9 @@ import lombok.NoArgsConstructor; import org.hibernate.annotations.Where; +import java.util.ArrayList; +import java.util.List; + @Entity @Table(name="NewsContent") @NoArgsConstructor @@ -36,6 +40,9 @@ public class NewsContent extends BaseEntity { @Column(name="contentType") private ContentType contentType; + @OneToMany(mappedBy = "newsContent", cascade = CascadeType.ALL) + private List newsContentBookmarkList = new ArrayList<>(); + @Builder public NewsContent(Post post, String title, String content){ this.post=post; diff --git a/src/main/java/com/finfellows/domain/policyinfo/domain/PolicyInfo.java b/src/main/java/com/finfellows/domain/policyinfo/domain/PolicyInfo.java index d44c7b9..204cf56 100644 --- a/src/main/java/com/finfellows/domain/policyinfo/domain/PolicyInfo.java +++ b/src/main/java/com/finfellows/domain/policyinfo/domain/PolicyInfo.java @@ -1,5 +1,6 @@ package com.finfellows.domain.policyinfo.domain; +import com.finfellows.domain.bookmark.domain.PolicyInfoBookmark; import com.finfellows.domain.common.BaseEntity; import com.finfellows.domain.policyinfo.dto.PolicyUpdateReq; import jakarta.persistence.*; @@ -9,6 +10,9 @@ import lombok.NoArgsConstructor; import org.hibernate.annotations.Where; +import java.util.ArrayList; +import java.util.List; + @Entity @Table(name = "PolicyInfo") @NoArgsConstructor(access = AccessLevel.PROTECTED) @@ -57,6 +61,9 @@ public class PolicyInfo extends BaseEntity { private String pstnPaprCn; + @OneToMany(mappedBy = "policyInfo", cascade = CascadeType.ALL) + private List policyInfoBookmarkList = new ArrayList<>(); + public void updatePolicyInfo(PolicyUpdateReq policyUpdateReq) { this.polyBizSjNm = policyUpdateReq.getPolyBizSjNm(); this.polyItcnCn = policyUpdateReq.getPolyItcnCn(); diff --git a/src/main/java/com/finfellows/domain/product/domain/CMA.java b/src/main/java/com/finfellows/domain/product/domain/CMA.java index 04ed6b9..f9fe0e0 100644 --- a/src/main/java/com/finfellows/domain/product/domain/CMA.java +++ b/src/main/java/com/finfellows/domain/product/domain/CMA.java @@ -1,5 +1,6 @@ package com.finfellows.domain.product.domain; +import com.finfellows.domain.bookmark.domain.CmaBookmark; import com.finfellows.domain.common.BaseEntity; import jakarta.persistence.*; import lombok.AccessLevel; @@ -7,6 +8,9 @@ import lombok.Getter; import lombok.NoArgsConstructor; +import java.util.ArrayList; +import java.util.List; + @Entity @Table(name = "CMA") @NoArgsConstructor(access = AccessLevel.PROTECTED) @@ -48,6 +52,9 @@ public class CMA extends BaseEntity { @Column(name="deposit_protection") private String depositProtection; + @OneToMany(mappedBy = "cma", cascade = CascadeType.ALL) + private List cmaBookmarkList = new ArrayList<>(); + @Builder public CMA(String bankName, String productName, String cmaType, String disclosureMonth, String maturityInterestRate, String specialCondition, String joinWay, String etcNote, String productUrl, String depositProtection) { this.bankName = bankName; diff --git a/src/main/java/com/finfellows/domain/product/domain/FinancialProduct.java b/src/main/java/com/finfellows/domain/product/domain/FinancialProduct.java index fe481d2..327ebcb 100644 --- a/src/main/java/com/finfellows/domain/product/domain/FinancialProduct.java +++ b/src/main/java/com/finfellows/domain/product/domain/FinancialProduct.java @@ -1,5 +1,6 @@ package com.finfellows.domain.product.domain; +import com.finfellows.domain.bookmark.domain.FinancialProductBookmark; import com.finfellows.domain.common.BaseEntity; import jakarta.persistence.*; import lombok.AccessLevel; @@ -10,6 +11,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; @Entity @@ -75,6 +77,9 @@ public class FinancialProduct extends BaseEntity { @OneToMany(mappedBy = "financialProduct", fetch = FetchType.LAZY) private List financialProductOption; + @OneToMany(mappedBy = "financialProduct", cascade = CascadeType.ALL) + private List financialProductBookmarkList = new ArrayList<>(); + @Builder public FinancialProduct(String financialCompanyNo, String financialProductCode, String disclosureMonth, String bankName, String productName, String joinWay, String maturityInterestRate, String specialCondition, Integer joinDeny, String joinMember, String etcNote, Integer maxLimit, LocalDate disclosureStartDay, LocalDate disclosureEndDay, LocalDateTime financialCompanySubmissionDay, FinancialProductType financialProductType, List financialProductOption) { this.financialCompanyNo = financialCompanyNo;