Skip to content

Commit 29c32ff

Browse files
authored
Merge pull request #381 from JNU-econovation/fix/#380
[BE/fix] 테스트 실패로인한 workflow 실패 해결
2 parents 978c11e + de8df8b commit 29c32ff

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

BE/exceed/src/main/java/com/gaebaljip/exceed/dto/MealRecordDTO.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@
33
import java.time.LocalTime;
44
import java.util.List;
55

6+
import com.fasterxml.jackson.annotation.JsonFormat;
67
import com.gaebaljip.exceed.application.domain.meal.MealType;
78

89
import lombok.Builder;
910

1011
public record MealRecordDTO(
11-
LocalTime time, MealType mealType, String imageUri, List<FoodDTO> foodDTOS) {
12+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm", timezone = "Asia/Seoul")
13+
LocalTime time,
14+
MealType mealType,
15+
String imageUri,
16+
List<FoodDTO> foodDTOS) {
1217

1318
@Builder
1419
public MealRecordDTO {}

BE/exceed/src/test/java/com/gaebaljip/exceed/adapter/in/meal/SpecificMealDTOControllerTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.gaebaljip.exceed.application.port.in.meal.GetSpecificMealQuery;
1616
import com.gaebaljip.exceed.application.port.in.member.GetMaintainMealUsecase;
1717
import com.gaebaljip.exceed.application.port.in.member.GetTargetMealUsecase;
18+
import com.gaebaljip.exceed.application.service.nutritionist.GetAllCalorieAnalysisService;
1819
import com.gaebaljip.exceed.common.ControllerTest;
1920
import com.gaebaljip.exceed.common.WithMockUser;
2021
import com.gaebaljip.exceed.dto.CurrentMealDTO;
@@ -32,6 +33,8 @@ class SpecificMealDTOControllerTest extends ControllerTest {
3233

3334
@MockBean private GetSpecificMealQuery getSpecificMealQuery;
3435

36+
@MockBean private GetAllCalorieAnalysisService getAllCalorieAnalysisService;
37+
3538
@Test
3639
@WithMockUser
3740
void getMealNutrition() throws Exception {

BE/exceed/src/test/java/com/gaebaljip/exceed/integration/meal/GetMealIntegrationTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ void when_getTodayMeal_expected_success() throws Exception {
113113
}
114114

115115
@Test
116-
@DisplayName("성공 : 특정 날짜 식사 조회"
117-
+ "특정 날짜에 방문하지 않았을 경우 isVisited가 false이고, 달성도 다 false로 나와야 한다.")
116+
@DisplayName("성공 : 특정 날짜 식사 조회" + "특정 날짜에 방문하지 않았을 경우 isVisited가 false이고, 달성도 다 false로 나와야 한다.")
118117
@WithMockUser
119118
void when_getSpecificMeal_expected_success() throws Exception {
120119

0 commit comments

Comments
 (0)