pagination on book search endpoint added

multipleton · Apr 23, 2022 · ca36304 · ca36304
1 parent 139130a
commit ca36304
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,6 +30,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>io.springfox</groupId>

diff --git a/src/main/java/com/multipleton/spring/Application.java b/src/main/java/com/multipleton/spring/Application.java
@@ -8,6 +8,7 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Scope;
@@ -18,7 +19,9 @@
 import java.util.List;
 import java.util.Set;
 
-@SpringBootApplication(exclude = {UserDetailsServiceAutoConfiguration.class})
+@SpringBootApplication(exclude = {
+        UserDetailsServiceAutoConfiguration.class,
+        DataSourceAutoConfiguration.class})
 @EnableWebSecurity
 public class Application {
 

diff --git a/src/main/java/com/multipleton/spring/controller/BookController.java b/src/main/java/com/multipleton/spring/controller/BookController.java
@@ -6,6 +6,7 @@
 import com.multipleton.spring.service.AuthorService;
 import com.multipleton.spring.service.BookService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,7 +34,7 @@ public void setAuthorService(AuthorService authorService) {
     @GetMapping
     public String books(BookSearchDto bookSearchDto, Model model) {
         model.addAttribute("bookSearchDto", bookSearchDto);
-        model.addAttribute("books", bookService.searchBooks(bookSearchDto));
+        model.addAttribute("books", bookService.searchBooks(bookSearchDto, Pageable.unpaged()));
         return "books";
     }
 

diff --git a/src/main/java/com/multipleton/spring/controller/rest/BookRestController.java b/src/main/java/com/multipleton/spring/controller/rest/BookRestController.java
@@ -5,10 +5,10 @@
 import com.multipleton.spring.dto.book.BookSearchDto;
 import com.multipleton.spring.dto.book.BookUpdateDto;
 import com.multipleton.spring.service.BookService;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/rest")
 public class BookRestController extends FrontRestController {
@@ -41,8 +41,10 @@ public void deleteBook(@PathVariable Long bookId) {
     }
 
     @GetMapping("/books/search")
-    public List<BookDto> searchBooks(BookSearchDto dto) {
-        return bookService.searchBooks(dto);
+    public Page<BookDto> searchBooks(BookSearchDto dto,
+                                     @RequestParam(value = "page", defaultValue = "0") Integer page,
+                                     @RequestParam(value = "size", defaultValue = "20") Integer size) {
+        return bookService.searchBooks(dto, PageRequest.of(page, size));
     }
 
 }
diff --git a/src/main/java/com/multipleton/spring/dto/book/BookSearchDto.java b/src/main/java/com/multipleton/spring/dto/book/BookSearchDto.java
@@ -1,5 +1,7 @@
 package com.multipleton.spring.dto.book;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -36,6 +38,7 @@ public String getTags() {
         return tags;
     }
 
+    @ApiModelProperty(hidden = true)
     public Set<String> getTagsSet() {
         if (tags == null || tags.isEmpty()) {
             return new HashSet<>();

diff --git a/src/main/java/com/multipleton/spring/repository/BookRepository.java b/src/main/java/com/multipleton/spring/repository/BookRepository.java
@@ -1,6 +1,8 @@
 package com.multipleton.spring.repository;
 
 import com.multipleton.spring.model.Book;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 import java.util.Optional;
@@ -10,7 +12,7 @@ public interface BookRepository {
 
     List<Book> findAll();
 
-    List<Book> findAllByTitleAndTagsAndAuthor_Name(String title, Set<String> tags, String name);
+    Page<Book> findAllByTitleAndTagsAndAuthor_Name(String title, Set<String> tags, String name, Pageable pageable);
 
     List<Book> findAllByAuthor_Id(Long authorId);
 

diff --git a/src/main/java/com/multipleton/spring/repository/StubBookRepository.java b/src/main/java/com/multipleton/spring/repository/StubBookRepository.java
@@ -1,6 +1,9 @@
 package com.multipleton.spring.repository;
 
 import com.multipleton.spring.model.Book;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 
 import java.util.*;
@@ -17,12 +20,16 @@ public List<Book> findAll() {
     }
 
     @Override
-    public List<Book> findAllByTitleAndTagsAndAuthor_Name(String title, Set<String> tags, String name) {
-        return books.stream()
+    public Page<Book> findAllByTitleAndTagsAndAuthor_Name(String title, Set<String> tags, String name, Pageable pageable) {
+        List<Book> entries = books.stream()
                 .filter(book -> title == null || title.isEmpty() || book.getTitle().contains(title))
                 .filter(book -> tags.isEmpty() || book.getTags().containsAll(tags))
                 .filter(book -> name == null || name.isEmpty() || book.getAuthor().getName().contains(name))
+                .sorted(Comparator.comparing(Book::getId))
                 .collect(Collectors.toList());
+        int start = Math.min(pageable.getPageNumber() * pageable.getPageSize(), entries.size());
+        int end = Math.min(start + pageable.getPageSize(), entries.size());
+        return new PageImpl<>(entries.subList(start, end), pageable, entries.size());
     }
 
     @Override

diff --git a/src/main/java/com/multipleton/spring/service/BookService.java b/src/main/java/com/multipleton/spring/service/BookService.java
@@ -8,6 +8,8 @@
 import com.multipleton.spring.model.Book;
 import com.multipleton.spring.repository.BookRepository;
 import com.multipleton.spring.service.exception.EntityNotFoundException;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -56,11 +58,12 @@ public List<BookDto> findAllBooks() {
                 .collect(Collectors.toList());
     }
 
-    public List<BookDto> searchBooks(BookSearchDto dto) {
-        return bookRepository.findAllByTitleAndTagsAndAuthor_Name(dto.getTitle(), dto.getTagsSet(), dto.getAuthor())
-                .stream()
-                .map(BookDto::from)
-                .collect(Collectors.toList());
+    public Page<BookDto> searchBooks(BookSearchDto dto, Pageable pageable) {
+        return bookRepository.findAllByTitleAndTagsAndAuthor_Name(dto.getTitle(),
+                        dto.getTagsSet(),
+                        dto.getAuthor(),
+                        pageable)
+                .map(BookDto::from);
     }
 
     public List<BookDto> findBooksByAuthorId(Long authorId) {