Changeset ab49338 for src/main/java

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/java/it/finki/charitable

Files:

• controller/DonationPostController.java (modified) (5 diffs)
• controller/ModeratorController.java (modified) (6 diffs)
• entities/DonationPost.java (modified) (2 diffs)
• entities/Reason.java (added)
• entities/ReportPost.java (added)
• repository/DonationPostRepository.java (modified) (2 diffs)
• repository/ReasonRepository.java (added)
• repository/ReportPostRepository.java (added)
• services/DonationPostService.java (modified) (2 diffs)
• services/EmailService.java (modified) (1 diff)
• services/ReasonService.java (added)
• services/ReportPostService.java (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);