[새기능] 원서에 페이지네이션 적용

src/main/java/com/bamdoliro/maru/application/form/QueryAllFormUseCase.java

@@ -5,6 +5,7 @@
 import com.bamdoliro.maru.domain.form.domain.type.FormType;
 import com.bamdoliro.maru.infrastructure.persistence.form.FormRepository;
 import com.bamdoliro.maru.presentation.form.dto.response.FormSimpleResponse;
+import com.bamdoliro.maru.presentation.form.dto.response.PageResult;
 import com.bamdoliro.maru.shared.annotation.UseCase;
 import lombok.RequiredArgsConstructor;
 
@@ -41,4 +42,26 @@ public List<FormSimpleResponse> execute(FormStatus status, FormType type, String
                 .map(FormSimpleResponse::new)
                 .toList();
     }
+
+    public PageResult<FormSimpleResponse> execute(FormStatus status, FormType type, String sort, Integer page, Integer size) {
+        List<FormSimpleResponse> allForms = this.execute(status, type, sort);
+        long totalCount = allForms.size();
+
+        if (page == null && size == null) {
+            return new PageResult<>(allForms, totalCount, 1);
+        }
+
+        int validPage = (page != null) ? page : 1;
+        int validSize = (size != null) ? size : 10;
+
+        long totalPages = (long) Math.ceil((double) totalCount / validSize);
+        int skip = (validPage - 1) * validSize;
+
+        List<FormSimpleResponse> pagedData = allForms.stream()
+                .skip(skip)
+                .limit(validSize)
+                .toList();
+
+        return new PageResult<>(pagedData, totalCount, totalPages);
+    }
 }

src/main/java/com/bamdoliro/maru/presentation/form/AdminFormController.java

@@ -8,6 +8,7 @@
 import com.bamdoliro.maru.presentation.form.dto.response.AdmissionAndPledgeUrlResponse;
 import com.bamdoliro.maru.presentation.form.dto.response.FormSimpleResponse;
 import com.bamdoliro.maru.presentation.form.dto.response.FormUrlResponse;
+import com.bamdoliro.maru.presentation.form.dto.response.PageResult;
 import com.bamdoliro.maru.shared.auth.AuthenticationPrincipal;
 import com.bamdoliro.maru.shared.auth.Authority;
 import com.bamdoliro.maru.shared.response.CommonResponse;
@@ -87,15 +88,18 @@
     }
 
     @GetMapping
