Changeset bfc49f4

Timestamp:

02/12/22 17:21:18 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

b2e6513

Parents:

7bb19d4

Message:

paying session fix

Location:

sources/app/src/main/java/parkup

Files:

• configs/webConfigs/WebSecurityConfig.java (modified) (3 diffs)
• controllers/ParkingSessionController.java (modified) (1 diff)
• services/GuestService.java (modified) (4 diffs)
• services/ParkingSessionService.java (modified) (2 diffs)

sources/app/src/main/java/parkup/configs/webConfigs/WebSecurityConfig.java

@@ -14 +14 @@
 import parkup.configs.CustomAuthorizationFilter;
 import parkup.services.AdministratorService;
+import parkup.services.GuestService;
 import parkup.services.RegisteredUserService;
 import parkup.services.WorkerService;
@@ -26 +27 @@
         private final RegisteredUserService registeredUserService;
         private final AdministratorService administratorService;
+        private final GuestService guestService;
 
-        public WebSecurityConfig(WorkerService workerService, BCryptPasswordEncoder bCryptPasswordEncoder, RegisteredUserService registeredUserService, AdministratorService administratorService) {
+        public WebSecurityConfig(WorkerService workerService, BCryptPasswordEncoder bCryptPasswordEncoder, RegisteredUserService registeredUserService, AdministratorService administratorService, GuestService guestService) {
             this.workerService = workerService;
             this.bCryptPasswordEncoder = bCryptPasswordEncoder;
             this.registeredUserService = registeredUserService;
             this.administratorService = administratorService;
+            this.guestService = guestService;
         }
 
@@ -39 +42 @@
             auth.userDetailsService(workerService).passwordEncoder(bCryptPasswordEncoder);
             auth.userDetailsService(administratorService).passwordEncoder(bCryptPasswordEncoder);
-
+            auth.userDetailsService(guestService).passwordEncoder(bCryptPasswordEncoder);
         }
 

sources/app/src/main/java/parkup/controllers/ParkingSessionController.java

@@ -40 +40 @@
         return this.parkingSessionService.verifyParkingSession(parkingSessionId,parkingSpaceName);
     }
-    @GetMapping("/parkingSession/calculate/{parkingSessionId}")
-    public int calculateParkingSession(@PathVariable int parkingSessionId){
-        return this.parkingSessionService.calculatePayment(parkingSessionId);
+    @GetMapping("/parkingSession/calculate")
+    public int calculateParkingSession(){
+        return this.parkingSessionService.calculatePayment();
     }
     @PutMapping("/parkingSession/pay")
-    public boolean payParkingSession(@RequestParam String expireDate){
+    public boolean payParkingSession(@RequestParam(required = false) String expireDate){
         return this.parkingSessionService.payParkingSession(expireDate);
     }

sources/app/src/main/java/parkup/services/GuestService.java

@@ -4 +4 @@
 import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -10 +13 @@
 
 @Service
-public class GuestService {
+public class GuestService implements UserDetailsService {
     private final GuestRepository guestRepository;
     private final BCryptPasswordEncoder passwordEncoder;
@@ -34 +37 @@
             throw new IllegalStateException("Email already taken, try adding a guest with a different valid email address");
         } else {
-//            guest.setPassword(passwordEncoder.encode(Math.random()));
+            double random = Math.random()*100;
+            guest.setPassword(passwordEncoder.encode(Double.toString(random)));
             this.guestRepository.save(guest);
         }
@@ -47 +51 @@
         }
     }
+
+    @Override
+    public UserDetails loadUserByUsername(String s) throws UsernameNotFoundException {
+        return guestRepository.findGuestByEmail(s)
+                .orElseThrow(() ->
+                        new UsernameNotFoundException("Email not found"));
+    }
 }

sources/app/src/main/java/parkup/services/ParkingSessionService.java

@@ -93 +93 @@
 
     }
-
-//    public void executePayment(int id){
-//        ParkingSession session = parkingSessionRepository.findByPssId(id);
-//        if(session==null){
-//            throw new IllegalStateException("No such session exists");
-//        }
-//        else if(session.getStatus()== SessionStatus.ENDED_UNPAID){
-//            throw new IllegalStateException("Cannot execute payment on an ended session");
-//        }
-//        session.setStatus(SessionStatus.ENDED_PAID);
-//    }
-
-    public int calculatePayment(int id){
-        ParkingSession session = parkingSessionRepository.findByPssId(id);
+    public int calculatePayment(){
+        ParkingSession session = getParkingSession();
         if(session==null){
             throw new IllegalStateException("No such session exists");
@@ -182 +170 @@
         parkingSession.getParkingSpace().setTaken(false);
         registeredUserRepository.findAll().stream().filter(rp->rp.getSession().getStatus().equals(SessionStatus.ENDED_PAID)).forEach(rp->rp.setSession(null));
+        guestRepository.findAll().stream().filter(g->g.getSession().getStatus().equals(SessionStatus.ENDED_PAID)).forEach(g->g.setSession(null));
+        guestRepository.deleteAll(guestRepository.findAll().stream().filter(g-> g.getSession() == null).collect(Collectors.toList()));
         parkingSessionRepository.deleteByPssId(parkingSession.getPssId());
         return true;