[MERGE/#160] 회원가입 시 반드시 필요한 필드들 NotNull 처리

[FIX] #160 - 회원가입 시 반드시 필요한 필드들 NotNull 처리
TEAM-SEONYAK · Nov 11, 2024 · f58c81c · f58c81c
2 parents bec2ca8 + 8a17b8e
commit f58c81c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/main/java/org/sopt/seonyakServer/domain/member/dto/MemberJoinRequest.java b/src/main/java/org/sopt/seonyakServer/domain/member/dto/MemberJoinRequest.java
@@ -1,18 +1,27 @@
 package org.sopt.seonyakServer.domain.member.dto;
 
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 public record MemberJoinRequest(
         @NotBlank(message = "role은 공백일 수 없습니다.")
         String role,
+        @NotNull(message = "isSubscribed는 null일 수 없습니다.")
         Boolean isSubscribed,
+        @NotBlank(message = "nickname은 공백일 수 없습니다.")
         String nickname,
+        @NotNull(message = "image는 null일 수 없습니다.")
         String image,
+        @NotBlank(message = "phoneNumber는 공백일 수 없습니다.")
         String phoneNumber,
+        @NotBlank(message = "univName은 공백일 수 없습니다.")
         String univName,
+        @NotBlank(message = "field는 공백일 수 없습니다.")
         String field,
-        List<String> departmentList,
+        @NotEmpty(message = "departmentList는 비어 있을 수 없습니다.")
+        List<@NotBlank String> departmentList,
         String businessCard,
         String company,
         String position,

diff --git a/src/main/java/org/sopt/seonyakServer/domain/member/dto/MemberJoinResponse.java b/src/main/java/org/sopt/seonyakServer/domain/member/dto/MemberJoinResponse.java
@@ -5,15 +5,15 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public record MemberJoinResponse(
         Long seniorId,
-        String userType
+        String role
 ) {
     public static MemberJoinResponse of(
             final Long seniorId,
-            final String userType
+            final String role
     ) {
         return new MemberJoinResponse(
                 seniorId,
-                userType
+                role
         );
     }
 }
diff --git a/src/main/java/org/sopt/seonyakServer/domain/member/service/MemberService.java b/src/main/java/org/sopt/seonyakServer/domain/member/service/MemberService.java
@@ -177,10 +177,14 @@ public void validNickname(final NicknameRequest nicknameRequest) {
     public MemberJoinResponse patchMemberJoin(MemberJoinRequest memberJoinRequest) {
         Member member = memberRepository.findMemberByIdOrThrow(principalHandler.getUserIdFromPrincipal());
 
+        String image = memberJoinRequest.image().isEmpty()
+                ? (Math.random() < 0.5 ? "basic1.jpg" : "basic2.jpg")
+                : memberJoinRequest.image();
+
         member.updateMember(
                 memberJoinRequest.isSubscribed(),
                 memberJoinRequest.nickname(),
-                "https://" + bucketName + s3Substring + "profiles/" + memberJoinRequest.image(),
+                "https://" + bucketName + s3Substring + "profiles/" + image,
                 memberJoinRequest.phoneNumber().replaceAll("-", ""),
                 memberJoinRequest.univName(),
                 memberJoinRequest.field(),