Changeset ee0e297

Timestamp:

10/07/21 20:29:27 (3 years ago)

Author:

KostaFortumanov <kfortumanov@…>

Branches:

master

Children:

7888b17

Parents:

0c37625

Message:

bug fix

Location:

src/main

Files:

• java/it/finki/charitable/controller/DonationPostController.java (modified) (1 diff)
• java/it/finki/charitable/controller/ModeratorController.java (modified) (6 diffs)
• java/it/finki/charitable/repository/DonationPostRepository.java (modified) (1 diff)
• java/it/finki/charitable/services/DonationPostService.java (modified) (1 diff)
• resources/templates/common/navbar.html (modified) (1 diff)

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

@@ -128 +128 @@
                         @RequestParam(required = false,defaultValue = "") String order) {
         Page<DonationPost> postList = donationPostService.findPaginated(page,6, sort, order, true);
-        if (postList.getSize() == 0) {
+        if (postList.getTotalElements() == 0) {
             model.addAttribute("noPosts", true);
             return "album";

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

@@ -39 +39 @@
                            @RequestParam(required = false,defaultValue = "") String order) {
         Page<DonationPost> postList = donationPostService.findPaginated(page, 6, sort, order, false);
-        if (postList.getSize() == 0) {
+        if (postList.getTotalElements() == 0) {
             model.addAttribute("noPosts", true);
             return "postApproval";
@@ -72 +72 @@
         donationPostService.save(post);
         emailService.sendApprovalEmail(post.getUser().getEmail(), "CharitAbleMk: " + post.getTitle() + " has been approved", postid);
-        return "redirect:/moderator/approval";
+        return "redirect:/moderator/approval?page=1&sort=id";
     }
 
@@ -81 +81 @@
         emailService.sendNoApprovalEmail(post.getUser().getEmail(), "CharitAbleMk: " + post.getTitle() + " has not been approved", description);
         deleteDonationPost(post);
-        return "redirect:/moderator/approval";
+        return "redirect:/moderator/approval?page=1&sort=id";
     }
 
     @RequestMapping("/moderator/myApprovedPosts")
-    public String myApprovedPosts(Model model) {
+    public String myApprovedPosts(Model model,
+                                  @RequestParam int page,
+                                  @RequestParam String sort,
+                                  @RequestParam(required = false,defaultValue = "") String order) {
         Moderator moderator = (Moderator) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        List<DonationPost> postList = donationPostService.findAllByModerator(moderator);
-        if (postList.size() == 0) {
+        Page<DonationPost> postList = donationPostService.findAllByModerator(page, 6, sort, order, moderator);
+        if (postList.getTotalElements() == 0) {
             model.addAttribute("noPosts", true);
             return "postApproval";
         }
+        model.addAttribute("totalPages", postList.getTotalPages());
         model.addAttribute("postList", postList);
         return "postApproval";
@@ -102 +106 @@
                                 @RequestParam(required = false,defaultValue = "") String order) {
         Page<ReportPost> postList = reportPostService.findAll(page, 6, sort, order);
-        if (postList.getSize() == 0) {
+        if (postList.getTotalElements() == 0) {
             model.addAttribute("noPosts", true);
             return "reportedPosts";
         }
+        model.addAttribute("totalPages",postList.getTotalPages());
         model.addAttribute("postList", postList);
         return "reportedPosts";
@@ -130 +135 @@
         ReportPost post = reportPostService.findById(postid);
         deleteReportPost(post);
-        return "redirect:/moderator/report";
+        return "redirect:/moderator/report?page=1&sort=id";
     }
 
@@ -141 +146 @@
         deleteReportPost(post);
         deleteDonationPost(donationPost);
-        return "redirect:/moderator/approval";
+        return "redirect:/moderator/approval?page=1&sort=id";
     }
 

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

@@ -15 +15 @@
     List<DonationPost> findAllByUser(AppUser user);
     List<DonationPost> findAllByApproved(Boolean approved);
-    List<DonationPost> findAllByModerator(Moderator moderator);
+    Page<DonationPost> findAllByModerator(Pageable pageable, Moderator moderator);
     Page<DonationPost> findAllByApproved(Pageable pageable, boolean approved);
 }

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

@@ -46 +46 @@
     }
 
-    public List<DonationPost> findAllByModerator(Moderator moderator) {
-        return donationPostRepository.findAllByModerator(moderator);
+    public Page<DonationPost> findAllByModerator(int pageNo, int pageSize, String sort, String order, Moderator moderator) {
+        Sort s = Sort.by(sort);
+        s = order.equals("asc") ? s.ascending() : s.descending();
+        Pageable pageable = PageRequest.of(pageNo - 1, pageSize, s);
+        return donationPostRepository.findAllByModerator(pageable, moderator);
     }
 

src/main/resources/templates/common/navbar.html

@@ -39 +39 @@
                     <a sec:authorize="isAnonymous()" type="button" class="btn btn-warning" th:href="@{/register}">Sign-up</a>
                     <a sec:authorize="isAuthenticated() and hasAuthority('USER')" type="button" class="btn btn-outline-light me-2" th:href="@{/userInformation}">My profile - <span th:text="${user.firstName}"></span></a>
-                    <a sec:authorize="isAuthenticated() and hasAuthority('MODERATOR')" type="button" class="btn btn-outline-light me-2" th:href="@{/moderator/myApprovedPosts}">My approved posts - <span th:text="${user.firstName} + ${user.lastName}"></span></a>
+                    <a sec:authorize="isAuthenticated() and hasAuthority('MODERATOR')" type="button" class="btn btn-outline-light me-2" th:href="@{/moderator/myApprovedPosts?page=1&sort=id}">My approved posts - <span th:text="${user.firstName} + ${user.lastName}"></span></a>
                     <a sec:authorize="isAuthenticated()" type="button" class="btn btn-warning" th:href="@{/logout}">Logout</a>
                 </div>