From a86b8971265667ace7cfcc2de88a526c35ab74da Mon Sep 17 00:00:00 2001 From: 88dldl Date: Fri, 7 Feb 2025 14:38:37 +0900 Subject: [PATCH 1/6] =?UTF-8?q?:sparkles:=20[Feat]=20=EC=A6=90=EA=B2=A8?= =?UTF-8?q?=EC=B0=BE=EA=B8=B0=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EB=B0=8F=20=EC=97=B0=EA=B4=80=EA=B4=80=EA=B3=84=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/avab/avab/domain/Recreation.java | 5 +++ src/main/java/com/avab/avab/domain/User.java | 4 +++ .../domain/mapping/RecreationBookmark.java | 33 +++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 src/main/java/com/avab/avab/domain/mapping/RecreationBookmark.java diff --git a/src/main/java/com/avab/avab/domain/Recreation.java b/src/main/java/com/avab/avab/domain/Recreation.java index d94dab6..5c2099f 100644 --- a/src/main/java/com/avab/avab/domain/Recreation.java +++ b/src/main/java/com/avab/avab/domain/Recreation.java @@ -21,6 +21,7 @@ import com.avab.avab.domain.common.BaseEntity; import com.avab.avab.domain.mapping.FlowRecreation; +import com.avab.avab.domain.mapping.RecreationBookmark; import com.avab.avab.domain.mapping.RecreationFavorite; import com.avab.avab.domain.mapping.RecreationRecreationKeyword; import com.avab.avab.domain.mapping.RecreationRecreationPurpose; @@ -119,6 +120,10 @@ public class Recreation extends BaseEntity { @OneToMany(mappedBy = "recreation", cascade = CascadeType.ALL) private List flowRecreationList = new ArrayList<>(); + @Builder.Default + @OneToMany(mappedBy = "recreation", cascade = CascadeType.ALL) + private List recreationBookmarkList = new ArrayList<>(); + @Builder.Default @OneToMany(mappedBy = "targetRecreation", cascade = CascadeType.ALL) private List reportList = new ArrayList<>(); diff --git a/src/main/java/com/avab/avab/domain/User.java b/src/main/java/com/avab/avab/domain/User.java index 191e9f7..a6616b2 100644 --- a/src/main/java/com/avab/avab/domain/User.java +++ b/src/main/java/com/avab/avab/domain/User.java @@ -15,6 +15,7 @@ import com.avab.avab.domain.enums.SocialType; import com.avab.avab.domain.enums.UserStatus; import com.avab.avab.domain.mapping.FlowScrap; +import com.avab.avab.domain.mapping.RecreationBookmark; import com.avab.avab.domain.mapping.RecreationFavorite; import com.avab.avab.domain.mapping.RecreationReviewRecommendation; @@ -80,6 +81,9 @@ public class User extends BaseEntity { @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) private List flowScrapList = new ArrayList<>(); + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List recreationBookmarkList = new ArrayList<>(); + @OneToMany(mappedBy = "reporter", cascade = CascadeType.ALL) private List reportList = new ArrayList<>(); diff --git a/src/main/java/com/avab/avab/domain/mapping/RecreationBookmark.java b/src/main/java/com/avab/avab/domain/mapping/RecreationBookmark.java new file mode 100644 index 0000000..f346fc7 --- /dev/null +++ b/src/main/java/com/avab/avab/domain/mapping/RecreationBookmark.java @@ -0,0 +1,33 @@ +package com.avab.avab.domain.mapping; + +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; + +import com.avab.avab.domain.Recreation; +import com.avab.avab.domain.User; + +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class RecreationBookmark { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "recreation_id") + private Recreation recreation; +} From 2856d2a77adf80cdd0ae283a3a3dec81a120e1bc Mon Sep 17 00:00:00 2001 From: 88dldl Date: Fri, 7 Feb 2025 16:46:31 +0900 Subject: [PATCH 2/6] =?UTF-8?q?Revert=20":sparkles:=20[Feat]=20=EC=A6=90?= =?UTF-8?q?=EA=B2=A8=EC=B0=BE=EA=B8=B0=20=EC=97=94=ED=8B=B0=ED=8B=B0=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EC=97=B0=EA=B4=80=EA=B4=80?= =?UTF-8?q?=EA=B3=84=20=EC=B6=94=EA=B0=80"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a86b8971265667ace7cfcc2de88a526c35ab74da. --- .../java/com/avab/avab/domain/Recreation.java | 5 --- src/main/java/com/avab/avab/domain/User.java | 4 --- .../domain/mapping/RecreationBookmark.java | 33 ------------------- 3 files changed, 42 deletions(-) delete mode 100644 src/main/java/com/avab/avab/domain/mapping/RecreationBookmark.java diff --git a/src/main/java/com/avab/avab/domain/Recreation.java b/src/main/java/com/avab/avab/domain/Recreation.java index 5c2099f..d94dab6 100644 --- a/src/main/java/com/avab/avab/domain/Recreation.java +++ b/src/main/java/com/avab/avab/domain/Recreation.java @@ -21,7 +21,6 @@ import com.avab.avab.domain.common.BaseEntity; import com.avab.avab.domain.mapping.FlowRecreation; -import com.avab.avab.domain.mapping.RecreationBookmark; import com.avab.avab.domain.mapping.RecreationFavorite; import com.avab.avab.domain.mapping.RecreationRecreationKeyword; import com.avab.avab.domain.mapping.RecreationRecreationPurpose; @@ -120,10 +119,6 @@ public class Recreation extends BaseEntity { @OneToMany(mappedBy = "recreation", cascade = CascadeType.ALL) private List flowRecreationList = new ArrayList<>(); - @Builder.Default - @OneToMany(mappedBy = "recreation", cascade = CascadeType.ALL) - private List recreationBookmarkList = new ArrayList<>(); - @Builder.Default @OneToMany(mappedBy = "targetRecreation", cascade = CascadeType.ALL) private List reportList = new ArrayList<>(); diff --git a/src/main/java/com/avab/avab/domain/User.java b/src/main/java/com/avab/avab/domain/User.java index a6616b2..191e9f7 100644 --- a/src/main/java/com/avab/avab/domain/User.java +++ b/src/main/java/com/avab/avab/domain/User.java @@ -15,7 +15,6 @@ import com.avab.avab.domain.enums.SocialType; import com.avab.avab.domain.enums.UserStatus; import com.avab.avab.domain.mapping.FlowScrap; -import com.avab.avab.domain.mapping.RecreationBookmark; import com.avab.avab.domain.mapping.RecreationFavorite; import com.avab.avab.domain.mapping.RecreationReviewRecommendation; @@ -81,9 +80,6 @@ public class User extends BaseEntity { @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) private List flowScrapList = new ArrayList<>(); - @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) - private List recreationBookmarkList = new ArrayList<>(); - @OneToMany(mappedBy = "reporter", cascade = CascadeType.ALL) private List reportList = new ArrayList<>(); diff --git a/src/main/java/com/avab/avab/domain/mapping/RecreationBookmark.java b/src/main/java/com/avab/avab/domain/mapping/RecreationBookmark.java deleted file mode 100644 index f346fc7..0000000 --- a/src/main/java/com/avab/avab/domain/mapping/RecreationBookmark.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.avab.avab.domain.mapping; - -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; - -import com.avab.avab.domain.Recreation; -import com.avab.avab.domain.User; - -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Entity -@Getter -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class RecreationBookmark { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private long id; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "user_id") - private User user; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "recreation_id") - private Recreation recreation; -} From 8633a692ee9db7033b5daa0fdd1ec47ced4c7da6 Mon Sep 17 00:00:00 2001 From: 88dldl Date: Fri, 7 Feb 2025 16:50:31 +0900 Subject: [PATCH 3/6] =?UTF-8?q?:sparkles:=20[Feat]=20=EB=A0=88=ED=81=AC?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=EC=A6=90=EA=B2=A8=EC=B0=BE?= =?UTF-8?q?=EA=B8=B0=20count=20=EC=BB=AC=EB=9F=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/avab/avab/domain/Recreation.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/avab/avab/domain/Recreation.java b/src/main/java/com/avab/avab/domain/Recreation.java index d94dab6..0e44923 100644 --- a/src/main/java/com/avab/avab/domain/Recreation.java +++ b/src/main/java/com/avab/avab/domain/Recreation.java @@ -64,6 +64,7 @@ public class Recreation extends BaseEntity { private Long viewCount; private Long weeklyViewCount; + private Long bookmarkCount; @ColumnDefault("0") @Column(name = "view_count_last_7_days") From 18b50f7a12a0a854d15b60adc5ba9e4b2a073b5b Mon Sep 17 00:00:00 2001 From: 88dldl Date: Fri, 7 Feb 2025 16:53:55 +0900 Subject: [PATCH 4/6] =?UTF-8?q?:recycle:=20[Refactor]=20=EC=A6=90=EA=B2=A8?= =?UTF-8?q?=EC=B0=BE=EA=B8=B0=20count=ED=95=98=EB=8A=94=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=EC=9D=98=20=EC=9D=98=EB=AF=B8=EB=A5=BC=20=EB=AA=85?= =?UTF-8?q?=ED=99=95=ED=95=98=EA=B2=8C=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20?= =?UTF-8?q?=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/avab/avab/domain/Recreation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/avab/avab/domain/Recreation.java b/src/main/java/com/avab/avab/domain/Recreation.java index 0e44923..cf9fb07 100644 --- a/src/main/java/com/avab/avab/domain/Recreation.java +++ b/src/main/java/com/avab/avab/domain/Recreation.java @@ -64,7 +64,7 @@ public class Recreation extends BaseEntity { private Long viewCount; private Long weeklyViewCount; - private Long bookmarkCount; + private Long favoriteCount; @ColumnDefault("0") @Column(name = "view_count_last_7_days") From 97771448e82fdd010aa0e3932e8aef07a1fcc668 Mon Sep 17 00:00:00 2001 From: 88dldl Date: Fri, 7 Feb 2025 16:55:24 +0900 Subject: [PATCH 5/6] =?UTF-8?q?Revert=20":recycle:=20[Refactor]=20?= =?UTF-8?q?=EC=A6=90=EA=B2=A8=EC=B0=BE=EA=B8=B0=20count=ED=95=98=EB=8A=94?= =?UTF-8?q?=20=ED=95=84=EB=93=9C=EC=9D=98=20=EC=9D=98=EB=AF=B8=EB=A5=BC=20?= =?UTF-8?q?=EB=AA=85=ED=99=95=ED=95=98=EA=B2=8C=20=EB=84=A4=EC=9D=B4?= =?UTF-8?q?=EB=B0=8D=20=EB=B3=80=EA=B2=BD"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 18b50f7a12a0a854d15b60adc5ba9e4b2a073b5b. --- src/main/java/com/avab/avab/domain/Recreation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/avab/avab/domain/Recreation.java b/src/main/java/com/avab/avab/domain/Recreation.java index cf9fb07..0e44923 100644 --- a/src/main/java/com/avab/avab/domain/Recreation.java +++ b/src/main/java/com/avab/avab/domain/Recreation.java @@ -64,7 +64,7 @@ public class Recreation extends BaseEntity { private Long viewCount; private Long weeklyViewCount; - private Long favoriteCount; + private Long bookmarkCount; @ColumnDefault("0") @Column(name = "view_count_last_7_days") From fe0dbc5ea87e50e5ff337a959a8a93c13933d314 Mon Sep 17 00:00:00 2001 From: 88dldl Date: Fri, 7 Feb 2025 16:56:15 +0900 Subject: [PATCH 6/6] =?UTF-8?q?:recycle:=20[Refactor]=20=EC=A6=90=EA=B2=A8?= =?UTF-8?q?=EC=B0=BE=EA=B8=B0=20count=ED=95=98=EB=8A=94=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=EC=9D=98=20=EC=9D=98=EB=AF=B8=EB=A5=BC=20=EB=AA=85?= =?UTF-8?q?=ED=99=95=ED=95=98=EA=B2=8C=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20?= =?UTF-8?q?=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/avab/avab/domain/Recreation.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/avab/avab/domain/Recreation.java b/src/main/java/com/avab/avab/domain/Recreation.java index 0e44923..89370ad 100644 --- a/src/main/java/com/avab/avab/domain/Recreation.java +++ b/src/main/java/com/avab/avab/domain/Recreation.java @@ -64,7 +64,8 @@ public class Recreation extends BaseEntity { private Long viewCount; private Long weeklyViewCount; - private Long bookmarkCount; + + private Long favoriteCount; @ColumnDefault("0") @Column(name = "view_count_last_7_days")