Changeset 5306751 for src/main/java/it/finki

Timestamp:

09/04/21 11:14:25 (3 years ago)

Author:

NikolaCenevski <cenevskinikola@…>

Branches:

master

Children:

ab49338

Parents:

194776a

Message:

Dodadeno posts to be approved

Location:

src/main/java/it/finki/charitable

Files:

• CharitableApplication.java (modified) (1 diff)
• controller/DonationPostController.java (modified) (3 diffs)
• controller/ModeratorController.java (added)
• entities/DonationPost.java (modified) (3 diffs)
• repository/DonationPostRepository.java (modified) (1 diff)
• security/SecurityConfig.java (modified) (4 diffs)
• services/DonationPostService.java (modified) (1 diff)
• services/EmailService.java (modified) (1 diff)

src/main/java/it/finki/charitable/CharitableApplication.java

@@ -4 +4 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableScheduling
 public class CharitableApplication {
 

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

@@ -73 +73 @@
         post.setDateDue(dateDue);
         post.setBankAccount(bankAccount);
+        post.setApproved(false);
 
         List<String> phoneNumbers = Arrays.asList(telekom, a1);
@@ -123 +124 @@
     @RequestMapping("/album")
     public String album(Model model) {
-        List<DonationPost> postList = donationPostService.findAll();
+        List<DonationPost> postList = donationPostService.findAllByApproved(true);
         if (postList.size() == 0) {
             model.addAttribute("noPosts", true);
@@ -148 +149 @@
     }
 
-    @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("/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")

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

@@ -37 +37 @@
     private LocalDate dateDue;
     private String bankAccount;
+    private Boolean approved;
 
     @ElementCollection
@@ -74 +75 @@
 
         List<String> photoPaths = new ArrayList<>();
+
         for(String path: images) {
+            photoPaths.add("../../../../post-photos/" + id + "/" + path);
+        }
+
+        for(String path: moderatorImages) {
             photoPaths.add("../../../../moderator-photos/" + id + "/" + path);
         }
@@ -158 +164 @@
     }
 
+    public Boolean getApproved() {
+        return approved;
+    }
+
+    public void setApproved(Boolean approved) {
+        this.approved = approved;
+    }
+
     public List<String> getPhoneNumbers() {
         return phoneNumbers;

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

@@ -11 +11 @@
 public interface DonationPostRepository extends JpaRepository<DonationPost, Long> {
     List<DonationPost> findAllByUser(AppUser user);
+    List<DonationPost> findAllByApproved(Boolean approved);
 }

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

@@ -7 +7 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.web.DefaultRedirectStrategy;
+import org.springframework.security.web.RedirectStrategy;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 @Configuration
@@ -40 +49 @@
                 .authorizeRequests()
                 .antMatchers(publicMatchers).permitAll()
-                .antMatchers("/moderator-photos/**").hasAuthority(UserRole.MODERATOR.name())
-                .anyRequest().authenticated();
+                .antMatchers("/moderator-photos/**", "/moderator/**").hasAuthority(UserRole.MODERATOR.name())
+                .anyRequest().hasAuthority(UserRole.USER.name());
 
         http
@@ -47 +56 @@
                 .cors().disable()
                 .formLogin().loginPage("/login")
-                .defaultSuccessUrl("/", true)
+                .successHandler(authenticationSuccessHandler)
                 .and()
                 .logout().logoutRequestMatcher(new AntPathRequestMatcher("/logout"))
@@ -55 +64 @@
     }
 
+    AuthenticationSuccessHandler authenticationSuccessHandler = (httpServletRequest, httpServletResponse, authentication) -> {
+        RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
+        if(authentication.getAuthorities().toString().contains("MODERATOR")) {
+            redirectStrategy.sendRedirect(httpServletRequest, httpServletResponse, "/moderator/approval");
+        } else {
+            redirectStrategy.sendRedirect(httpServletRequest, httpServletResponse, "/");
+        }
+    };
+
     @Override
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {

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

@@ -41 +41 @@
     }
 
+    public List<DonationPost> findAllByApproved(Boolean approved) {
+        return donationPostRepository.findAllByApproved(approved);
+    }
+
     public void delete(DonationPost donationPost) {
         donationPostRepository.delete(donationPost);

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

@@ -24 +24 @@
         javaMailSender.send(message);
     }
+
+    public void sendApprovalEmail(String to, String subject, Long postId) {
+        SimpleMailMessage message = new SimpleMailMessage();
+        message.setTo(to);
+        message.setSubject(subject);
+
+        String text = "Your post has been approved\n" + "http://localhost:8080/post?postid=" + postId;
+        message.setText(text);
+        javaMailSender.send(message);
+    }
+
+    public void sendNoApprovalEmail(String to, String subject, String description) {
+        SimpleMailMessage message = new SimpleMailMessage();
+        message.setTo(to);
+        message.setSubject(subject);
+
+        String text = "Sorry, your post hasn't been approved" + "\n" +
+                "Moderator:\n" + description;
+        message.setText(text);
+        javaMailSender.send(message);
+    }
 }