Changeset b8dc761

Timestamp:

01/05/22 15:57:29 (3 years ago)

Author:

NikolaCenevski <cenevskinikola@…>

Branches:

master

Children:

6fa3d09

Parents:

881a233

Message:

part 2

Files:

• pom.xml (modified) (1 diff)
• src/main/java/it/finki/charitable/controller/DonationPostController.java (modified) (8 diffs)
• src/main/java/it/finki/charitable/controller/HomeController.java (modified) (1 diff)
• src/main/java/it/finki/charitable/controller/UserProfileController.java (modified) (2 diffs)
• src/main/java/it/finki/charitable/entities/DonationPost.java (modified) (2 diffs)
• src/main/java/it/finki/charitable/security/O2AuthSuccessHandler.java (added)
• src/main/java/it/finki/charitable/security/SecurityConfig.java (modified) (5 diffs)
• src/main/java/it/finki/charitable/security/UserO2Auth.java (added)
• src/main/java/it/finki/charitable/security/UserO2AuthService.java (added)
• src/main/java/it/finki/charitable/services/EmailService.java (modified) (6 diffs)
• src/main/java/it/finki/charitable/util/AutomaticEvents.java (modified) (3 diffs)
• src/main/resources/application.properties (modified) (1 diff)
• src/main/resources/static/css/risk.css (added)
• src/main/resources/templates/album.html (modified) (5 diffs)
• src/main/resources/templates/login.html (modified) (1 diff)
• src/main/resources/templates/post.html (modified) (1 diff)

pom.xml

@@ -69 +69 @@
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-oauth2-client</artifactId>
+        </dependency>
     </dependencies>
 

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

@@ -14 +14 @@
 
 import java.io.IOException;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.util.*;
@@ -87 +88 @@
         post.setBankAccount(bankAccount);
         post.setApproved(false);
+        post.setCreatedAt(LocalDate.now());
+        long totalDays = Duration.between(post.getCreatedAt().atTime(0, 0, 0), post.getDateDue().atTime(0, 0, 0)).toDays();
+        if(totalDays < 10)
+            post.setRiskFactor(0);
 
         List<String> phoneNumbers = Arrays.asList(telekom, a1);
@@ -169 +174 @@
                     allPosts.sort(Comparator.comparing(DonationPost::getFundsNeeded).reversed());
                 }
+            } else if (sort.equals("riskFactor")) {
+                if (order.equals("asc")) {
+                    allPosts.sort(Comparator.comparing(DonationPost::getRiskFactor));
+                } else {
+                    allPosts.sort(Comparator.comparing(DonationPost::getRiskFactor).reversed());
+                }
             }
 
             if (groupBy.equals("completed")) {
-                List<DonationPost> completed = allPosts.stream().filter(post -> {
-                    double fundsCollected = post.getFundsCollected().stream().mapToDouble(FundsCollected::getFunds).sum();
-                    return fundsCollected >= post.getFundsNeeded();
-                }).collect(Collectors.toList());
+                List<DonationPost> completed = allPosts.stream()
+                        .filter(post -> post.getTotalFundsCollected() >= post.getFundsNeeded())
+                        .collect(Collectors.toList());
 
                 int start = (int) pageable.getOffset();
@@ -213 +223 @@
         }
 
-        if (post.getApproved() || (post.getUser().getUsername().equals(SecurityContextHolder.getContext().getAuthentication().getName()) && !post.getApproved())) {
+        AppUser currentUser = (AppUser) model.getAttribute("user");
+        if (post.getApproved() || (post.getUser().getUsername().equals(currentUser.getUsername()) && !post.getApproved())) {
             AppUser user = post.getUser();
             Moderator moderator = post.getModerator();
@@ -223 +234 @@
                 model.addAttribute("moderatorLastName", moderator.getLastName());
             }
-            double total = post.getFundsCollected().stream().mapToDouble(FundsCollected::getFunds).sum();
-            model.addAttribute("total", total);
         } else {
             model.addAttribute("notFound", true);
@@ -250 +259 @@
                 return String.format("redirect:/post?postid=%d&error", postid);
             }
