Changeset ab49338

Timestamp:

09/04/21 12:17:17 (3 years ago)

Author:

KostaFortumanov <kfortumanov@…>

Branches:

master

Children:

0f4f552

Parents:

5306751

Message:

Dodadeno prijavuvanje na objavi

Location:

src/main

Files:

• java/it/finki/charitable/controller/DonationPostController.java (modified) (5 diffs)
• java/it/finki/charitable/controller/ModeratorController.java (modified) (6 diffs)
• java/it/finki/charitable/entities/DonationPost.java (modified) (2 diffs)
• java/it/finki/charitable/entities/Reason.java (added)
• java/it/finki/charitable/entities/ReportPost.java (added)
• java/it/finki/charitable/repository/DonationPostRepository.java (modified) (2 diffs)
• java/it/finki/charitable/repository/ReasonRepository.java (added)
• java/it/finki/charitable/repository/ReportPostRepository.java (added)
• java/it/finki/charitable/services/DonationPostService.java (modified) (2 diffs)
• java/it/finki/charitable/services/EmailService.java (modified) (1 diff)
• java/it/finki/charitable/services/ReasonService.java (added)
• java/it/finki/charitable/services/ReportPostService.java (added)
• resources/templates/common/navbar.html (modified) (1 diff)
• resources/templates/moderatorPost.html (modified) (3 diffs)
• resources/templates/myProfile.html (modified) (1 diff)
• resources/templates/post.html (modified) (2 diffs)
• resources/templates/reportPost.html (added)
• resources/templates/reportedPosts.html (added)

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

@@ -2 +2 @@
 
 import it.finki.charitable.entities.*;
-import it.finki.charitable.services.DonationInformationService;
-import it.finki.charitable.services.DonationPostService;
-import it.finki.charitable.services.FundsCollectedService;
-import it.finki.charitable.services.UserService;
+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;
@@ -16 +12 @@
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
 import java.io.IOException;
 import java.time.LocalDate;
@@ -32 +27 @@
     private final FundsCollectedService fundsCollectedService;
     private final DonationInformationService donationInformationService;
-
-    public DonationPostController(DonationPostService donationPostService, UserService userService, FundsCollectedService fundsCollectedService, DonationInformationService donationInformationService) {
+    private final ReportPostService reportPostService;
+    private final ReasonService reasonService;
+
+    public DonationPostController(DonationPostService donationPostService, UserService userService, FundsCollectedService fundsCollectedService, DonationInformationService donationInformationService, ReportPostService reportPostService, ReasonService reasonService) {
         this.donationPostService = donationPostService;
         this.userService = userService;
         this.fundsCollectedService = fundsCollectedService;
         this.donationInformationService = donationInformationService;
+        this.reportPostService = reportPostService;
+        this.reasonService = reasonService;
     }
 
@@ -140 +139 @@
             return "post";
         }
-        AppUser user = post.getUser();
-        model.addAttribute("post", post);
-        model.addAttribute("createdByFirstName", user.getFirstName());
-        model.addAttribute("createdByLastName", user.getLastName());
-        double total = post.getFundsCollected().stream().mapToDouble(FundsCollected::getFunds).sum();
-        model.addAttribute("total", total);
+
+        if (post.getApproved() || (post.getUser().getUsername().equals(SecurityContextHolder.getContext().getAuthentication().getName()) && !post.getApproved())) {
+            AppUser user = post.getUser();
+            Moderator moderator = post.getModerator();
+            model.addAttribute("post", post);
+            model.addAttribute("createdByFirstName", user.getFirstName());
+            model.addAttribute("createdByLastName", user.getLastName());
+            if (moderator != null) {
+                model.addAttribute("moderatorFirstName", moderator.getFirstName());
+                model.addAttribute("moderatorLastName", moderator.getLastName());
+            }
+            double total = post.getFundsCollected().stream().mapToDouble(FundsCollected::getFunds).sum();
+            model.addAttribute("total", total);
+        } else {
+            model.addAttribute("notFound", true);
+        }
         return "post";
     }
