Merge pull request #134 from kookmin-sw/backend/develop/v3

Backend/develop/v3
kookmin-sw · May 7, 2024 · b6ea698 · b6ea698
2 parents c8f339c + f8d5715
commit b6ea698
Show file tree

Hide file tree

Showing 2 changed files with 632 additions and 127 deletions.
diff --git a/...t/moment-server/core/src/test/java/com/moment/core/controller/TripFileControllerTest.java b/...t/moment-server/core/src/test/java/com/moment/core/controller/TripFileControllerTest.java
@@ -62,20 +62,23 @@ void getTripFiles() throws Exception {
                         .email("test")
                         .yearDate(LocalDate.now())
                         .analyzingCount(1)
+                        .totalCount(1)
                         .build(),
                 TripFileResponseDTO.GetTripFile.builder()
                         .id(2L)
                         .tripId(2L)
                         .email("test")
                         .yearDate(LocalDate.now().plusDays(1))
                         .analyzingCount(2)
+                        .totalCount(1)
                         .build(),
                 TripFileResponseDTO.GetTripFile.builder()
                         .id(3L)
                         .tripId(3L)
                         .email("test")
                         .yearDate(LocalDate.now().plusDays(2))
                         .analyzingCount(1)
+                        .totalCount(1)
                         .build()
         );
         TripFileResponseDTO.GetAllTripFile allTripFile = TripFileResponseDTO.GetAllTripFile.builder()
@@ -108,7 +111,8 @@ void getTripFiles() throws Exception {
                                 fieldWithPath("data.tripFiles[].tripId").type(JsonFieldType.NUMBER).description("여행 ID"),
                                 fieldWithPath("data.tripFiles[].email").type(JsonFieldType.STRING).description("유저 email"),
                                 fieldWithPath("data.tripFiles[].yearDate").type(JsonFieldType.STRING).attributes(getDateFormat()).description("연월일"),
-                                fieldWithPath("data.tripFiles[].analyzingCount").type(JsonFieldType.NUMBER).description("분석 중 파일 개수")
+                                fieldWithPath("data.tripFiles[].analyzingCount").type(JsonFieldType.NUMBER).description("분석 중 파일 개수"),
+                                fieldWithPath("data.tripFiles[].totalCount").type(JsonFieldType.NUMBER).description("전체 파일 개수")
                                 )
                         )
                 )
@@ -124,20 +128,23 @@ void getUntitledTripFiles() throws Exception {
                         .email("test")
                         .yearDate(LocalDate.now())
                         .analyzingCount(1)
+                        .totalCount(1)
                         .build(),
                 TripFileResponseDTO.GetTripFile.builder()
                         .id(2L)
                         .tripId(2L)
                         .email("test")
                         .yearDate(LocalDate.now().plusDays(1))
                         .analyzingCount(2)
+                        .totalCount(1)
                         .build(),
                 TripFileResponseDTO.GetTripFile.builder()
                         .id(3L)
                         .tripId(3L)
                         .email("test")
                         .yearDate(LocalDate.now().plusDays(2))
                         .analyzingCount(1)
+                        .totalCount(1)
                         .build()
         );
         TripFileResponseDTO.GetAllTripFile allTripFile = TripFileResponseDTO.GetAllTripFile.builder()
@@ -166,7 +173,8 @@ void getUntitledTripFiles() throws Exception {
                                 fieldWithPath("data.tripFiles[].tripId").type(JsonFieldType.NUMBER).description("여행 ID"),
                                 fieldWithPath("data.tripFiles[].email").type(JsonFieldType.STRING).description("유저 email"),
                                 fieldWithPath("data.tripFiles[].yearDate").type(JsonFieldType.STRING).attributes(getDateFormat()).description("연월일"),
-                                fieldWithPath("data.tripFiles[].analyzingCount").type(JsonFieldType.NUMBER).description("분석 중 파일 개수")
+                                fieldWithPath("data.tripFiles[].analyzingCount").type(JsonFieldType.NUMBER).description("분석 중 파일 개수"),
+                                fieldWithPath("data.tripFiles[].totalCount").type(JsonFieldType.NUMBER).description("전체 파일 개수")
                                 )
                         )
                 )