[BE/FEAT] : DTO Validation 수정

.github/workflows/testAndDeploy.yml

@@ -1,15 +1,23 @@
 name: testAndDeploy
 
 on:
-  pull_request_review:
-    types: [submitted]
-    branches: [ "be" ]
+  pull_request:
+    types:
+      - closed
+
+permissions: write-all
 
 defaults:
   run:
     working-directory: ./BE/exceed
 
 jobs:
+  if_merged:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          echo The PR was merged
   build:
     runs-on: ubuntu-22.04
     permissions:
@@ -36,6 +44,15 @@ jobs:
       - name: Build with Gradle Wrapper
         run: ./gradlew build
 
+      - name: PR Comment on Jacoco Report
+        id: jacoco
+        uses: madrapps/jacoco-report@v1.2
+        with:
+          title: 테스트 커버리지 리포트입니다
+          paths: ${{ github.workspace }}/backend/build/reports/jacoco/test/jacocoTestReport.xml
+          token: ${{ secrets.GITHUB_TOKEN }}
+          min-coverage-overall: 30
+
       - name: Send docker-compose.yml
         uses: appleboy/scp-action@master
         with:

BE/exceed/build.gradle

@@ -12,6 +12,7 @@ plugins {
 	id "org.asciidoctor.jvm.convert" version "3.3.2"
 	id "me.champeau.jmh" version "0.7.2"
 	id 'com.diffplug.spotless' version '6.23.3'
+	id 'jacoco'
 }
 
 group = 'com.gaebaljip'
@@ -50,13 +51,15 @@ dependencies {
 	// lombok
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
-	testCompileOnly 'org.projectlombok:lombok'
-	testAnnotationProcessor 'org.projectlombok:lombok'
 
 	//test
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
-	testRuntimeOnly 'com.h2database:h2'
+	testImplementation "org.testcontainers:mariadb:1.19.8"
+	testImplementation "org.testcontainers:testcontainers:1.19.8"
+	testImplementation "org.testcontainers:junit-jupiter:1.19.8"
+	testImplementation "org.junit.jupiter:junit-jupiter:5.8.1"
+
 
 	// querydsl
 	implementation 'com.querydsl:querydsl-jpa'
@@ -190,4 +193,20 @@ spotless {
 		// 파일 끝에 새로운 라인 추가
 		endWithNewline()
 	}
+}
+
+test {
+	finalizedBy jacocoTestReport
+}
+
+jacoco {
+	toolVersion = "0.8.8" // 버전 명시
+}
+
+jacocoTestReport {
+	dependsOn test // 리포트 생성 전에 test를 반드시 수행해야 한다!
+	reports { // 어떤 파일들을 생성할지, 어디에 생성할지 설정
+		xml.required = true // xml과 html형식으로 결과물을 만들어내라!
+		html.required = true
+	}
 }

BE/exceed/docker-compose.yml

@@ -48,12 +48,12 @@ services:
     networks:
       - gaebaljip-network
     restart:
-      on-failure
+      no
 
   grafana:
     image: grafana/grafana:latest
     container_name: grafana
-    restart: always
+    restart: no
     ports:
       - "3000:3000"
     volumes:
@@ -70,7 +70,7 @@ services:
   prometheus:
     image: prom/prometheus:latest
     container_name: prometheus
-    restart: always
+    restart: no
     ports:
       - "9090:9090"
     volumes:

BE/exceed/resources/gaebaljip-local-environment/setting.yml

@@ -36,7 +36,7 @@ services:
     image: grafana/grafana:latest
     container_name: grafana
     user: "$UID:$GID"
-    restart: always
+    restart: no
     ports:
       - "3000:3000"
     volumes:
@@ -51,7 +51,7 @@ services:
   prometheus:
     image: prom/prometheus:latest
     container_name: prometheus
-    restart: always
+    restart: no
     ports:
       - "9090:9090"
     volumes:

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이상 입력해 주세요";
 }

BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/CheckMemberRequest.java

@@ -2,9 +2,11 @@
 
 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 {}
 }

BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/CreateFoodRequest.java

@@ -1,17 +1,22 @@
 package com.gaebaljip.exceed.dto.request;
 
+import com.gaebaljip.exceed.common.ValidationMessage;
 import lombok.Builder;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 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 {}
 }

BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/GetAnalysisRequest.java

@@ -1,5 +1,9 @@
 package com.gaebaljip.exceed.dto.request;
 