-
-//    @RequestMapping("/deletePost")
-//    public String deletePost(@RequestParam Long postid) {
-//        DonationPost post = donationPostService.getById(postid);
-//        if (post.getUser().getUsername().equals(SecurityContextHolder.getContext().getAuthentication().getName())) {
-//            List<String> fileForDeletion = post.getPhotosForDeletion();
-//            for (String f : fileForDeletion) {
-//                File file = new File(f);
-//                file.delete();
-//            }
-//            donationPostService.delete(post);
-//        }
-//
-//        return "redirect:/myPosts";
-//    }
 
     @RequestMapping("/donate")
@@ -188 +182 @@
     }
 
+    @RequestMapping("/report")
+    public String report(@RequestParam Long postid,
+                         @RequestParam String description) {
+
+        DonationPost donationPost = donationPostService.getById(postid);
+        ReportPost reportPost = reportPostService.findByDonationPost(donationPost);
+        if(reportPost == null) {
+            reportPost = new ReportPost();
+            reportPost.setDonationPost(donationPost);
+        }
+
+        Reason reason = new Reason();
+        AppUser user = (AppUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        reason.setUser(user);
+        reason.setDescription(description);
+        reasonService.save(reason);
+        reportPost.getReasons().add(reason);
+        reportPostService.save(reportPost);
+        return String.format("redirect:/post?postid=%d", postid);
+    }
+
     @ModelAttribute("user")
     public AppUser addAttributes() {

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

@@ -1 +1 @@
 package it.finki.charitable.controller;
 
-import it.finki.charitable.entities.AppUser;
-import it.finki.charitable.entities.DonationPost;
+import it.finki.charitable.entities.*;
 import it.finki.charitable.services.DonationPostService;
 import it.finki.charitable.services.EmailService;
+import it.finki.charitable.services.ReasonService;
+import it.finki.charitable.services.ReportPostService;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
@@ -13 +14 @@
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 
@@ -20 +22 @@
     private final DonationPostService donationPostService;
     private final EmailService emailService;
+    private final ReportPostService reportPostService;
+    private final ReasonService reasonService;
 
-    public ModeratorController(DonationPostService donationPostService, EmailService emailService) {
+    public ModeratorController(DonationPostService donationPostService, EmailService emailService, ReportPostService reportPostService, ReasonService reasonService) {
         this.donationPostService = donationPostService;
         this.emailService = emailService;
+        this.reportPostService = reportPostService;
+        this.reasonService = reasonService;
     }
 
@@ -48 +54 @@
         model.addAttribute("createdByFirstName", user.getFirstName());
         model.addAttribute("createdByLastName", user.getLastName());
+        if (post.getApproved()) {
+            model.addAttribute("approved", true);
+        }
         return "moderatorPost";
     }
@@ -55 +64 @@
         DonationPost post = donationPostService.getById(postid);
         post.setApproved(true);
+        post.setModerator((Moderator) SecurityContextHolder.getContext().getAuthentication().getPrincipal());
         donationPostService.save(post);
-        emailService.sendApprovalEmail(post.getUser().getEmail(),"CharitAbleMk: " + post.getTitle() + " has been approved", postid);
+        emailService.sendApprovalEmail(post.getUser().getEmail(), "CharitAbleMk: " + post.getTitle() + " has been approved", postid);
         return "redirect:/moderator/approval";
     }
@@ -65 +75 @@
         DonationPost post = donationPostService.getById(postid);
         emailService.sendNoApprovalEmail(post.getUser().getEmail(), "CharitAbleMk: " + post.getTitle() + " has not been approved", description);
-        List<String> fileForDeletion = post.getPhotosForDeletion();
+        deleteDonationPost(post);
+        return "redirect:/moderator/approval";
+    }
+
+    @RequestMapping("/moderator/myApprovedPosts")
+    public String myApprovedPosts(Model model) {
+        Moderator moderator = (Moderator) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        List<DonationPost> postList = donationPostService.findAllByModerator(moderator);
+        if (postList.size() == 0) {
+            model.addAttribute("noPosts", true);
+            return "postApproval";
+        }
+        model.addAttribute("postList", postList);
+        return "postApproval";
+    }
+
+    @RequestMapping("/moderator/report")
+    public String reportedPosts(Model model) {
+        List<ReportPost> postList = reportPostService.findAll();
+        if (postList.size() == 0) {
+            model.addAttribute("noPosts", true);
+            return "reportedPosts";
+        }
+        model.addAttribute("postList", postList);
+        return "reportedPosts";
+    }
+
+    @RequestMapping("/moderator/reportPost")
+    public String report(@RequestParam Long postid, Model model) {
+        ReportPost post = reportPostService.findById(postid);
+        model.addAttribute("post", post);
+        DonationPost donationPost = post.getDonationPost();
+        AppUser user = donationPost.getUser();
+        model.addAttribute("createdByFirstName", user.getFirstName());
+        model.addAttribute("createdByLastName", user.getLastName());
+        model.addAttribute("report", true);
+        Moderator moderator = post.getDonationPost().getModerator();
+        model.addAttribute("moderatorFirstName", moderator.getFirstName());
+        model.addAttribute("moderatorLastName", moderator.getLastName());
+
+        return "reportPost";
+    }
+
+    @RequestMapping("/moderator/dismiss")
+    public String dismiss(@RequestParam Long postid) {
+        ReportPost post = reportPostService.findById(postid);
+        deleteReportPost(post);
+        return "redirect:/moderator/reportedPosts";
+    }
+
+    @RequestMapping("/moderator/deletePost")
+    public String deletePost(@RequestParam Long postid,
+                             @RequestParam String description) {
+        ReportPost post = reportPostService.findById(postid);
+        DonationPost donationPost = post.getDonationPost();
+        emailService.sendDeletionEmail(donationPost.getUser().getEmail(), "CharitAbleMk: " + donationPost.getTitle() + " has been deleted", description);
+        deleteReportPost(post);
+        deleteDonationPost(donationPost);
+        return "redirect:/moderator/approval";
+    }
+
+    public void deleteDonationPost(DonationPost donationPost) {
+        List<String> fileForDeletion = donationPost.getPhotosForDeletion();
         for (String f : fileForDeletion) {
             File file = new File(f);
             file.delete();
         }
-        donationPostService.delete(post);
-        return "redirect:/moderator/approval";
+        donationPostService.delete(donationPost);
+    }
+
+    public void deleteReportPost(ReportPost reportPost) {
+        List<Reason> reasons = new ArrayList<>(reportPost.getReasons());
+        if (reportPost.getReasons().size() > 0) {
+            reportPost.getReasons().subList(0, reportPost.getReasons().size()).clear();
+        }
+        reportPostService.save(reportPost);
+        for(Reason r: reasons) {
+            reasonService.delete(r);
+        }
+        reportPostService.delete(reportPost);
     }
 

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

