From 258d3f70baea1b48816a01c689cdf6459956bf3d Mon Sep 17 00:00:00 2001 From: rlarltj123 Date: Mon, 29 Jul 2024 23:59:25 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20University=20=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EB=A5=BC=20nullable=ED=95=98=EA=B2=8C=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/request/CreateUserUniversityRequest.java | 10 ++-------- .../user/api/response/UserUniversityResponse.java | 4 ++-- .../moneymong/domain/user/entity/UserUniversity.java | 12 +++--------- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/moneymong/domain/user/api/request/CreateUserUniversityRequest.java b/src/main/java/com/moneymong/domain/user/api/request/CreateUserUniversityRequest.java index 53e9128..34eefaa 100644 --- a/src/main/java/com/moneymong/domain/user/api/request/CreateUserUniversityRequest.java +++ b/src/main/java/com/moneymong/domain/user/api/request/CreateUserUniversityRequest.java @@ -1,8 +1,5 @@ package com.moneymong.domain.user.api.request; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -11,10 +8,7 @@ @NoArgsConstructor @AllArgsConstructor public class CreateUserUniversityRequest { - @NotBlank - private String universityName; - @Min(value = 1) - @Max(value = 5) - private int grade; + private String universityName; + private Integer grade; } diff --git a/src/main/java/com/moneymong/domain/user/api/response/UserUniversityResponse.java b/src/main/java/com/moneymong/domain/user/api/response/UserUniversityResponse.java index 5278d5f..04f06aa 100644 --- a/src/main/java/com/moneymong/domain/user/api/response/UserUniversityResponse.java +++ b/src/main/java/com/moneymong/domain/user/api/response/UserUniversityResponse.java @@ -9,9 +9,9 @@ @AllArgsConstructor public class UserUniversityResponse { private String universityName; - private int grade; + private Integer grade; - public static UserUniversityResponse of(String universityName, int grade) { + public static UserUniversityResponse of(String universityName, Integer grade) { return UserUniversityResponse.builder() .universityName(universityName) .grade(grade) diff --git a/src/main/java/com/moneymong/domain/user/entity/UserUniversity.java b/src/main/java/com/moneymong/domain/user/entity/UserUniversity.java index 83153ff..c71e49c 100644 --- a/src/main/java/com/moneymong/domain/user/entity/UserUniversity.java +++ b/src/main/java/com/moneymong/domain/user/entity/UserUniversity.java @@ -11,7 +11,6 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.springframework.util.Assert; import static lombok.AccessLevel.PROTECTED; @@ -36,24 +35,19 @@ public class UserUniversity extends TimeBaseEntity { @Column( name = "university_name", - length = 100, - nullable = false + length = 100 ) private String universityName; - @Column(nullable = false) - private int grade; + @Column + private Integer grade; public void update(String universityName, int grade) { - Assert.hasText(universityName, "대학 이름은 필수 입력값입니다."); - this.universityName = universityName; this.grade = grade; } public static UserUniversity of(Long userId, String universityName, int grade) { - Assert.hasText(universityName, "대학 이름은 필수 입력값입니다."); - return UserUniversity.builder() .userId(userId) .universityName(universityName)