Changeset ebc5eee

Timestamp:

02/13/22 12:52:33 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

c52cdbb

Parents:

0ad69c1

Message:

fix

Location:

sources/app/src/main/java/parkup

Files:

• controllers/ParkingSessionController.java (modified) (1 diff)
• services/ParkingSessionService.java (modified) (1 diff)

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

@@ -50 +50 @@
 
     @DeleteMapping({"/parkingSession/{parkingSessionId}"})
-    public ParkingSession deleteParkingSession(@PathVariable int parkingSessionId) {
+    public Optional<ParkingSession> deleteParkingSession(@PathVariable int parkingSessionId) {
         return this.parkingSessionService.deleteParkingSession(parkingSessionId);
     }

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

@@ -59 +59 @@
 
     @Transactional
-    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));
+    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);
+            registeredUserRepository.findAll().stream().filter(u->u.getSession().equals(parkingSessionOpt.get())).forEach(u->u.setSession(null));
+            guestRepository.findAll().stream().filter(u->u.getSession().equals(parkingSessionOpt.get())).forEach(u->u.setSession(null));
             parkingSessionRepository.deleteByPssId(parkingSessionId);
-            return parkingSession;
+            return parkingSessionOpt;
         } else {
             throw new IllegalStateException("ParkingSpace doesn't exist, therefore can't be deleted");