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"; } } 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..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 @@ -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", cascade = CascadeType.ALL) + private List inquiryImages; + @Builder public Inquiry(String title, String content, Member member) { this.title = title; 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; 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;