diff --git a/unibond/src/main/java/com/unibond/unibond/member/domain/Member.java b/unibond/src/main/java/com/unibond/unibond/member/domain/Member.java index 933dfab..176328a 100644 --- a/unibond/src/main/java/com/unibond/unibond/member/domain/Member.java +++ b/unibond/src/main/java/com/unibond/unibond/member/domain/Member.java @@ -7,8 +7,10 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import java.time.LocalDate; import java.util.HashSet; @@ -23,6 +25,7 @@ @Entity @Getter @DynamicInsert +@DynamicUpdate @NoArgsConstructor(access = PROTECTED) public class Member extends BaseEntity { @@ -30,6 +33,8 @@ public class Member extends BaseEntity { @GeneratedValue(strategy = IDENTITY) private Long id; + @Setter + @Column(columnDefinition = "VARCHAR(255) DEFAULT 'https://unibond-img-bucket.s3.ap-northeast-2.amazonaws.com/user/basic_profile.jpg'") private String profileImage; @Column(length = 10) diff --git a/unibond/src/main/java/com/unibond/unibond/member/dto/MemberRegisterReqDto.java b/unibond/src/main/java/com/unibond/unibond/member/dto/MemberRegisterReqDto.java index aa3ffd4..4de6c3d 100644 --- a/unibond/src/main/java/com/unibond/unibond/member/dto/MemberRegisterReqDto.java +++ b/unibond/src/main/java/com/unibond/unibond/member/dto/MemberRegisterReqDto.java @@ -5,7 +5,6 @@ import com.unibond.unibond.member.domain.Member; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.NonNull; import java.time.LocalDate; import java.util.HashSet; @@ -22,19 +21,17 @@ public class MemberRegisterReqDto { private List interestList; public Member toEntity(Disease disease) { - HashSet interestSet = new HashSet<>(interestList); return Member.builder() .disease(disease) .diagnosisTiming(this.diseaseTiming) .gender(gender) .nickname(this.nickname) .bio(this.bio) - .interestSet(interestSet) + .interestSet(getValidInterestSet()) .build(); } public Member toEntity(Disease disease, String imgUrl) { - HashSet interestSet = new HashSet<>(interestList); return Member.builder() .profileImage(imgUrl) .disease(disease) @@ -42,7 +39,15 @@ public Member toEntity(Disease disease, String imgUrl) { .gender(gender) .nickname(this.nickname) .bio(this.bio) - .interestSet(interestSet) + .interestSet(getValidInterestSet()) .build(); } + + private HashSet getValidInterestSet() { + HashSet interestSet = new HashSet<>(); + if (interestList != null) { + interestSet = new HashSet<>(interestList); + } + return interestSet; + } }