+import com.gaebaljip.exceed.common.ValidationMessage;
+
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
-public record GetAnalysisRequest(Long memberId, LocalDateTime date) {}
+public record GetAnalysisRequest(@NotNull(message = "memberId을" + ValidationMessage.NOT_NULL) Long memberId,
+                                 @NotNull(message = "날짜를 " + ValidationMessage.NOT_NULL) LocalDateTime date) {}

BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/MonthlyMeal.java

@@ -1,5 +1,9 @@
 package com.gaebaljip.exceed.dto.request;
 
+import com.gaebaljip.exceed.common.ValidationMessage;
+
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
-public record MonthlyMeal(Long memberId, LocalDateTime date) {}
+public record MonthlyMeal(@NotNull(message = "memberId을 " + ValidationMessage.NOT_NULL) Long memberId,
+                          @NotNull(message = "날짜를 " + ValidationMessage.NOT_NULL) LocalDateTime date) {}

BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/OnBoardingMemberRequest.java

@@ -1,17 +1,21 @@
 package com.gaebaljip.exceed.dto.request;
 
+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;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
 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) {
 

BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/TodayMeal.java

@@ -2,9 +2,13 @@
 
 import java.time.LocalDateTime;
 
+import com.gaebaljip.exceed.common.ValidationMessage;
 import lombok.Builder;
 
-public record TodayMeal(Long memberId, LocalDateTime date) {
+import javax.validation.constraints.NotNull;
+
+public record TodayMeal(@NotNull(message = "memberId을 " + ValidationMessage.NOT_NULL) Long memberId,
+                        @NotNull(message = "날짜를 " + ValidationMessage.NOT_NULL) LocalDateTime date) {
 
     @Builder
     public TodayMeal {}

BE/exceed/src/main/java/com/gaebaljip/exceed/dto/request/UpdateMemberRequest.java

@@ -1,15 +1,17 @@
 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) {}

BE/exceed/src/main/java/com/gaebaljip/exceed/food/adapter/out/FoodRepository.java

@@ -7,11 +7,10 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.gaebaljip.exceed.food.domain.Food;
 import com.gaebaljip.exceed.member.adapter.out.persistence.MemberEntity;
 
 public interface FoodRepository extends JpaRepository<FoodEntity, Long> {
-    List<Food> findByMemberEntityId(Long memberId);
+    List<FoodEntity> findByMemberEntityId(Long memberId);
 
     @Query("delete from FoodEntity f where f.id in :ids")
     @Modifying

BE/exceed/src/main/java/com/gaebaljip/exceed/food/adapter/out/FoodsPersistenceAdapter.java

@@ -54,7 +54,7 @@ public void saveAll(List<FoodEntity> foodEntities) {
     }
 
     @Override
-    public List<Food> findByMemberId(Long memberId) {
+    public List<FoodEntity> findByMemberId(Long memberId) {
         return foodRepository.findByMemberEntityId(memberId);
     }
 

BE/exceed/src/main/java/com/gaebaljip/exceed/food/application/port/out/FoodPort.java

@@ -23,7 +23,7 @@ public interface FoodPort {
 
     void saveAll(List<FoodEntity> foodEntities);
 
-    List<Food> findByMemberId(Long memberId);
+    List<FoodEntity> findByMemberId(Long memberId);
 
     void deleteByAllByIdInQuery(List<Long> ids);
 

BE/exceed/src/main/resources/application-local.yml

@@ -81,7 +81,7 @@ logging:
       hibernate:
         type:
           descriptor:
-            sql: trace
+            sql: info
 org:
   quartz:
     scheduler:

BE/exceed/src/main/resources/application-test.yml

@@ -1,24 +1,18 @@
 spring:
   datasource:
-    url: jdbc:h2:mem:exceed;MODE=MariaDB
-    driver-class-name: org.h2.Driver
-    username: exceed
-    password: exceed
-  redis:
-    host: localhost
-    port: 6379
-  h2:
-    console:
-      enabled: true
-      path: /h2-console
+    driver-class-name: org.testcontainers.jdbc.ContainerDatabaseDriver
+    url: jdbc:tc:mariadb:10.6:///test
   jpa:
     hibernate:
+      naming:
+        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+      dialect: org.hibernate.dialect.MariaDBDialect
       ddl-auto: create-drop
     properties:
       hibernate:
-        show_sql : true
-        format_sql : true
-    defer-datasource-initialization: true
+        show_sql: true
+        format_sql: true
+        use_sql_comments: true
 cloud:
   aws:
     credentials:
@@ -59,4 +53,4 @@ logging:
       hibernate:
         type:
           descriptor:
-            sql: trace
+            sql: info