chore: clean codes

hantsy · Aug 30, 2023 · ada8473 · ada8473
1 parent 61b1052
commit ada8473
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/data-jpa/src/main/java/com/example/demo/web/PaginatedResult.java b/data-jpa/src/main/java/com/example/demo/web/PaginatedResult.java
@@ -0,0 +1,6 @@
+package com.example.demo.web;
+
+import java.util.List;
+
+public record PaginatedResult<T>(List<T> data, Long count) {
+}
diff --git a/data-jpa/src/main/java/com/example/demo/web/PostController.java b/data-jpa/src/main/java/com/example/demo/web/PostController.java
@@ -28,14 +28,14 @@ public class PostController {
     private final PostRepository posts;
 
     @GetMapping(value = "", produces = APPLICATION_JSON_VALUE)
-    public ResponseEntity<Page<PostSummary>> getAll(@RequestParam(defaultValue = "") String q,
+    public ResponseEntity<PaginatedResult<PostSummary>> getAll(@RequestParam(defaultValue = "") String q,
                                                     @RequestParam(defaultValue = "") String status,
                                                     @RequestParam(defaultValue = "0") int page,
                                                     @RequestParam(defaultValue = "10") int size) {
         var postStatus = StringUtils.hasText(status) ? Status.valueOf(status) : null;
         var data = this.posts.findAll(Specifications.findByKeyword(q, postStatus), PageRequest.of(page, size))
                 .map(p -> new PostSummary(p.getTitle(), p.getCreatedAt()));
-        return ok(data);
+        return ok(new PaginatedResult<>(data.getContent(), data.getTotalElements()));
     }
 
     @PostMapping(value = "", consumes = APPLICATION_JSON_VALUE)

diff --git a/data-jpa/src/test/java/com/example/demo/web/PostControllerTest.java b/data-jpa/src/test/java/com/example/demo/web/PostControllerTest.java
@@ -87,7 +87,7 @@ public void tetGetAllPosts() throws Exception {
                 );
 
         this.rest.perform(get("/posts").accept(MediaType.APPLICATION_JSON))
-                .andExpectAll(status().isOk(), jsonPath("$.totalElements", equalTo(2)));
+                .andExpectAll(status().isOk(), jsonPath("$.count", equalTo(2)));
 
         verify(this.posts, times(1)).findAll(isA(Specification.class), isA(Pageable.class));
         verifyNoMoreInteractions(this.posts);

diff --git a/data-jpa/src/test/java/com/example/demo/web/PostControllerTestWithMockMvcWebTestClient.java b/data-jpa/src/test/java/com/example/demo/web/PostControllerTestWithMockMvcWebTestClient.java
@@ -60,8 +60,8 @@ public void getAllPostsWillBeOk() throws Exception {
                 .get()
                 .uri("/posts")
                 .exchange()
-                .expectStatus().isOk();
-        // .expectBody().jsonPath("$.totalElements").isEqualTo(2);
+                .expectStatus().isOk()
+                .expectBody().jsonPath("$.count").isEqualTo(2);
 
         verify(this.posts, times(1)).findAll(isA(Specification.class), isA(Pageable.class));
         verifyNoMoreInteractions(this.posts);