-    public ListCommonResponse<FormSimpleResponse> getFormList(
+    public ResponseEntity<PageResult> getFormList(
             @AuthenticationPrincipal(authority = Authority.ADMIN) User user,
             @RequestParam(name = "status", required = false) FormStatus status,
             @RequestParam(name = "type", required = false) FormType type,
-            @RequestParam(name = "sort", required = false) String sort
+            @RequestParam(name = "sort", required = false) String sort,
+            @RequestParam(name = "page", required = false) Integer page,
+            @RequestParam(name = "size", required = false) Integer size
     ) {
-        return ListCommonResponse.ok(
-                queryAllFormUseCase.execute(status, type, sort)
-        );
+        PageResult<FormSimpleResponse> result = queryAllFormUseCase.execute(status, type, sort, page, size);
+
+        return ResponseEntity.ok()
+                .body(result);
     }
 
     @GetMapping("/admission-tickets")

src/main/java/com/bamdoliro/maru/presentation/form/dto/response/PageResult.java

@@ -0,0 +1,14 @@
+package com.bamdoliro.maru.presentation.form.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+@AllArgsConstructor
+public class PageResult<T> {
+    List<T> data;
+    long totalCount;
+    long totalPages;
+}

src/test/java/com/bamdoliro/maru/application/form/QueryAllFormUseCaseTest.java

@@ -4,6 +4,7 @@
 import com.bamdoliro.maru.domain.form.domain.type.FormType;
 import com.bamdoliro.maru.infrastructure.persistence.form.FormRepository;
 import com.bamdoliro.maru.presentation.form.dto.response.FormSimpleResponse;
+import com.bamdoliro.maru.presentation.form.dto.response.PageResult;
 import com.bamdoliro.maru.shared.fixture.FormFixture;
 import com.bamdoliro.maru.shared.util.RandomUtil;
 import org.junit.jupiter.api.Test;
@@ -53,6 +54,31 @@ class QueryAllFormUseCaseTest {
         verify(formRepository, times(1)).findByStatus(null);
     }
 
+    @Test
+    void 일부_원서만_조회한다() {
+        // given
+        List<Form> formList = List.of(
+                FormFixture.createForm(FormType.REGULAR),
+                FormFixture.createForm(FormType.SPECIAL_ADMISSION),
+                FormFixture.createForm(FormType.MEISTER_TALENT),
+                FormFixture.createForm(FormType.MULTI_CHILDREN)
+        );
+
+        formList.forEach(form -> form.assignExaminationNumber(1001L));
+
+        given(formRepository.findByStatus(null)).willReturn(formList);
+
+        // when
+        PageResult<FormSimpleResponse> returnedFormList = queryAllFormUseCase.execute(null, null,null, 1, 2);
+
+        // then
+        assertEquals(2, returnedFormList.getTotalPages());
+        assertEquals(2, returnedFormList.getData().size());
+        assertEquals(FormType.REGULAR, returnedFormList.getData().get(0).getType());
+
+        verify(formRepository, times(1)).findByStatus(null);
+    }
+
     @Test
     void 특별전형_원서만_조회한다() {
         // given

src/test/java/com/bamdoliro/maru/presentation/form/AdminFormControllerTest.java

@@ -9,6 +9,7 @@
 import com.bamdoliro.maru.domain.user.domain.User;
 import com.bamdoliro.maru.presentation.form.dto.request.PassOrFailFormListRequest;
 import com.bamdoliro.maru.presentation.form.dto.request.PassOrFailFormRequest;
+import com.bamdoliro.maru.presentation.form.dto.response.PageResult;
 import com.bamdoliro.maru.shared.fixture.AuthFixture;
 import com.bamdoliro.maru.shared.fixture.FormFixture;
 import com.bamdoliro.maru.shared.fixture.UserFixture;
@@ -28,10 +29,9 @@
 import static org.springframework.restdocs.cookies.CookieDocumentation.cookieWithName;
 import static org.springframework.restdocs.cookies.CookieDocumentation.requestCookies;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*;
-import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
-import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
+import static org.springframework.restdocs.payload.PayloadDocumentation.*;
 import static org.springframework.restdocs.request.RequestDocumentation.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
 class AdminFormControllerTest extends RestDocsTestSupport {
 
@@ -217,13 +217,16 @@ class AdminFormControllerTest extends RestDocsTestSupport {
 
         given(authenticationArgumentResolver.supportsParameter(any(MethodParameter.class))).willReturn(true);
         given(authenticationArgumentResolver.resolveArgument(any(), any(), any(), any())).willReturn(user);
-        given(queryAllFormUseCase.execute(FormStatus.SUBMITTED, FormType.REGULAR, null)).willReturn(List.of(
-                FormFixture.createFormSimpleResponse(FormStatus.SUBMITTED),
-                FormFixture.createFormSimpleResponse(FormStatus.SUBMITTED),
-                FormFixture.createFormSimpleResponse(FormStatus.SUBMITTED),
-                FormFixture.createFormSimpleResponse(FormStatus.SUBMITTED),
-                FormFixture.createFormSimpleResponse(FormStatus.SUBMITTED)
-        ));
+
+        given(queryAllFormUseCase.execute(FormStatus.SUBMITTED, FormType.REGULAR, null, 1, 2))
+                .willReturn(new PageResult<>(
+                        List.of(
+                                FormFixture.createFormSimpleResponse(FormStatus.SUBMITTED),
+                                FormFixture.createFormSimpleResponse(FormStatus.SUBMITTED)
+                        ),
+                        5L,
+                        3L
+                ));
 
         mockMvc.perform(get("/admin/forms")
                         .param("status", FormStatus.SUBMITTED.name())
@@ -232,19 +235,65 @@ class AdminFormControllerTest extends RestDocsTestSupport {
                         .accept(MediaType.APPLICATION_JSON)
                 )
                 .andExpect(status().isOk())
+                .andExpect(jsonPath("$.data").isArray())
+                .andExpect(jsonPath("$.data.length()").value(2))
                 .andDo(restDocs.document(
                         requestCookies(
-                                cookieWithName("accessToken")
-                                        .description("이것은.액세스.토큰")
+                                cookieWithName("accessToken").description("이것은.액세스.토큰")
+                        ),
+                        queryParameters(
+                                parameterWithName("status").description("<<원서 상태 (null인 경우 전체 조회)>>").optional(),
+                                parameterWithName("type").description("<<원서 카테고리 (null인 경우 전체 조회)>>").optional(),
+                                parameterWithName("sort").description("정렬 기준").optional(),
+                                parameterWithName("page").description("조회할 페이지 번호 (size, page둘다 null인 경우 전체 조회, size가 null 아니라면 1)").optional(),
+                                parameterWithName("size").description("페이지당 데이터 개수 (size, page둘다 null인 경우 전체 조회, page가 null 아니라면 10)").optional()
+                        )
+                ));
+
+        verify(queryAllFormUseCase, times(1)).execute(FormStatus.SUBMITTED, FormType.REGULAR, null, 1, 2);
+    }
+    @Test
+    void 원서를_일부만_조회한다() throws Exception {
+        User user = UserFixture.createAdminUser();
+
+        given(authenticationArgumentResolver.supportsParameter(any(MethodParameter.class))).willReturn(true);
+        given(authenticationArgumentResolver.resolveArgument(any(), any(), any(), any())).willReturn(user);
+
+        given(queryAllFormUseCase.execute(FormStatus.SUBMITTED, FormType.REGULAR, null, 1, 2))
+                .willReturn(new PageResult<>(
+                        List.of(
+                                FormFixture.createFormSimpleResponse(FormStatus.SUBMITTED),
+                                FormFixture.createFormSimpleResponse(FormStatus.SUBMITTED)
+                        ),
+                        5L,
+                        3L
+                ));
+
+        mockMvc.perform(get("/admin/forms")
+                        .param("status", FormStatus.SUBMITTED.name())
+                        .param("type", FormType.REGULAR.name())
+                        .param("page", "1")
+                        .param("size", "2")
+                        .cookie(AuthFixture.createAuthCookie())
+                        .accept(MediaType.APPLICATION_JSON)
+                )
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.data").isArray())
+                .andExpect(jsonPath("$.data.length()").value(2))
+                .andDo(restDocs.document(
+                        requestCookies(
+                                cookieWithName("accessToken").description("이것은.액세스.토큰")
                         ),
                         queryParameters(
-                                parameterWithName("status").description("<<form-status,원서 상태 (null인 경우 전체 조회)>>").optional(),
-                                parameterWithName("type").description("<<form-category,원서 카테고리 (null인 경우 전체 조회)>>").optional(),
-                                parameterWithName("sort").description("정렬 기준").optional()
+                                parameterWithName("status").description("<<원서 상태 (null인 경우 전체 조회)>>").optional(),
+                                parameterWithName("type").description("<<원서 카테고리 (null인 경우 전체 조회)>>").optional(),
+                                parameterWithName("sort").description("정렬 기준").optional(),
+                                parameterWithName("page").description("조회할 페이지 번호 (size, page둘다 null인 경우 전체 조회, size가 null 아니라면 1)").optional(),
+                                parameterWithName("size").description("페이지당 데이터 개수 (size, page둘다 null인 경우 전체 조회, page가 null 아니라면 10)").optional()
                         )
                 ));
 
-        verify(queryAllFormUseCase, times(1)).execute(FormStatus.SUBMITTED, FormType.REGULAR, null);
+        verify(queryAllFormUseCase, times(1)).execute(FormStatus.SUBMITTED, FormType.REGULAR, null, 1, 2);
     }
 
     @Test