Changeset f0d5cb7

Timestamp:

09/03/21 11:25:12 (3 years ago)

Author:

KostaFortumanov <kfortumanov@…>

Branches:

master

Children:

f8007b3

Parents:

5577566

Message:

Added moderator class

Location:

src/main

Files:

• java/it/finki/charitable/controller/DonationPostController.java (modified) (2 diffs)
• java/it/finki/charitable/controller/HomeController.java (modified) (2 diffs)
• java/it/finki/charitable/controller/UserProfileController.java (modified) (4 diffs)
• java/it/finki/charitable/entities/AppUser.java (modified) (3 diffs)
• java/it/finki/charitable/entities/MainUser.java (added)
• java/it/finki/charitable/entities/Moderator.java (added)
• resources/application.properties (modified) (1 diff)

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

@@ -1 +1 @@
 package it.finki.charitable.controller;
 
-import it.finki.charitable.entities.AppUser;
-import it.finki.charitable.entities.DonationInformation;
-import it.finki.charitable.entities.DonationPost;
-import it.finki.charitable.entities.FundsCollected;
+import it.finki.charitable.entities.*;
 import it.finki.charitable.services.DonationInformationService;
 import it.finki.charitable.services.DonationPostService;
@@ -183 +180 @@
         DonationInformation donationInformation = new DonationInformation(amount, post.getId(), post.getTitle());
         donationInformationService.save(donationInformation);
-        AppUser user = userService.loadUserByUsername(SecurityContextHolder.getContext().getAuthentication().getName());
+        MainUser user = (MainUser) userService.loadUserByUsername(SecurityContextHolder.getContext().getAuthentication().getName());
         user.getDonationInformation().add(donationInformation);
         userService.saveUser(user);

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

@@ -2 +2 @@
 
 import it.finki.charitable.entities.AppUser;
+import it.finki.charitable.entities.MainUser;
+import it.finki.charitable.entities.Moderator;
 import it.finki.charitable.entities.UserRole;
 import it.finki.charitable.security.ConfirmationToken;
@@ -89 +91 @@
         }
 
-        AppUser user = new AppUser();
+        AppUser user = new MainUser();
         user.setFirstName(firstName);
         user.setLastName(lastName);

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

@@ -4 +4 @@
 import it.finki.charitable.entities.DonationInformation;
 import it.finki.charitable.entities.DonationPost;
+import it.finki.charitable.entities.MainUser;
 import it.finki.charitable.security.PasswordEncoder;
 import it.finki.charitable.services.DonationPostService;
@@ -37 +38 @@
     public String myDonations(Model model) {
         model.addAttribute("myDonations", true);
-        AppUser user = userService.loadUserByUsername(SecurityContextHolder.getContext().getAuthentication().getName());
+        MainUser user = (MainUser) userService.loadUserByUsername(SecurityContextHolder.getContext().getAuthentication().getName());
         List<DonationInformation> donations = user.getDonationInformation();
         model.addAttribute("donations", donations);
@@ -89 +90 @@
         }
 
-        AppUser user = (AppUser) model.getAttribute("user");
+        MainUser user = (MainUser) model.getAttribute("user");
         user.setCreditCardInfo(cardName + "," + cardNumber + "," + expiryDate + "," + cvv);
         userService.saveUser(user);
@@ -98 +99 @@
     @RequestMapping("/removeCardInfo")
     public String removeCardInfo(Model model) {
-        AppUser user = (AppUser) model.getAttribute("user");
+        MainUser user = (MainUser) model.getAttribute("user");
         user.setCreditCardInfo(null);
         userService.saveUser(user);

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

@@ -36 +36 @@
     private String email;
     private String password;
-    private String creditCardInfo;
     @Enumerated(EnumType.STRING)
     private UserRole userRole;
     private Boolean enabled;
-
-    @OneToMany
-    private List<DonationInformation> donationInformation = new ArrayList<>();
 
     public AppUser() {
@@ -83 +79 @@
     }
 
-    public String getCreditCardInfo() {
-        return creditCardInfo;
-    }
-
-    public void setCreditCardInfo(String creditCardInfo) {
-        this.creditCardInfo = creditCardInfo;
-    }
-
     public UserRole getUserRole() {
         return userRole;
@@ -105 +93 @@
     public void setEnabled(Boolean enabled) {
         this.enabled = enabled;
-    }
-
-    public List<DonationInformation> getDonationInformation() {
-        return donationInformation;
-    }
-
-    public void setDonationInformation(List<DonationInformation> donationInformation) {
-        this.donationInformation = donationInformation;
     }
 

src/main/resources/application.properties

@@ -1 +1 @@
 spring.datasource.url=jdbc:postgresql://localhost:5432/charitable
 spring.datasource.username=postgres
-spring.datasource.password=postgresql
+spring.datasource.password=postgres
 spring.thymeleaf.cache=false
 spring.jpa.hibernate.ddl-auto=update