From a4c07b8fd4aa05cb2d37b081b1539de1a530898b Mon Sep 17 00:00:00 2001
From: 5jisoo <56earls@gmail.com>
Date: Sun, 7 Jan 2024 20:46:24 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20=EA=B8=B0=EB=B3=B8=20=ED=94=84=EB=A1=9C?=
 =?UTF-8?q?=ED=95=84=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=97=85=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/unibond/unibond/member/domain/Member.java |  5 +++++
 .../unibond/member/dto/MemberRegisterReqDto.java  | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

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<String> interestList;
 
     public Member toEntity(Disease disease) {
-        HashSet<String> 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<String> 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<String> getValidInterestSet() {
+        HashSet<String> interestSet = new HashSet<>();
+        if (interestList != null) {
+            interestSet = new HashSet<>(interestList);
+        }
+        return interestSet;
+    }
 }