-            post.setFundsNeeded(donatedAmount);
         } catch (NumberFormatException e) {
             return String.format("redirect:/post?postid=%d&error", postid);
@@ -259 +267 @@
 
         post.getFundsCollected().add(funds);
+        post.setTotalFundsCollected(post.getTotalFundsCollected() + donatedAmount);
+
+        if(post.getRiskFactor() != 101) {
+            post.setRiskFactor(getRisk(post));
+        }
+
         donationPostService.save(post);
 
@@ -295 +309 @@
     public AppUser addAttributes() {
         if (SecurityContextHolder.getContext().getAuthentication().getPrincipal() != "anonymousUser") {
-            return (AppUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+
+            String email = SecurityContextHolder.getContext().getAuthentication().getName();
+            return userService.loadUserByUsername(email);
         }
         return null;
     }
+
+    private Integer getRisk(DonationPost post) {
+        float dailyAverage = post.getTotalFundsCollected() / (Duration.between(post.getCreatedAt().atTime(0, 0, 0), LocalDate.now().atTime(0, 0, 0)).toDays()+1);
+        float neededAverage = (post.getFundsNeeded() - post.getTotalFundsCollected()) / (Duration.between(LocalDate.now().atTime(0, 0, 0), post.getDateDue().atTime(0, 0, 0)).toDays()+1);
+
+        System.out.println(dailyAverage + " " + neededAverage);
+        int risk = (int) (dailyAverage / neededAverage * 100);
+
+        if(risk > 100) {
+            risk = 100;
+        }
+
+        if(Duration.between(LocalDate.now().atTime(0, 0, 0), post.getDateDue().atTime(0, 0, 0)).toDays() == 0) {
+            risk = 0;
+        }
+
+        if(post.getFundsNeeded() <= post.getTotalFundsCollected()) {
+            risk = 101;
+        }
+
+        return risk;
+    }
 }

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

@@ -129 +129 @@
     @ModelAttribute("user")
     public AppUser addAttributes() {
-        if(SecurityContextHolder.getContext().getAuthentication().getPrincipal() != "anonymousUser") {
-            return (AppUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        if (SecurityContextHolder.getContext().getAuthentication().getPrincipal() != "anonymousUser") {
+            String email = SecurityContextHolder.getContext().getAuthentication().getName();
+            System.out.println(email);
+            return userService.loadUserByUsername(email);
         }
         return null;

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

@@ -115 +115 @@
             fundsCollectedService.save(funds);
             post.getFundsCollected().add(funds);
+            post.setTotalFundsCollected(post.getTotalFundsCollected() + amount);
             donationPostService.save(post);
         }
@@ -122 +123 @@
     @ModelAttribute("user")
     public AppUser addAttributes() {
-        if(SecurityContextHolder.getContext().getAuthentication().getPrincipal() != "anonymousUser") {
-            return (AppUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        if (SecurityContextHolder.getContext().getAuthentication().getPrincipal() != "anonymousUser") {
+
+            String email = SecurityContextHolder.getContext().getAuthentication().getName();
+            return userService.loadUserByUsername(email);
         }
         return null;

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

@@ -61 +61 @@
     private List<FundsCollected> fundsCollected = new ArrayList<>();
 
+    private Float totalFundsCollected = 0f;
+    private LocalDate createdAt;
+    private Integer riskFactor = 101;
+
     @Transient
     public List<String> getImagesPath() {
@@ -222 +226 @@
         this.fundsCollected = fundsCollected;
     }
+
+    public Float getTotalFundsCollected() {
+        return totalFundsCollected;
+    }
+
+    public void setTotalFundsCollected(Float totalFundsCollected) {
+        this.totalFundsCollected = totalFundsCollected;
+    }
+
+    public LocalDate getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(LocalDate createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Integer getRiskFactor() {
+        return riskFactor;
+    }
+
+    public void setRiskFactor(Integer riskFactor) {
+        this.riskFactor = riskFactor;
+    }
 }

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

@@ -3 +3 @@
 import it.finki.charitable.entities.UserRole;
 import it.finki.charitable.services.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 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;
@@ -14 +14 @@
 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
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
+
+    @Autowired
+    private UserO2AuthService userO2AuthService;
+    @Autowired
+    private O2AuthSuccessHandler o2AuthSuccessHandler;
 
     private final UserService userService;
@@ -41 +41 @@
             "/album/**",
             "/post",
-            "/post-photos/**"
+            "/post-photos/**",
+            "/oauth2/authorization/google"
     };
 
@@ -58 +59 @@
                 .successHandler(authenticationSuccessHandler)
                 .and()
+                .oauth2Login()
+                .loginPage("/login")
+                .userInfoEndpoint()
+                .userService(userO2AuthService)
+                .and()
+                .successHandler(o2AuthSuccessHandler)
+                .and()
                 .logout().logoutRequestMatcher(new AntPathRequestMatcher("/logout"))
                 .logoutSuccessUrl("/").deleteCookies("remember-me")
@@ -73 +81 @@
     };
 
+
+
     @Override
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {

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

@@ -1 +1 @@
 package it.finki.charitable.services;
 
+import it.finki.charitable.entities.EmailMessage;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
@@ -9 +11 @@
 
     private final JavaMailSender javaMailSender;
+    private final EmailMessageService emailMessageService;
 
-    public EmailService(JavaMailSender javaMailSender) {
+    public EmailService(JavaMailSender javaMailSender, EmailMessageService emailMessageService) {
         this.javaMailSender = javaMailSender;
+        this.emailMessageService = emailMessageService;
     }
 
@@ -20 +24 @@
 
         String text = "Verify your account on the following link\n" +
-                "http://localhost:8080/validate?token=" + token;
+                "http://localhost:9091/validate?token=" + token;
         message.setText(text);
-        javaMailSender.send(message);
+        sendMail(message);
     }
 
@@ -30 +34 @@
         message.setSubject(subject);
 
-        String text = "Your post has been approved\n" + "http://localhost:8080/post?postid=" + postId;
+        String text = "Your post has been approved\n" + "http://localhost:9091/post?postid=" + postId;
         message.setText(text);
-        javaMailSender.send(message);
+        sendMail(message);
     }
 
@@ -43 +47 @@
                 "Moderator:\n" + description;
         message.setText(text);
-        javaMailSender.send(message);
+        sendMail(message);
     }
 
@@ -54 +58 @@
                 "Moderator:\n" + description;
         message.setText(text);
-        javaMailSender.send(message);
+        sendMail(message);
+    }
+
+    @Async
+    public void sendMail(SimpleMailMessage message) {
+        try {
+            javaMailSender.send(message);
+
+        } catch (Exception e) {
+            emailMessageService.save(new EmailMessage(message.getTo()[0], message.getSubject(), message.getText()));
+        }
     }
 }

src/main/java/it/finki/charitable/util/AutomaticEvents.java

@@ -2 +2 @@
 
 import it.finki.charitable.entities.AppUser;
+import it.finki.charitable.entities.DonationPost;
+import it.finki.charitable.entities.EmailMessage;
 import it.finki.charitable.security.ConfirmationToken;
-import it.finki.charitable.services.ConfirmationTokenService;
-import it.finki.charitable.services.UserService;
+import it.finki.charitable.services.*;
+import org.springframework.mail.SimpleMailMessage;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.time.Duration;
+import java.time.LocalDate;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Component
@@ -15 +20 @@
     private final UserService userService;
     private final ConfirmationTokenService confirmationTokenService;
+    private final DonationPostService donationPostService;
+    private final EmailMessageService emailMessageService;
+    private final EmailService emailService;
 
-    public AutomaticEvents(UserService userService, ConfirmationTokenService confirmationTokenService) {
+    public AutomaticEvents(UserService userService, ConfirmationTokenService confirmationTokenService, DonationPostService donationPostService, EmailMessageService emailMessageService, EmailService emailService) {
         this.userService = userService;
         this.confirmationTokenService = confirmationTokenService;
+        this.donationPostService = donationPostService;
+        this.emailMessageService = emailMessageService;
+        this.emailService = emailService;
     }
 
@@ -32 +43 @@
         }
     }
