✅ test: 기준 영양섭취량 추가로 인한 테스트 코드 수정 및 검증 완료 (#60)

CAUSOLDOUTMEN · Nov 8, 2023 · 38bd92f · 38bd92f
1 parent c91a645
commit 38bd92f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/com/diareat/diareat/food/service/FoodService.java b/src/main/java/com/diareat/diareat/food/service/FoodService.java
@@ -368,7 +368,9 @@ private ResponseNutritionSumByDateDto calculateNutritionSumAndRatio(Long userId,
         double ratioProtein = Math.round((((double) totalProtein / (double) targetUser.getBaseNutrition().getProtein()) * 100.0) * 10.0) / 10.0;
         double ratioFat = Math.round((((double) totalFat / (double) targetUser.getBaseNutrition().getFat()) * 100.0) * 10.0) / 10.0;
 
-        return ResponseNutritionSumByDateDto.of(userId, checkDate, nutritionSumType, totalKcal, totalCarbohydrate, totalProtein, totalFat, ratioKcal, ratioCarbohydrate, ratioProtein, ratioFat);
+        return ResponseNutritionSumByDateDto.of(userId, checkDate, nutritionSumType, totalKcal,
+                                                totalCarbohydrate, totalProtein, totalFat, ratioKcal,
+                                                ratioCarbohydrate, ratioProtein, ratioFat, targetUser.getBaseNutrition());
     }
 
     private void validateUser(Long userId) {

diff --git a/src/test/java/com/diareat/diareat/controller/FoodControllerTest.java b/src/test/java/com/diareat/diareat/controller/FoodControllerTest.java
@@ -254,7 +254,8 @@ void testGetNutritionSumByDate() throws Exception{
         //Given
         LocalDate date = LocalDate.now();
         ResponseNutritionSumByDateDto responseNutritionSumByDateDto = ResponseNutritionSumByDateDto.of(testUserId,date,1
-                ,500,100,50,50,0.2,0.3,0.4,0.5);
+                ,500,100,50,50,0.2,0.3,0.4,0.5,
+                BaseNutrition.createNutrition(500,100,50,50));
         ApiResponse<ResponseNutritionSumByDateDto> expectedResponse = ApiResponse.success(responseNutritionSumByDateDto,ResponseCode.FOOD_READ_SUCCESS.getMessage());
         when(foodService.getNutritionSumByDate(any(Long.class),any(LocalDate.class))).thenReturn(responseNutritionSumByDateDto);
 
@@ -279,6 +280,7 @@ void testGetNutritionSumByDate() throws Exception{
                 .andExpect(MockMvcResultMatchers.jsonPath("$.data.ratioCarbohydrate").value(expectedResponse.getData().getRatioCarbohydrate()))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.data.ratioProtein").value(expectedResponse.getData().getRatioProtein()))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.data.ratioFat").value(expectedResponse.getData().getRatioFat()))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.data.baseNutrition.carbohydrate").value(expectedResponse.getData().getBaseNutrition().getCarbohydrate()))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.msg").value(expectedResponse.getMsg()));
     }
 
@@ -290,7 +292,8 @@ void testGetNutritionSumByWeek() throws Exception {
         //Given
         LocalDate date = LocalDate.now();
         ResponseNutritionSumByDateDto responseNutritionSumByDateDto = ResponseNutritionSumByDateDto.of(testUserId, date, 7
-                , 500, 100, 50, 50, 0.2, 0.3, 0.4, 0.5);
+                , 500, 100, 50, 50, 0.2, 0.3, 0.4, 0.5,
+                BaseNutrition.createNutrition(500, 100, 50, 50));
         ApiResponse<ResponseNutritionSumByDateDto> expectedResponse = ApiResponse.success(responseNutritionSumByDateDto, ResponseCode.FOOD_READ_SUCCESS.getMessage());
         when(foodService.getNutritionSumByWeek(any(Long.class))).thenReturn(responseNutritionSumByDateDto);
 
@@ -312,6 +315,7 @@ void testGetNutritionSumByWeek() throws Exception {
                 .andExpect(MockMvcResultMatchers.jsonPath("$.data.ratioCarbohydrate").value(expectedResponse.getData().getRatioCarbohydrate()))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.data.ratioProtein").value(expectedResponse.getData().getRatioProtein()))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.data.ratioFat").value(expectedResponse.getData().getRatioFat()))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.data.baseNutrition.carbohydrate").value(expectedResponse.getData().getBaseNutrition().getCarbohydrate()))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.msg").value(expectedResponse.getMsg()));
     }
 
@@ -323,7 +327,8 @@ void testGetNutritionSumByMonth() throws Exception {
         //Given
         LocalDate date = LocalDate.now();
         ResponseNutritionSumByDateDto responseNutritionSumByDateDto = ResponseNutritionSumByDateDto.of(testUserId, date, 30
-                , 500, 100, 50, 50, 0.2, 0.3, 0.4, 0.5);
+                , 500, 100, 50, 50, 0.2, 0.3, 0.4, 0.5,
+                BaseNutrition.createNutrition(500, 100, 50, 50));
         ApiResponse<ResponseNutritionSumByDateDto> expectedResponse = ApiResponse.success(responseNutritionSumByDateDto, ResponseCode.FOOD_READ_SUCCESS.getMessage());
         when(foodService.getNutritionSumByMonth(any(Long.class))).thenReturn(responseNutritionSumByDateDto);
 
@@ -345,6 +350,7 @@ void testGetNutritionSumByMonth() throws Exception {
                 .andExpect(MockMvcResultMatchers.jsonPath("$.data.ratioCarbohydrate").value(expectedResponse.getData().getRatioCarbohydrate()))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.data.ratioProtein").value(expectedResponse.getData().getRatioProtein()))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.data.ratioFat").value(expectedResponse.getData().getRatioFat()))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.data.baseNutrition.carbohydrate").value(expectedResponse.getData().getBaseNutrition().getCarbohydrate()))
                 .andExpect(MockMvcResultMatchers.jsonPath("$.msg").value(expectedResponse.getMsg()));
     }