Fix: 기본 프로필 이미지 업데이트

UniBond-jijijin · Jan 7, 2024 · a4c07b8 · a4c07b8
1 parent 848c242
commit a4c07b8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 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
@@ -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,13 +25,16 @@
 @Entity
 @Getter
 @DynamicInsert
+@DynamicUpdate
 @NoArgsConstructor(access = PROTECTED)
 public class Member extends BaseEntity {
 
     @Id
     @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
@@ -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,27 +21,33 @@ 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)
                 .diagnosisTiming(this.diseaseTiming)
                 .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;
+    }
 }