Changeset 0c37625 for src/main/java

Timestamp:

10/07/21 20:22:23 (3 years ago)

Author:

NikolaCenevski <cenevskinikola@…>

Branches:

master

Children:

ee0e297

Parents:

276a8b6

Message:

Moderator pagination

Location:

src/main/java/it/finki/charitable

Files:

• controller/DonationPostController.java (modified) (2 diffs)
• controller/ModeratorController.java (modified) (3 diffs)
• entities/ReportPost.java (modified) (3 diffs)
• repository/ReportPostRepository.java (modified) (1 diff)
• security/SecurityConfig.java (modified) (1 diff)
• services/DonationPostService.java (modified) (1 diff)
• services/ReportPostService.java (modified) (2 diffs)

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

@@ -127 +127 @@
                         @RequestParam String sort,
                         @RequestParam(required = false,defaultValue = "") String order) {
-        Page<DonationPost> postList = donationPostService.findPaginated(page,6, sort, order);
+        Page<DonationPost> postList = donationPostService.findPaginated(page,6, sort, order, true);
         if (postList.getSize() == 0) {
             model.addAttribute("noPosts", true);
@@ -204 +204 @@
         reasonService.save(reason);
         reportPost.getReasons().add(reason);
+        reportPost.setNumReports(reportPost.getNumReports() + 1);
         reportPostService.save(reportPost);
         return String.format("redirect:/post?postid=%d", postid);

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

@@ -6 +6 @@
 import it.finki.charitable.services.ReasonService;
 import it.finki.charitable.services.ReportPostService;
+import org.springframework.data.domain.Page;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
@@ -33 +34 @@
 
     @RequestMapping("moderator/approval")
-    public String approval(Model model) {
-        List<DonationPost> postList = donationPostService.findAllByApproved(false);
-        if (postList.size() == 0) {
+    public String approval(Model model,
+                           @RequestParam int page,
+                           @RequestParam String sort,
+                           @RequestParam(required = false,defaultValue = "") String order) {
+        Page<DonationPost> postList = donationPostService.findPaginated(page, 6, sort, order, false);
+        if (postList.getSize() == 0) {
             model.addAttribute("noPosts", true);
             return "postApproval";
         }
+        model.addAttribute("totalPages", postList.getTotalPages());
         model.addAttribute("postList", postList);
         return "postApproval";
@@ -92 +97 @@
 
     @RequestMapping("/moderator/report")
-    public String reportedPosts(Model model) {
-        List<ReportPost> postList = reportPostService.findAll();
-        if (postList.size() == 0) {
+    public String reportedPosts(Model model,
+                                @RequestParam int page,
+                                @RequestParam String sort,
+                                @RequestParam(required = false,defaultValue = "") String order) {
+        Page<ReportPost> postList = reportPostService.findAll(page, 6, sort, order);
+        if (postList.getSize() == 0) {
             model.addAttribute("noPosts", true);
             return "reportedPosts";

src/main/java/it/finki/charitable/entities/ReportPost.java

@@ -2 +2 @@
 
 import javax.persistence.*;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
@@ -32 +33 @@
     private List<Reason> reasons = new ArrayList<>();
 
+    private int numReports = 0;
+
     public Long getId() {
         return id;
@@ -55 +58 @@
         this.reasons = reasons;
     }
+
+    public int getNumReports() {
+        return numReports;
+    }
+
+    public void setNumReports(int numReports) {
+        this.numReports = numReports;
+    }
 }

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

@@ -3 +3 @@
 import it.finki.charitable.entities.DonationPost;
 import it.finki.charitable.entities.ReportPost;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

src/main/java/it/finki/charitable/security/SecurityConfig.java

@@ -67 +67 @@
         RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
         if(authentication.getAuthorities().toString().contains("MODERATOR")) {
-            redirectStrategy.sendRedirect(httpServletRequest, httpServletResponse, "/moderator/approval");
+            redirectStrategy.sendRedirect(httpServletRequest, httpServletResponse, "/moderator/approval?page=1&sort=id");
         } else {
             redirectStrategy.sendRedirect(httpServletRequest, httpServletResponse, "/");

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

@@ -54 +54 @@
     }
 
-    public Page<DonationPost> findPaginated(int pageNo, int pageSize, String sort, String order) {
+    public Page<DonationPost> findPaginated(int pageNo, int pageSize, String sort, String order, boolean approved) {
         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);
+        return donationPostRepository.findAllByApproved(pageable, approved);
     }
 }

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

@@ -5 +5 @@
 import it.finki.charitable.entities.ReportPost;
 import it.finki.charitable.repository.ReportPostRepository;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
@@ -18 +22 @@
     }
 
-    public List<ReportPost> findAll() {
-        return reportPostRepository.findAll();
+    public Page<ReportPost> findAll(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 reportPostRepository.findAll(pageable);
     }