Merge pull request #161 from side-peek/refactor/#156-match-empty-value

옵션 값이 있는 요청, 응답에서 값이 빈 경우 타입 통일
side-peek · Mar 14, 2024 · 985c771 · 985c771
2 parents c86b3e7 + 457a60c
commit 985c771
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 70 deletions.
diff --git a/src/main/java/sixgaezzang/sidepeek/projects/dto/request/SaveProjectRequest.java b/src/main/java/sixgaezzang/sidepeek/projects/dto/request/SaveProjectRequest.java
@@ -12,7 +12,6 @@
 import static sixgaezzang.sidepeek.projects.exception.message.FileErrorMessage.OVERVIEW_IMAGE_OVER_MAX_COUNT;
 import static sixgaezzang.sidepeek.projects.exception.message.MemberErrorMessage.MEMBER_IS_EMPTY;
 import static sixgaezzang.sidepeek.projects.exception.message.MemberErrorMessage.MEMBER_OVER_MAX_COUNT;
-import static sixgaezzang.sidepeek.projects.exception.message.ProjectErrorMessage.DEPLOY_URL_IS_INVALID;
 import static sixgaezzang.sidepeek.projects.exception.message.ProjectErrorMessage.DEPLOY_URL_OVER_MAX_LENGTH;
 import static sixgaezzang.sidepeek.projects.exception.message.ProjectErrorMessage.DESCRIPTION_IS_NULL;
 import static sixgaezzang.sidepeek.projects.exception.message.ProjectErrorMessage.DESCRIPTION_OVER_MAX_LENGTH;
@@ -22,7 +21,6 @@
 import static sixgaezzang.sidepeek.projects.exception.message.ProjectErrorMessage.OVERVIEW_OVER_MAX_LENGTH;
 import static sixgaezzang.sidepeek.projects.exception.message.ProjectErrorMessage.OWNER_ID_IS_NULL;
 import static sixgaezzang.sidepeek.projects.exception.message.ProjectErrorMessage.SUB_NAME_OVER_MAX_LENGTH;
-import static sixgaezzang.sidepeek.projects.exception.message.ProjectErrorMessage.THUMBNAIL_URL_IS_INVALID;
 import static sixgaezzang.sidepeek.projects.exception.message.ProjectErrorMessage.THUMBNAIL_URL_OVER_MAX_LENGTH;
 import static sixgaezzang.sidepeek.projects.exception.message.ProjectErrorMessage.TROUBLESHOOTING_OVER_MAX_LENGTH;
 import static sixgaezzang.sidepeek.projects.util.ProjectConstant.MAX_MEMBER_COUNT;
@@ -85,12 +83,10 @@ public record SaveProjectRequest(
 
     @Schema(description = "프로젝트 썸네일 이미지 URL", example = "https://sidepeek.image/imageeUrl")
     @Size(max = MAX_TEXT_LENGTH, message = THUMBNAIL_URL_OVER_MAX_LENGTH)
-    @URL(message = THUMBNAIL_URL_IS_INVALID, regexp = URL_REGEXP)
     String thumbnailUrl,
 
     @Schema(description = "프로젝트 배포 URL", example = "https://www.sidepeek.com")
     @Size(max = MAX_TEXT_LENGTH, message = DEPLOY_URL_OVER_MAX_LENGTH)
-    @URL(message = DEPLOY_URL_IS_INVALID, regexp = URL_REGEXP)
     String deployUrl,
 
     @Schema(description = "프로젝트 시작 연-월", example = "2024-02")

diff --git a/src/main/java/sixgaezzang/sidepeek/users/domain/User.java b/src/main/java/sixgaezzang/sidepeek/users/domain/User.java
@@ -157,12 +157,12 @@ private void setNickname(String nickname) {
     // Option
     private void setIntroduction(String introduction) {
         validateIntroduction(introduction);
-        this.introduction = introduction;
+        this.introduction = getBlankIfNullOrBlank(introduction);
     }
 
     private void setProfileImageUrl(String profileImageUrl) {
         validateProfileImageUrl(profileImageUrl);
-        this.profileImageUrl = profileImageUrl;
+        this.profileImageUrl = getBlankIfNullOrBlank(profileImageUrl);
     }
 
     private void setJob(String jobName) {

diff --git a/src/main/java/sixgaezzang/sidepeek/users/dto/response/UserProfileResponse.java b/src/main/java/sixgaezzang/sidepeek/users/dto/response/UserProfileResponse.java
@@ -1,5 +1,7 @@
 package sixgaezzang.sidepeek.users.dto.response;
 
+import static sixgaezzang.sidepeek.common.util.CommonConstant.BLANK_STRING;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import java.util.Objects;
@@ -40,10 +42,10 @@ public record UserProfileResponse(
 ) {
     public static UserProfileResponse from(User user, boolean isSocialLogin, List<UserSkillSummary> techStacks) {
         Job userJob = user.getJob();
-        String jobName = Objects.nonNull(userJob) ? userJob.getName() : null;
+        String jobName = Objects.nonNull(userJob) ? userJob.getName() : BLANK_STRING;
 
         Career userCareer = user.getCareer();
-        String careerDescription = Objects.nonNull(userCareer) ? userCareer.getDescription() : null;
+        String careerDescription = Objects.nonNull(userCareer) ? userCareer.getDescription() : BLANK_STRING;
 
         return UserProfileResponse.builder()
             .isSocialLogin(isSocialLogin)

diff --git a/src/main/java/sixgaezzang/sidepeek/users/dto/response/UserSummary.java b/src/main/java/sixgaezzang/sidepeek/users/dto/response/UserSummary.java
@@ -1,6 +1,10 @@
 package sixgaezzang.sidepeek.users.dto.response;
 
+import static sixgaezzang.sidepeek.common.util.CommonConstant.BLANK_STRING;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.Objects;
 import lombok.Builder;
 import sixgaezzang.sidepeek.users.domain.User;
 
@@ -11,6 +15,7 @@ public record UserSummary(
     Long id,
 
     @Schema(description = "소셜 로그인 회원 여부", nullable = true, example = "false")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     Boolean isSocialLogin,
 
     @Schema(description = "회원/비회원 닉네임", example = "의진")
@@ -22,7 +27,7 @@ public record UserSummary(
 ) {
 
     public UserSummary(Long id, String nickname, String profileImageUrl) {
-        this(id, null, nickname, profileImageUrl);
+        this(id, null, nickname, Objects.isNull(profileImageUrl) ? BLANK_STRING : profileImageUrl);
     }
 
     public static UserSummary fromWithIsSocialLogin(User user, boolean isSocialLogin) {
@@ -59,7 +64,7 @@ public static UserSummary from(String nickname) {
             .id(null)
             .isSocialLogin(null)
             .nickname(nickname)
-            .profileImageUrl(null)
+            .profileImageUrl(BLANK_STRING)
             .build();
     }