Changeset 276a8b6 for src/main/java

Timestamp:

10/07/21 20:07:41 (3 years ago)

Author:

KostaFortumanov <kfortumanov@…>

Branches:

master

Children:

0c37625

Parents:

0f4f552

Message:

post pagination

Location:

src/main/java/it/finki/charitable

Files:

• controller/DonationPostController.java (modified) (2 diffs)
• repository/DonationPostRepository.java (modified) (2 diffs)
• services/DonationPostService.java (modified) (1 diff)

src/main/java/it/finki/charitable/controller/DonationPostController.java

@@ -4 +4 @@
 import it.finki.charitable.services.*;
 import it.finki.charitable.util.FileUploadUtil;
+import org.springframework.data.domain.Page;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -122 +123 @@
 
     @RequestMapping("/album")
-    public String album(Model model) {
-        List<DonationPost> postList = donationPostService.findAllByApproved(true);
-        if (postList.size() == 0) {
+    public String album(Model model,
+                        @RequestParam int page,
+                        @RequestParam String sort,
+                        @RequestParam(required = false,defaultValue = "") String order) {
+        Page<DonationPost> postList = donationPostService.findPaginated(page,6, sort, order);
+        if (postList.getSize() == 0) {
             model.addAttribute("noPosts", true);
             return "album";
         }
+        model.addAttribute("totalPages", postList.getTotalPages());
         model.addAttribute("postList", postList);
         return "album";

src/main/java/it/finki/charitable/repository/DonationPostRepository.java

@@ -4 +4 @@
 import it.finki.charitable.entities.DonationPost;
 import it.finki.charitable.entities.Moderator;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
@@ -14 +16 @@
     List<DonationPost> findAllByApproved(Boolean approved);
     List<DonationPost> findAllByModerator(Moderator moderator);
+    Page<DonationPost> findAllByApproved(Pageable pageable, boolean approved);
 }

src/main/java/it/finki/charitable/services/DonationPostService.java

@@ -54 +54 @@
     }
 
-    public Page<DonationPost> findPaginated(int pageNo, int pageSize, String sort) {
-        Pageable pageable = PageRequest.of(pageNo - 1, pageSize, Sort.by(sort));
-        return donationPostRepository.findAll(pageable);
+    public Page<DonationPost> findPaginated(int pageNo, int pageSize, String sort, String order) {
+        Sort s = Sort.by(sort);
+        s = order.equals("asc") ? s.ascending() : s.descending();
+        Pageable pageable = PageRequest.of(pageNo - 1, pageSize, s);
+        return donationPostRepository.findAllByApproved(pageable, true);
     }
 }