@@ -55 +55 @@
     private AppUser user;
 
+    @ManyToOne
+    private Moderator moderator;
+
     @OneToMany
     private List<FundsCollected> fundsCollected = new ArrayList<>();
@@ -204 +207 @@
     }
 
+    public Moderator getModerator() {
+        return moderator;
+    }
+
+    public void setModerator(Moderator moderator) {
+        this.moderator = moderator;
+    }
+
     public List<FundsCollected> getFundsCollected() {
         return fundsCollected;

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

@@ -3 +3 @@
 import it.finki.charitable.entities.AppUser;
 import it.finki.charitable.entities.DonationPost;
+import it.finki.charitable.entities.Moderator;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
@@ -12 +13 @@
     List<DonationPost> findAllByUser(AppUser user);
     List<DonationPost> findAllByApproved(Boolean approved);
+    List<DonationPost> findAllByModerator(Moderator moderator);
 }

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

@@ -3 +3 @@
 import it.finki.charitable.entities.AppUser;
 import it.finki.charitable.entities.DonationPost;
+import it.finki.charitable.entities.Moderator;
 import it.finki.charitable.repository.DonationPostRepository;
 import org.springframework.data.domain.Page;
@@ -45 +46 @@
     }
 
+    public List<DonationPost> findAllByModerator(Moderator moderator) {
+        return donationPostRepository.findAllByModerator(moderator);
+    }
+
     public void delete(DonationPost donationPost) {
         donationPostRepository.delete(donationPost);

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

@@ -40 +40 @@
         message.setSubject(subject);
 
-        String text = "Sorry, your post hasn't been approved" + "\n" +
+        String text = "Sorry, your post hasn't been approved\n" +
+                "Moderator:\n" + description;
+        message.setText(text);
+        javaMailSender.send(message);
+    }
+
+    public void sendDeletionEmail(String to, String subject, String description) {
+        SimpleMailMessage message = new SimpleMailMessage();
+        message.setTo(to);
+        message.setSubject(subject);
+
+        String text = "Sorry, your post has been deleted\n" +
                 "Moderator:\n" + description;
         message.setText(text);

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

@@ -38 +38 @@
                     <a sec:authorize="isAnonymous()" type="button" class="btn btn-outline-light me-2" th:href="@{/login}">Login</a>
                     <a sec:authorize="isAnonymous()" type="button" class="btn btn-warning" th:href="@{/register}">Sign-up</a>
-                    <a sec:authorize="isAuthenticated()" 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('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()" type="button" class="btn btn-warning" th:href="@{/logout}">Logout</a>
                 </div>

src/main/resources/templates/moderatorPost.html

@@ -24 +24 @@
                 <div id="myCarousel" class="carousel carousel-dark slide card" data-bs-ride="carousel">
                     <div class="carousel-indicators">
-                        <button th:each="image, itrStat : ${post.moderatorPath}" type="button" data-bs-target="#myCarousel"
-                                th:data-bs-slide-to="${itrStat.index}" th:classappend="${itrStat.index} == 0 ? active"></button>
+                        <button th:each="image, itrStat : ${post.moderatorPath}" type="button"
+                                data-bs-target="#myCarousel"
+                                th:data-bs-slide-to="${itrStat.index}"
+                                th:classappend="${itrStat.index} == 0 ? active"></button>
                     </div>
                     <div class="carousel-inner">
-                        <div th:each="image, itrStat : ${post.moderatorPath}" th:classappend="${itrStat.index} == 0 ? active"
+                        <div th:each="image, itrStat : ${post.moderatorPath}"
+                             th:classappend="${itrStat.index} == 0 ? active"
                              class="carousel-item">
                             <img class="card-img" th:src="${image}" style="object-fit: contain">
                         </div>
                     </div>
-                    <button class="carousel-control-prev" type="button" data-bs-target="#myCarousel" data-bs-slide="prev">
+                    <button class="carousel-control-prev" type="button" data-bs-target="#myCarousel"
+                            data-bs-slide="prev">
                         <span class="carousel-control-prev-icon" aria-hidden="true"></span>
                         <span class="visually-hidden">Previous</span>
                     </button>
-                    <button class="carousel-control-next" type="button" data-bs-target="#myCarousel" data-bs-slide="next">
+                    <button class="carousel-control-next" type="button" data-bs-target="#myCarousel"
+                            data-bs-slide="next">
                         <span class="carousel-control-next-icon" aria-hidden="true"></span>
                         <span class="visually-hidden">Next</span>
@@ -50 +55 @@
                 <p th:text="${post.description}"></p>
                 <h5>Funds needed:</h5>
-                <p><span th:text="${total}"></span>/<span th:text="${post.fundsNeeded}"></span> - <span th:text="${post.currency}"></span></p>
+                <p><span th:text="${total}"></span>/<span th:text="${post.fundsNeeded}"></span> - <span
+                        th:text="${post.currency}"></span></p>
                 <h5>Date due:</h5>
                 <p th:text="${post.dateDue}"></p>
@@ -61 +67 @@
                 <p><span th:text="${createdByFirstName}"></span> <span th:text="${createdByLastName}"></span></p>
 
-                <a class="btn btn-success" th:href="@{/moderator/approvePost(postid=${post.id})}">Approve</a>
-                <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#staticBackdrop">
-                    Dont Approve
-                </button>
+                <div th:unless="${approved}">
+                    <a class="btn btn-success" th:href="@{/moderator/approvePost(postid=${post.id})}">Approve</a>
+                    <button type="button" class="btn btn-danger" data-bs-toggle="modal"
+                            data-bs-target="#staticBackdrop">
+                        Dont Approve
+                    </button>
+                </div>
 
                 <!-- Modal -->
-                <div class="modal fade" id="staticBackdrop" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+                <div class="modal fade" id="staticBackdrop" data-bs-backdrop="static" data-bs-keyboard="false"
+                     tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
                     <div class="modal-dialog modal-dialog-centered">
                         <div class="modal-content">
                             <div class="modal-header">
-                                <h5 class="modal-title" id="staticBackdropLabel">Donate</h5>
-                                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                                <h5 class="modal-title" id="staticBackdropLabel">Dont approve</h5>
+                                <button type="button" class="btn-close" data-bs-dismiss="modal"
+                                        aria-label="Close"></button>
                             </div>
                             <div class="modal-body">
                                 <div class="card-body">
-                                    <form th:action="@{/moderator/dontApprove(postid=${post.id})}" method="post" id="myForm">
+                                    <form th:action="@{/moderator/dontApprove(postid=${post.id})}" method="post"
+                                          id="myForm">
                                         <label for="description">Description</label>
-                                        <textarea class="form-control" id="description" name="description" rows="5"></textarea>
+                                        <textarea class="form-control" id="description" name="description"
+                                                  rows="5"></textarea>
                                     </form>
                                 </div>

src/main/resources/templates/myProfile.html

@@ -245 +245 @@
                                                 Add collected funds
                                             </button>
-                                            <a class="btn btn-sm btn-danger"
-                                               th:href="@{/deletePost(postid=${post.id})}">Delete</a>
                                         </div>
                                     </div>

src/main/resources/templates/post.html

@@ -60 +60 @@
             <h5>Created by:</h5>
             <p><span th:text="${createdByFirstName}"></span> <span th:text="${createdByLastName}"></span></p>
-
-            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#staticBackdrop">
+            <h5>Approved by:</h5>
+            <p th:unless="${moderatorFirstName}">Not approved</p>
+            <p><span th:text="${moderatorFirstName}"></span> <span th:text="${moderatorLastName}"></span></p>
+
+            <button sec:authorize="isAuthenticated()" type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#staticBackdrop">
                 Donate
+            </button>
+            <a sec:authorize="isAnonymous()" type="button" class="btn btn-primary" th:href="@{/login}">
+                Donate
+            </a>
+            <button type="button" class="btn btn-danger" data-bs-toggle="modal"
+                    data-bs-target="#staticBackdrop1">
+                Report
             </button>
 
@@ -126 +136 @@
                 </div>
             </div>
+            <div class="modal fade" id="staticBackdrop1" data-bs-backdrop="static" data-bs-keyboard="false"
+                 tabindex="-1" aria-labelledby="staticBackdropLabel1" aria-hidden="true">
+                <div class="modal-dialog modal-dialog-centered">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h5 class="modal-title" id="staticBackdropLabel1">Report post</h5>
+                            <button type="button" class="btn-close" data-bs-dismiss="modal"
+                                    aria-label="Close"></button>
+                        </div>
+                        <div class="modal-body">
+                            <div class="card-body">
+                                <form th:action="@{/report(postid=${post.id})}" method="post"
+                                      id="myForm1">
+                                    <label for="description">Description</label>
+                                    <textarea class="form-control" id="description" name="description"
+                                              rows="5"></textarea>
+                                </form>
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                            <input type="submit" class="btn btn-primary" form="myForm1" value="Confirm">
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>