+
+    @Scheduled(cron = "0 0 0 * * *")
+    public void setRisk() {
+        System.out.println("cron");
+        List<DonationPost> donationPosts = donationPostService.findAll();
+        donationPosts = donationPosts.stream().filter(post -> {
+            long daysToEnd = Duration.between(LocalDate.now().atTime(0, 0, 0), post.getDateDue().atTime(0, 0, 0)).toDays();
+            long totalDays = Duration.between(post.getCreatedAt().atTime(0, 0, 0), post.getDateDue().atTime(0, 0, 0)).toDays();
+            System.out.println(daysToEnd + " " + totalDays);
+
+            if(totalDays < 10)
+                return true;
+
+            return (daysToEnd * 1f/totalDays) * 100 < 75;
+        }).collect(Collectors.toList());
+
+        donationPosts.forEach(post -> {
+            float dailyAverage = post.getTotalFundsCollected() / (Duration.between(post.getCreatedAt().atTime(0, 0, 0), LocalDate.now().atTime(0, 0, 0)).toDays() + 1);
+            float neededAverage = (post.getFundsNeeded() - post.getTotalFundsCollected()) / (Duration.between(LocalDate.now().atTime(0, 0, 0), post.getDateDue().atTime(0, 0, 0)).toDays()+1);
+
+            System.out.println(dailyAverage + " " + neededAverage);
+            int risk = (int) (dailyAverage / neededAverage * 100);
+
+            if(risk > 100) {
+                risk = 100;
+            }
+
+            if(Duration.between(LocalDate.now().atTime(0, 0, 0), post.getDateDue().atTime(0, 0, 0)).toDays() == 0) {
+                risk = 0;
+            }
+
+            if(post.getFundsNeeded() <= post.getTotalFundsCollected()) {
+                risk = 101;
+            }
+
+            post.setRiskFactor(risk);
+            donationPostService.save(post);
+        });
+    }
+
+    @Scheduled(cron = "0 0 * * * *")
+    public void sendMessages() {
+        List<EmailMessage> messages = emailMessageService.findAll();
+        for(EmailMessage message: messages) {
+            SimpleMailMessage simpleMailMessage = new SimpleMailMessage();
+            simpleMailMessage.setTo(message.getSendTo());
+            simpleMailMessage.setSubject(message.getSubject());
+            simpleMailMessage.setText(message.getText());
+            emailService.sendMail(simpleMailMessage);
+            emailMessageService.delete(message);
+        }
+    }
 }

