Changeset 0ad69c1

Timestamp:

02/13/22 12:46:15 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

ebc5eee

Parents:

b2e6513

Message:

test route

Location:

sources/app

Files:

• src/main/java/parkup/controllers/ParkingSessionController.java (modified) (2 diffs)
• src/main/java/parkup/controllers/ParkingZoneController.java (modified) (1 diff)
• src/main/java/parkup/controllers/RegisteredUserController.java (modified) (1 diff)
• src/main/java/parkup/entities/ParkingZone.java (modified) (2 diffs)
• src/main/java/parkup/services/ParkingSessionService.java (modified) (3 diffs)
• src/main/java/parkup/services/ParkingZoneService.java (modified) (1 diff)
• target/classes/parkup/configs/webConfigs/WebSecurityConfig.class (modified) ( previous)
• target/classes/parkup/controllers/ParkingSessionController.class (modified) ( previous)
• target/classes/parkup/services/GuestService.class (modified) ( previous)
• target/classes/parkup/services/ParkingSessionService.class (modified) ( previous)

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

@@ -40 +40 @@
         return this.parkingSessionService.verifyParkingSession(parkingSessionId,parkingSpaceName);
     }
-    @GetMapping("/parkingSession/calculate")
+    @GetMapping("/parkingSession/end/calculate")
     public int calculateParkingSession(){
         return this.parkingSessionService.calculatePayment();
@@ -50 +50 @@
 
     @DeleteMapping({"/parkingSession/{parkingSessionId}"})
-    public Optional<ParkingSession> deleteParkingSession(@PathVariable int parkingSessionId) {
+    public ParkingSession deleteParkingSession(@PathVariable int parkingSessionId) {
         return this.parkingSessionService.deleteParkingSession(parkingSessionId);
     }

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

@@ -34 +34 @@
     }
 
+    @GetMapping({"/parkingZone/name/{parkingZoneName}"})
+    public ParkingZone getParkingZone(@PathVariable String parkingZoneName){
+        return parkingZoneService.getParkingZoneByName(parkingZoneName);
+    }
+
     @GetMapping({"parkingZone/parkingZoneNames"})
     public List<String> getParkingZoneNames(){

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

@@ -84 +84 @@
         return registrationServiceRP.confirmToken(token);
     }
+
+    @GetMapping({"/testToken"})
+    public boolean testToken(){
+        return true;
+    }
 }

sources/app/src/main/java/parkup/entities/ParkingZone.java

@@ -49 +49 @@
     private String color;
 
-//    @ManyToMany(cascade = {CascadeType.ALL})
-//    private List<Vraboten> odgovorniLica;
-
     @OneToMany(cascade = {CascadeType.ALL})
     private List<ParkingSpace> parkingSpaces;
@@ -57 +54 @@
     @Transient
     private List<String> responsibleWorkers;
-
-
 
     @OneToOne(cascade = {CascadeType.ALL})

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

@@ -59 +59 @@
 
     @Transactional
-    public Optional<ParkingSession> deleteParkingSession(int parkingSessionId) {
-        Optional<ParkingSession> parkingSessionOpt = Optional.ofNullable(parkingSessionRepository.findByPssId(parkingSessionId));
-        if (parkingSessionOpt.isPresent()) {
-            if(parkingSessionOpt.get().getStatus()!=SessionStatus.STARTED_UNVERIFIED)
-            parkingSessionOpt.get().getParkingSpace().setTaken(false);
-            parkingSessionOpt.get().setPlate(null);
+    public ParkingSession deleteParkingSession(int parkingSessionId) {
+       ParkingSession parkingSession = getParkingSession();
+        if (parkingSession!=null) {
+            if(parkingSession.getStatus()!=SessionStatus.STARTED_UNVERIFIED)
+                parkingSession.getParkingSpace().setTaken(false);
+            parkingSession.setPlate(null);
+            registeredUserRepository.findAll().stream().filter(u->u.getSession().equals(parkingSession)).forEach(u->u.setSession(null));
+            guestRepository.findAll().stream().filter(u->u.getSession().equals(parkingSession)).forEach(u->u.setSession(null));
             parkingSessionRepository.deleteByPssId(parkingSessionId);
-            return parkingSessionOpt;
+            return parkingSession;
         } else {
             throw new IllegalStateException("ParkingSpace doesn't exist, therefore can't be deleted");
@@ -142 +144 @@
     @Transactional
     public boolean payParkingSession(String date){
+        if(!date.isEmpty()){
         String expMonthString=date.split("/")[0];
         String expYearString=date.split("/")[1];
@@ -159 +162 @@
                 throw new IllegalStateException("Your card has expired or the date that you have entered is incorrect");
         }
+        }
         ParkingSession parkingSession=getParkingSession();
         if(parkingSession==null){

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

@@ -204 +204 @@
 
         }
-    }
-
+
+        public ParkingZone getParkingZoneByName(String parkingZoneName){
+            return parkingZoneRepository.findByPzName(parkingZoneName);
+        }
+    }
+