Merge pull request #333 from JNU-econovation/feat/#331

[BE/FEAT] : DTO Validation 수정
JNU-econovation · Jul 1, 2024 · 56fe39d · 56fe39d
2 parents d29d90b + 747e5da
commit 56fe39d
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 21 deletions.
diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/common/ValidationMessage.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/common/ValidationMessage.java
@@ -6,4 +6,8 @@ public class ValidationMessage {
 
     public static final String INVALID_PASSWORD =
             "비밀번호 형식이 올바르지 않습니다. 비밀번호는 최소 6글자 이상이며, 영어와 특수문자를 포함해야 합니다.";
+
+    public static final String NOT_NULL = "입력해 주세요";
+    public static final String NOT_BLANK = "입력해 주세요";
+    public static final String MIN_0 = "0이상 입력해 주세요";
 }
diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/CheckMemberRequest.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/CheckMemberRequest.java
@@ -2,9 +2,13 @@
 
 import javax.validation.constraints.NotNull;
 
+import com.gaebaljip.exceed.common.ValidationMessage;
+
 import lombok.Builder;
 
-public record CheckMemberRequest(@NotNull String email, @NotNull String code) {
+public record CheckMemberRequest(
+        @NotNull(message = "이메일을 " + ValidationMessage.NOT_NULL) String email,
+        @NotNull(message = "코드를 " + ValidationMessage.NOT_NULL) String code) {
     @Builder
     public CheckMemberRequest {}
 }
diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/CreateFoodRequest.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/CreateFoodRequest.java
@@ -1,17 +1,39 @@
 package com.gaebaljip.exceed.dto.request;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.gaebaljip.exceed.common.ValidationMessage;
+
 import lombok.Builder;
 
 public record CreateFoodRequest(
-        String name,
-        Double sugars,
-        Double dietaryFiber,
-        Double sodium,
-        Double calorie,
-        Double carbohydrate,
-        Double protein,
-        Double fat,
-        Double servingSize) {
+        @NotBlank(message = "이름을 " + ValidationMessage.NOT_BLANK) String name,
+        @NotNull(message = "당을 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "당은" + ValidationMessage.MIN_0)
+                Double sugars,
+        @NotNull(message = "식이섬유를 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "식이섬유는 " + ValidationMessage.MIN_0)
+                Double dietaryFiber,
+        @NotNull(message = "나트륨을 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "나트륨은 " + ValidationMessage.MIN_0)
+                Double sodium,
+        @NotNull(message = "칼로리를 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "칼로리는 " + ValidationMessage.MIN_0)
+                Double calorie,
+        @NotNull(message = "탄수화물을 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "탄수화물은 " + ValidationMessage.MIN_0)
+                Double carbohydrate,
+        @NotNull(message = "단백질을 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "단백질은 " + ValidationMessage.MIN_0)
+                Double protein,
+        @NotNull(message = "지방을 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "지방은 " + ValidationMessage.MIN_0)
+                Double fat,
+        @NotNull(message = "1회 제공량을 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "1회 제공량은 " + ValidationMessage.MIN_0)
+                Double servingSize) {
     @Builder
     public CreateFoodRequest {}
 }
diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/GetAnalysisRequest.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/GetAnalysisRequest.java
@@ -2,4 +2,10 @@
 
 import java.time.LocalDateTime;
 
-public record GetAnalysisRequest(Long memberId, LocalDateTime date) {}
+import javax.validation.constraints.NotNull;
+
+import com.gaebaljip.exceed.common.ValidationMessage;
+
+public record GetAnalysisRequest(
+        @NotNull(message = "memberId을" + ValidationMessage.NOT_NULL) Long memberId,
+        @NotNull(message = "날짜를 " + ValidationMessage.NOT_NULL) LocalDateTime date) {}
diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/MonthlyMeal.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/MonthlyMeal.java
@@ -2,4 +2,10 @@
 
 import java.time.LocalDateTime;
 
-public record MonthlyMeal(Long memberId, LocalDateTime date) {}
+import javax.validation.constraints.NotNull;
+
+import com.gaebaljip.exceed.common.ValidationMessage;
+
+public record MonthlyMeal(
+        @NotNull(message = "memberId을 " + ValidationMessage.NOT_NULL) Long memberId,
+        @NotNull(message = "날짜를 " + ValidationMessage.NOT_NULL) LocalDateTime date) {}
diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/OnBoardingMemberRequest.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/OnBoardingMemberRequest.java
@@ -1,17 +1,29 @@
 package com.gaebaljip.exceed.dto.request;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import com.gaebaljip.exceed.common.ValidationMessage;
 import com.gaebaljip.exceed.common.annotation.Enum;
 import com.gaebaljip.exceed.member.domain.Activity;
 import com.gaebaljip.exceed.member.domain.Gender;
 
 import lombok.Builder;
 
 public record OnBoardingMemberRequest(
-        Double height,
+        @NotNull(message = "키를 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "키는 " + ValidationMessage.MIN_0)
+                Double height,
         @Enum(enumClass = Gender.class) String gender,
-        Double weight,
-        Double targetWeight,
-        Integer age,
+        @NotNull(message = "몸무게를 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "몸무게는 " + ValidationMessage.MIN_0)
+                Double weight,
+        @NotNull(message = "목표 몸무게를 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "목표 몸무게는 " + ValidationMessage.MIN_0)
+                Double targetWeight,
+        @NotNull(message = "나이를 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "나이는 " + ValidationMessage.MIN_0)
+                Integer age,
         @Enum(enumClass = Activity.class) String activity,
         String etc) {
 

diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/TodayMeal.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/TodayMeal.java
@@ -2,9 +2,15 @@
 
 import java.time.LocalDateTime;
 
+import javax.validation.constraints.NotNull;
+
+import com.gaebaljip.exceed.common.ValidationMessage;
+
 import lombok.Builder;
 
-public record TodayMeal(Long memberId, LocalDateTime date) {
+public record TodayMeal(
+        @NotNull(message = "memberId을 " + ValidationMessage.NOT_NULL) Long memberId,
+        @NotNull(message = "날짜를 " + ValidationMessage.NOT_NULL) LocalDateTime date) {
 
     @Builder
     public TodayMeal {}

diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/UpdateMemberRequest.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/UpdateMemberRequest.java
@@ -1,15 +1,21 @@
 package com.gaebaljip.exceed.dto.request;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
+import com.gaebaljip.exceed.common.ValidationMessage;
 import com.gaebaljip.exceed.common.annotation.Enum;
 import com.gaebaljip.exceed.member.domain.Activity;
 import com.gaebaljip.exceed.member.domain.Gender;
 
 public record UpdateMemberRequest(
-        @NotBlank(message = "memberId must not be null") Long memberId,
-        @NotBlank(message = "memberId must not be null") Double height,
+        @NotNull(message = "키를 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "키는 " + ValidationMessage.MIN_0)
+                Double height,
         @Enum(enumClass = Gender.class) String gender,
-        @NotBlank(message = "memberId must not be null") Integer age,
+        @NotNull(message = "나이를 " + ValidationMessage.NOT_NULL)
+                @Min(value = 0, message = "나이는 " + ValidationMessage.MIN_0)
+                Integer age,
         @Enum(enumClass = Activity.class) String activity,
-        @NotBlank(message = "memberId must not be null") String etc) {}
+        @NotBlank(message = "기타사항을 " + ValidationMessage.NOT_BLANK) String etc) {}