Changeset b8dc761 for src/main/java/it/finki/charitable/controller

Timestamp:

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

Author:

NikolaCenevski <cenevskinikola@…>

Branches:

master

Children:

6fa3d09

Parents:

881a233

Message:

part 2

Location:

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

Files:

• DonationPostController.java (modified) (8 diffs)
• HomeController.java (modified) (1 diff)
• UserProfileController.java (modified) (2 diffs)

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;