프로젝트 저장 유효성 검사 완료 및 테스트 코드 일부 작성

src/main/generated/sixgaezzang/sidepeek/projects/domain/QProject.java

@@ -30,7 +30,7 @@ public class QProject extends EntityPathBase<Project> {
 
     public final StringPath description = createString("description");
 
-    public final DateTimePath<java.time.LocalDateTime> endDate = createDateTime("endDate", java.time.LocalDateTime.class);
+    public final ComparablePath<java.time.YearMonth> endDate = createComparable("endDate", java.time.YearMonth.class);
 
     public final StringPath githubUrl = createString("githubUrl");
 
@@ -44,7 +44,7 @@ public class QProject extends EntityPathBase<Project> {
 
     public final NumberPath<Long> ownerId = createNumber("ownerId", Long.class);
 
-    public final DateTimePath<java.time.LocalDateTime> startDate = createDateTime("startDate", java.time.LocalDateTime.class);
+    public final ComparablePath<java.time.YearMonth> startDate = createComparable("startDate", java.time.YearMonth.class);
 
     public final StringPath subName = createString("subName");
 

src/main/java/sixgaezzang/sidepeek/common/util/CommonConstant.java

@@ -0,0 +1,6 @@
+package sixgaezzang.sidepeek.common.util;
+
+public class CommonConstant {
+    public static final long MIN_ID = 1;
+    public static final int MAX_TEXT_LENGTH = 21_844;
+}

src/main/java/sixgaezzang/sidepeek/common/util/Regex.java

@@ -0,0 +1,6 @@
+package sixgaezzang.sidepeek.common.util;
+
+public class Regex {
+    public static final String URL_REGEXP =
+        "^(https?)://([^:/\\s]+)(:([^/]*))?((/[^\\s/]+)*)?/?([^#\\s?]*)(\\?([^#\\s]*))?(#(\\w*))?$";
+}

src/main/java/sixgaezzang/sidepeek/common/util/ValidationUtils.java

@@ -2,8 +2,12 @@
 
 import static io.micrometer.common.util.StringUtils.isBlank;
 import static io.micrometer.common.util.StringUtils.isNotBlank;
+import static sixgaezzang.sidepeek.common.util.CommonConstant.MAX_TEXT_LENGTH;
+import static sixgaezzang.sidepeek.common.util.Regex.URL_REGEXP;
 import static sixgaezzang.sidepeek.users.domain.Password.PASSWORD_REGXP;
 
+import java.util.Collection;
+import java.util.Objects;
 import java.util.regex.Pattern;
 import lombok.NoArgsConstructor;
 import org.springframework.util.Assert;
@@ -16,8 +20,7 @@ public final class ValidationUtils {
     private static final Pattern EMAIL_PATTERN = Pattern.compile(
         "^[a-zA-Z0-9_!#$%&’*+/=?`{|}~^.-]+@[a-zA-Z0-9.-]+[.][0-9A-Za-z]+$");
 
-    private static final Pattern URI_PATTERN = Pattern.compile(
-        "^(https?)://([^:/\\s]+)(:([^/]*))?((/[^\\s/]+)*)?/?([^#\\s?]*)(\\?([^#\\s]*))?(#(\\w*))?$");
+    private static final Pattern URI_PATTERN = Pattern.compile(URL_REGEXP);
 
     public static void validateEmail(String input, String message) {
         pattern(input, EMAIL_PATTERN, message);
@@ -35,6 +38,10 @@ public static void validateMaxLength(String input, int maxLength, String message
         Assert.isTrue(input.length() <= maxLength, message);
     }
 
+    public static void validateTextLength(String input, String message) {
+        Assert.isTrue(input.length() <= MAX_TEXT_LENGTH, message);
+    }
+
     public static void validateNotBlank(String input, String message) {
         Assert.isTrue(isNotBlank(input), message);
     }
@@ -43,6 +50,14 @@ public static void validateBlank(String input, String message) {
         Assert.isTrue(isBlank(input), message);
     }
 
+    public static <T> void validateNotNullAndEmpty(Collection<T> input, String message) {
+        Assert.isTrue(isNotNullOrEmpty(input), message);
+    }
+
+    public static <T> boolean isNotNullOrEmpty(Collection<T> input) {
+        return Objects.nonNull(input) && !input.isEmpty();
+    }
+
     private static void pattern(String input, Pattern pattern, String message) {
         Assert.isTrue(pattern.matcher(input).matches(), message);
     }

src/main/java/sixgaezzang/sidepeek/projects/controller/ProjectController.java

@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import java.net.URI;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -26,14 +27,16 @@ public class ProjectController {
     private final ProjectService projectService;
 
     @PostMapping
-    public ResponseEntity<Void> save(@RequestBody ProjectSaveRequest request) {
-        Long id = projectService.save(request);
+    public ResponseEntity<ProjectResponse> save(
+        @Valid @RequestBody ProjectSaveRequest request
+    ) {
+        ProjectResponse response = projectService.save(request);
         URI uri = ServletUriComponentsBuilder.fromCurrentContextPath()
             .path("/projects/{id}")
-            .buildAndExpand(id).toUri();
+            .buildAndExpand(response.id()).toUri();
 
         return ResponseEntity.created(uri)
-            .build();
+            .body(response);
     }
 
     @GetMapping("/{id}")

src/main/java/sixgaezzang/sidepeek/projects/domain/Project.java

@@ -1,18 +1,34 @@
 package sixgaezzang.sidepeek.projects.domain;
 
+import static sixgaezzang.sidepeek.projects.util.ProjectConstant.MAX_OVERVIEW_LENGTH;
+import static sixgaezzang.sidepeek.projects.util.ProjectConstant.MAX_PROJECT_NAME_LENGTH;
+import static sixgaezzang.sidepeek.projects.util.validation.ProjectValidator.validateDeployUrl;
+import static sixgaezzang.sidepeek.projects.util.validation.ProjectValidator.validateDescription;
+import static sixgaezzang.sidepeek.projects.util.validation.ProjectValidator.validateDuration;
+import static sixgaezzang.sidepeek.projects.util.validation.ProjectValidator.validateGithubUrl;
+import static sixgaezzang.sidepeek.projects.util.validation.ProjectValidator.validateName;
+import static sixgaezzang.sidepeek.projects.util.validation.ProjectValidator.validateOverview;
+import static sixgaezzang.sidepeek.projects.util.validation.ProjectValidator.validateOwnerId;
+import static sixgaezzang.sidepeek.projects.util.validation.ProjectValidator.validateSubName;
+import static sixgaezzang.sidepeek.projects.util.validation.ProjectValidator.validateThumbnailUrl;
+import static sixgaezzang.sidepeek.projects.util.validation.ProjectValidator.validateTroubleshooting;
+
 import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLRestriction;
 import sixgaezzang.sidepeek.common.domain.BaseTimeEntity;
+import sixgaezzang.sidepeek.projects.util.converter.YearMonthDateAttributeConverter;
 
 @Entity
 @Table(name = "project")
@@ -25,20 +41,22 @@ public class Project extends BaseTimeEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(name = "name", nullable = false, length = 300)
+    @Column(name = "name", nullable = false, length = MAX_PROJECT_NAME_LENGTH)
     private String name;
 
-    @Column(name = "sub_name", length = 300)
+    @Column(name = "sub_name", length = MAX_PROJECT_NAME_LENGTH)
     private String subName;
 
-    @Column(name = "overview", nullable = false, length = 1000)
+    @Column(name = "overview", nullable = false, length = MAX_OVERVIEW_LENGTH)
     private String overview;
 
-    @Column(name = "start_date", columnDefinition = "TIMESTAMP")
-    private LocalDateTime startDate;
+    @Column(name = "start_date", columnDefinition = "DATE")
+    @Convert(converter = YearMonthDateAttributeConverter.class)
+    private YearMonth startDate;
 
-    @Column(name = "end_date", columnDefinition = "TIMESTAMP")
-    private LocalDateTime endDate;
+    @Column(name = "end_date", columnDefinition = "DATE")
+    @Convert(converter = YearMonthDateAttributeConverter.class)
+    private YearMonth endDate;
 
     @Column(name = "thumbnail_url", columnDefinition = "TEXT")
     private String thumbnailUrl;
@@ -49,8 +67,8 @@ public class Project extends BaseTimeEntity {
     @Column(name = "github_url", columnDefinition = "TEXT")
     private String githubUrl;
 
-    @Column(name = "owner_id", columnDefinition = "BIGINT")
-    private Long ownerId;
+    @Column(name = "owner_id", columnDefinition = "BIGINT", nullable = false)
+    private Long ownerId; // TODO: User로 설정하는 것이 좋을까요? 놓는다면 [accessToken id 일치 확인 + 유저 존재 확인(추가 발생)] 해야합니다!
 
     @Column(name = "description", nullable = false, columnDefinition = "TEXT")
     private String description;
@@ -68,21 +86,28 @@ public class Project extends BaseTimeEntity {
     private LocalDateTime deletedAt;
 
     @Builder
-    public Project(String name, String subName, String overview, LocalDateTime startDate,
-                   LocalDateTime endDate, Long ownerId,
-        String thumbnailUrl, String deployUrl, String githubUrl, String description,
-        String troubleshooting) {
+    public Project(String name, String subName, String overview, YearMonth startDate, YearMonth endDate, Long ownerId,
+                   String thumbnailUrl, String deployUrl, String githubUrl, String description,
+                   String troubleshooting) {
+        validateConstructorRequiredArguments(name, overview, githubUrl, description, ownerId);
+        validateConstructorOptionArguments(subName, thumbnailUrl, deployUrl, troubleshooting, startDate, endDate);
+
+        // Required
         this.name = name;
-        this.subName = subName;
         this.overview = overview;
+        this.githubUrl = githubUrl;
+        this.description = description;
+        this.ownerId = ownerId;
+
+        // Option
+        this.subName = subName;
         this.startDate = startDate;
         this.endDate = endDate;
-        this.ownerId = ownerId;
         this.thumbnailUrl = thumbnailUrl;
         this.deployUrl = deployUrl;
-        this.githubUrl = githubUrl;
-        this.description = description;
         this.troubleshooting = troubleshooting;
+
+        // Etc
         this.likeCount = 0L;
         this.viewCount = 0L;
     }
@@ -91,4 +116,22 @@ public void increaseViewCount() {
         this.viewCount++;
     }
 
+    private void validateConstructorRequiredArguments(String name, String overview, String githubUrl,
+                                                      String description, Long ownerId) {
+        validateName(name);
+        validateOverview(overview);
+        validateGithubUrl(githubUrl);
+        validateDescription(description);
+        validateOwnerId(ownerId);
+    }
+
+    private void validateConstructorOptionArguments(String subName, String thumbnailUrl, String deployUrl,
+                                                    String troubleshooting, YearMonth startDate, YearMonth endDate) {
+        validateSubName(subName);
+        validateThumbnailUrl(thumbnailUrl);
+        validateDeployUrl(deployUrl);
+        validateTroubleshooting(troubleshooting);
+        validateDuration(startDate, endDate);
+    }
+
 }

src/main/java/sixgaezzang/sidepeek/projects/domain/ProjectSkill.java

@@ -1,5 +1,7 @@
 package sixgaezzang.sidepeek.projects.domain;
 
+import static sixgaezzang.sidepeek.projects.util.ProjectConstant.MAX_CATEGORY_LENGTH;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -13,7 +15,9 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import sixgaezzang.sidepeek.projects.util.validation.ProjectValidator;
 import sixgaezzang.sidepeek.skill.domain.Skill;
+import sixgaezzang.sidepeek.skill.util.validation.SkillValidator;
 
 @Entity
 @Table(name = "project_skill")
@@ -33,14 +37,21 @@ public class ProjectSkill {
     @JoinColumn(name = "skill_id")
     private Skill skill;
 
-    @Column(name = "category", nullable = false, length = 50)
+    @Column(name = "category", nullable = false, length = MAX_CATEGORY_LENGTH)
     private String category;
 
     @Builder
     public ProjectSkill(Project project, Skill skill, String category) {
+        validateConstructorArguments(project, skill, category);
         this.project = project;
         this.skill = skill;
         this.category = category;
     }
 
+    private void validateConstructorArguments(Project project, Skill skill, String category) {
+        ProjectValidator.validateProject(project);
+        SkillValidator.validateSkill(skill);
+        SkillValidator.validateCategory(category);
+    }
+
 }

src/main/java/sixgaezzang/sidepeek/projects/domain/file/File.java

@@ -1,5 +1,6 @@
 package sixgaezzang.sidepeek.projects.domain.file;
 
+import io.jsonwebtoken.lang.Assert;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -15,7 +16,9 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import sixgaezzang.sidepeek.common.util.ValidationUtils;
 import sixgaezzang.sidepeek.projects.domain.Project;
+import sixgaezzang.sidepeek.projects.util.validation.ProjectValidator;
 
 @Entity
 @Table(name = "files")
@@ -40,9 +43,16 @@ public class File {
 
     @Builder
     public File(Project project, FileType type, String url) {
+        validateConstructorArguments(project, type, url);
         this.project = project;
         this.type = type;
         this.url = url;
     }
 
+    private void validateConstructorArguments(Project project, FileType type, String url) {
+        ProjectValidator.validateProject(project);
+        Assert.notNull(type, "type을 입력해주세요.");
+        ValidationUtils.validateURI(url, "프로젝트 레이아웃 이미지 URL 형식이 올바르지 않습니다.");
+    }
+
 }

src/main/java/sixgaezzang/sidepeek/projects/domain/member/Member.java

@@ -1,5 +1,8 @@
 package sixgaezzang.sidepeek.projects.domain.member;
 
+import static sixgaezzang.sidepeek.projects.util.ProjectConstant.MAX_ROLE_LENGTH;
+import static sixgaezzang.sidepeek.users.domain.User.MAX_NICKNAME_LENGTH;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -9,11 +12,14 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import java.util.Objects;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import sixgaezzang.sidepeek.projects.domain.Project;
+import sixgaezzang.sidepeek.projects.util.validation.MemberValidator;
+import sixgaezzang.sidepeek.projects.util.validation.ProjectValidator;
 import sixgaezzang.sidepeek.users.domain.User;
 
 @Entity
@@ -34,18 +40,40 @@ public class Member {
     @JoinColumn(name = "project_id")
     private Project project;
 
-    @Column(name = "role", nullable = false, length = 15)
+    @Column(name = "role", nullable = false, length = MAX_ROLE_LENGTH)
     private String role;
 
-    @Column(name = "nickname", nullable = false, length = 20)
+    @Column(name = "nickname", length = MAX_NICKNAME_LENGTH)
     private String nickname;
 
     @Builder
     public Member(User user, Project project, String role, String nickname) {
-        this.user = user;
+        validateConstructorRequiredArguments(project, role);
+        validateConstructorMemberInfoArguments(user, nickname);
+
+        // Required
         this.project = project;
         this.role = role;
+        this.user = user;
         this.nickname = nickname;
     }
 
+    private void validateConstructorMemberInfoArguments(User user, String nickname) {
+        if (Objects.nonNull(user)) { // 회원인 경우
+            MemberValidator.validateFellowMemberUser(user);
+            return;
+        }
+        if (Objects.nonNull(nickname)) { // 비회원인 경우
+            MemberValidator.validateNonFellowMemberNickname(nickname);
+            return;
+        }
+
+        throw new IllegalArgumentException("회원인 멤버는 유저 Id를, 비회원인 멤버는 닉네임을 입력해주세요.");
+    }
+
+    private void validateConstructorRequiredArguments(Project project, String role) {
+        ProjectValidator.validateProject(project);
+        MemberValidator.validateRole(role);
+    }
+
 }