From 705fb8c893098d8d4949f074828c121b0a2812e6 Mon Sep 17 00:00:00 2001 From: yeonjy Date: Thu, 22 Aug 2024 01:15:54 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20inquiry=20&=20trip=20cascade=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pyro/yolog/domain/member/entity/Member.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/pyro/yolog/domain/member/entity/Member.java b/src/main/java/com/pyro/yolog/domain/member/entity/Member.java index ebec65b..cb3a2e2 100644 --- a/src/main/java/com/pyro/yolog/domain/member/entity/Member.java +++ b/src/main/java/com/pyro/yolog/domain/member/entity/Member.java @@ -1,10 +1,14 @@ package com.pyro.yolog.domain.member.entity; +import com.pyro.yolog.domain.inquiry.entity.Inquiry; import com.pyro.yolog.domain.member.dto.request.SignUpRequest; +import com.pyro.yolog.domain.trip.entity.Trip; import com.pyro.yolog.global.config.BaseTimeEntity; import jakarta.persistence.*; import lombok.*; +import java.util.List; + @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) @Entity @@ -15,7 +19,7 @@ public class Member extends BaseTimeEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - private String oauthId; //로그인한 소셜 타입의 식별자 값 + private String oauthId; private String nickname; private String email; private String password; @@ -30,6 +34,12 @@ public class Member extends BaseTimeEntity { @Enumerated(EnumType.STRING) private Status status; + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) + private List inquiries; + + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) + private List trips; + public void signUp(SignUpRequest dto) { this.nickname = dto.getNickname(); this.role = Role.USER; From 27a4e3ea288e6c3a2b84b30e4b0e57a00029d8f7 Mon Sep 17 00:00:00 2001 From: yeonjy Date: Thu, 22 Aug 2024 01:16:16 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20diary=20cascade=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/pyro/yolog/domain/trip/entity/Trip.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/pyro/yolog/domain/trip/entity/Trip.java b/src/main/java/com/pyro/yolog/domain/trip/entity/Trip.java index effadfe..979d476 100644 --- a/src/main/java/com/pyro/yolog/domain/trip/entity/Trip.java +++ b/src/main/java/com/pyro/yolog/domain/trip/entity/Trip.java @@ -1,5 +1,7 @@ package com.pyro.yolog.domain.trip.entity; +import com.pyro.yolog.domain.diary.entity.Diary; +import com.pyro.yolog.domain.inquiry.entity.Inquiry; import com.pyro.yolog.domain.member.entity.Member; import com.pyro.yolog.domain.trip.dto.request.TripRequest; import com.pyro.yolog.global.config.BaseTimeEntity; @@ -11,6 +13,7 @@ import lombok.NoArgsConstructor; import java.time.LocalDate; +import java.util.List; @Getter @Entity @@ -43,6 +46,9 @@ public class Trip extends BaseTimeEntity { @JoinColumn(name = "member_id") private Member member; + @OneToMany(mappedBy = "trip", cascade = CascadeType.ALL) + private List diaries; + @Builder public Trip(String name, String destination, String coverImageUrl, CoverColor coverColor, SpineColor spineColor, LocalDate startDate, LocalDate finishDate, Member member) { this.name = name; From 00f598b9ad8bd04106638f562d9b37ab8870be14 Mon Sep 17 00:00:00 2001 From: yeonjy Date: Thu, 22 Aug 2024 01:17:01 +0900 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=20=ED=83=88?= =?UTF-8?q?=ED=87=B4=20=EC=8B=9C,=20=EC=B2=AB=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EB=A1=9C=20redirect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pyro/yolog/domain/auth/controller/AuthApi.java | 2 +- .../com/pyro/yolog/domain/auth/controller/AuthController.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/pyro/yolog/domain/auth/controller/AuthApi.java b/src/main/java/com/pyro/yolog/domain/auth/controller/AuthApi.java index 20c4105..ba92a42 100644 --- a/src/main/java/com/pyro/yolog/domain/auth/controller/AuthApi.java +++ b/src/main/java/com/pyro/yolog/domain/auth/controller/AuthApi.java @@ -38,5 +38,5 @@ public interface AuthApi { ) } ) - void withdrawMember(); + String withdrawMember(); } diff --git a/src/main/java/com/pyro/yolog/domain/auth/controller/AuthController.java b/src/main/java/com/pyro/yolog/domain/auth/controller/AuthController.java index 988d579..29e1825 100644 --- a/src/main/java/com/pyro/yolog/domain/auth/controller/AuthController.java +++ b/src/main/java/com/pyro/yolog/domain/auth/controller/AuthController.java @@ -22,7 +22,8 @@ public boolean signUp(@RequestBody SignUpRequest request) { @ResponseStatus(HttpStatus.NO_CONTENT) @DeleteMapping("/withdrawal") @Override - public void withdrawMember() { + public String withdrawMember() { authService.withdrawMember(); + return "redirect:https://yolog.store"; } } From 7bdf523e9d557ee773dcb2a405ea8118286bab9d Mon Sep 17 00:00:00 2001 From: yeonjy Date: Thu, 22 Aug 2024 02:08:35 +0900 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20inquiry=20image=20cascade=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pyro/yolog/domain/inquiry/entity/Inquiry.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/pyro/yolog/domain/inquiry/entity/Inquiry.java b/src/main/java/com/pyro/yolog/domain/inquiry/entity/Inquiry.java index b65a665..cff0318 100644 --- a/src/main/java/com/pyro/yolog/domain/inquiry/entity/Inquiry.java +++ b/src/main/java/com/pyro/yolog/domain/inquiry/entity/Inquiry.java @@ -7,7 +7,8 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.hibernate.annotations.ColumnDefault; + +import java.util.List; @Getter @Entity @@ -27,6 +28,9 @@ public class Inquiry extends BaseTimeEntity { @JoinColumn(name = "member_id") private Member member; + @OneToMany(mappedBy = "inquiry_image", cascade = CascadeType.ALL) + private List inquiries; + @Builder public Inquiry(String title, String content, Member member) { this.title = title; From 657edbe00b6ca836081e2e488ef87c39ba608b0f Mon Sep 17 00:00:00 2001 From: yeonjy Date: Thu, 22 Aug 2024 02:14:23 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20inquiry=20image=20cascade=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pyro/yolog/domain/inquiry/entity/Inquiry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/pyro/yolog/domain/inquiry/entity/Inquiry.java b/src/main/java/com/pyro/yolog/domain/inquiry/entity/Inquiry.java index cff0318..6980c1d 100644 --- a/src/main/java/com/pyro/yolog/domain/inquiry/entity/Inquiry.java +++ b/src/main/java/com/pyro/yolog/domain/inquiry/entity/Inquiry.java @@ -28,8 +28,8 @@ public class Inquiry extends BaseTimeEntity { @JoinColumn(name = "member_id") private Member member; - @OneToMany(mappedBy = "inquiry_image", cascade = CascadeType.ALL) - private List inquiries; + @OneToMany(mappedBy = "inquiry", cascade = CascadeType.ALL) + private List inquiryImages; @Builder public Inquiry(String title, String content, Member member) {