Merge pull request #1 from nuttawut25983/fix-pagination

fix pagination
KBTG-Kampus-ClassNest-SE-Java · Mar 24, 2024 · 464bde1 · 464bde1
2 parents 26eaabc + 0be14e9
commit 464bde1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/kbazaar/src/main/java/com/kampus/kbazaar/product/ProductController.java b/kbazaar/src/main/java/com/kampus/kbazaar/product/ProductController.java
@@ -5,7 +5,7 @@
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import java.util.List;
+import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -36,13 +36,11 @@ public ProductController(ProductService productService) {
                             mediaType = "application/json",
                             schema = @Schema(implementation = NotFoundException.class)))
     @GetMapping("/products")
-    public List<ProductResponse> getProducts(
-            @RequestParam(value = "page", required = false) Integer page,
-            @RequestParam(value = "limit", required = false) Integer limit) {
-        if (page == null || limit == null) {
-            return productService.getAll();
-        }
-        return productService.getProductsByPage(page, limit);
+    public Page<ProductResponse> getProducts(
+            @RequestParam(value = "page", defaultValue = "0") Integer page,
+            @RequestParam(value = "size", defaultValue = "20") Integer size) {
+
+        return productService.getProductsByPage(page, size);
     }
 
     @ApiResponse(

diff --git a/kbazaar/src/main/java/com/kampus/kbazaar/product/ProductService.java b/kbazaar/src/main/java/com/kampus/kbazaar/product/ProductService.java
@@ -3,6 +3,7 @@
 import com.kampus.kbazaar.exceptions.NotFoundException;
 import java.util.List;
 import java.util.Optional;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
@@ -19,10 +20,8 @@ public List<ProductResponse> getAll() {
         return productRepository.findAll().stream().map(Product::toResponse).toList();
     }
 
-    public List<ProductResponse> getProductsByPage(Integer page, Integer limit) {
-        return productRepository.findAll(PageRequest.of(page, limit)).stream()
-                .map(Product::toResponse)
-                .toList();
+    public Page<ProductResponse> getProductsByPage(Integer page, Integer size) {
+        return productRepository.findAll(PageRequest.of(page, size)).map(Product::toResponse);
     }
 
     public ProductResponse getBySku(String sku) {

diff --git a/kbazaar/src/test/java/com/kampus/kbazaar/product/ProductControllerTest.java b/kbazaar/src/test/java/com/kampus/kbazaar/product/ProductControllerTest.java
@@ -19,6 +19,7 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
@@ -48,12 +49,12 @@ public void shouldReturnAllProduct() throws Exception {
         // Given
 
         // When & Then
-        when(productService.getAll()).thenReturn(new ArrayList<>());
+        when(productService.getProductsByPage(0, 20)).thenReturn(new PageImpl<ProductResponse>(new ArrayList<>()));
 
         mockMvc.perform(get("/api/v1/products").contentType(MediaType.APPLICATION_JSON))
                 .andExpect(status().isOk());
 
-        verify(productService, times(1)).getAll();
+        verify(productService, times(1)).getProductsByPage(0, 20);
     }
 
     @Test