src/main/resources/application.properties

@@ -19 +19 @@
 
 server.port=9091
+
+spring.security.oauth2.client.registration.google.client-id=365912873832-mqicpsq1fbbi8e01ghslpulgblkngk3l.apps.googleusercontent.com
+spring.security.oauth2.client.registration.google.client-secret=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
+spring.security.oauth2.client.registration.google.scope=profile,email
+
+spring.security.oauth2.client.registration.facebook.client-id=429047632308553
+spring.security.oauth2.client.registration.facebook.client-secret=c13280b6c116663c5bdd85c5b7a986e1
+spring.security.oauth2.client.registration.facebook.scope=public_profile,email

src/main/resources/templates/album.html

@@ -1 +1 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="https://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8"/>
@@ -7 +7 @@
     <!-- Bootstrap core CSS -->
     <link href="css/bootstrap.min.css" rel="stylesheet"/>
+    <link rel="stylesheet" href="css/risk.css"/>
 </head>
 <body>
@@ -26 +27 @@
                         <option value="dateDue">Date due</option>
                         <option value="fundsNeeded">Funds needed</option>
+                        <option value="riskFactor">Chance to collect funds</option>
                     </select>
                 </div>
@@ -47 +49 @@
             <div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 g-3">
                 <div class="col" th:each="post : ${postList}">
-                    <div class="card shadow-sm">
+                    <div class="card shadow-sm" th:classappend="${post.riskFactor < 25 ? 'red' : (post.riskFactor < 50 ? 'orange' : (post.riskFactor < 75 ? 'yellow' : (post.riskFactor < 100 ? 'light-yellow' : (post.riskFactor == 100 ? 'green' : '') )))}">
                         <img class="card-img" style="object-fit: contain" width="100%" height="225"
                              th:src="${post.imagesPath[0]}">
@@ -53 +55 @@
                             <h4 th:text="${post.title}" style="height: 60px"></h4>
                             <p class="card-text text-truncate" style="height: 45px" th:text="${post.description}"></p>
+                            <span th:if="${post.riskFactor < 101}" class="" style="color: black; margin-left: 62%;">Chance: <small th:text="${post.riskFactor}"></small></span>
+                            <span th:unless="${post.riskFactor < 101}" style="color: black; margin-left: 62%;">Chance: unavailable</span>
                             <div class="d-flex justify-content-between align-items-center">
                                 <div class="btn-group">
-                                    <a class="btn btn-sm btn-outline-secondary" th:href="@{/post(postid=${post.id})}">Open</a>
+                                    <a class="btn btn-sm btn-outline-secondary" style="color: black" th:href="@{/post(postid=${post.id})}">Open</a>
                                 </div>
-                                <span class="text-muted">Date due: <small th:text="${post.dateDue}"></small></span>
+                                <span class="" style="color: black">Date due: <small th:text="${post.dateDue}"></small></span>
                             </div>
                         </div>

src/main/resources/templates/login.html

@@ -27 +27 @@
         <button class="w-100 btn btn-lg btn-primary" type="submit">Sign in</button>
     </form>
+    <a th:href="@{/oauth2/authorization/google}" class="btn btn-primary">Continue with google</a>
+    <a th:href="@{/oauth2/authorization/facebook}" class="btn btn-primary">Continue with facebook</a>
     <p th:if="${param.error != null}" class="text-danger">Incorrect username or password</p>
     <p th:if="${successValidation}" class="text-success">Account validated</p>

src/main/resources/templates/post.html

@@ -50 +50 @@
             <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="${post.totalFundsCollected}"></span>/<span th:text="${post.fundsNeeded}"></span> - <span th:text="${post.currency}"></span></p>
             <h5>Date due:</h5>
             <p th:text="${post.dateDue}"></p>