Changeset ad4da86 for sources/app/src/main/java/parkup/services/ParkingSessionService.java

Timestamp:

02/10/22 11:13:18 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

ccb2d72

Parents:

0c049e9

Message:

calculate payment fix and added error handling

File:

• sources/app/src/main/java/parkup/services/ParkingSessionService.java (modified) (3 diffs)

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

@@ -41 +41 @@
         return parkingSessionRepository.findAll().stream()
                 .filter(s->!s.getStatus().equals(SessionStatus.ENDED_PAID))
+                .collect(Collectors.toList());
+    }
+
+    public List<ParkingSession> getAllParkingSessionsFromZone(Integer pzId) {
+        //Get all sessions that arent paid
+
+        return parkingSessionRepository.findAll().stream()
+                .filter(s->!s.getStatus().equals(SessionStatus.ENDED_PAID) && s.getParkingZone().getId()==pzId)
                 .collect(Collectors.toList());
     }
@@ -92 +100 @@
             throw new IllegalStateException("No such session exists");
         }
-        else if(session.getStatus()== SessionStatus.ENDED_UNPAID){
-            throw new IllegalStateException("Cannot calculate payment on an ended session");
-        }
+//        else if(session.getStatus()!= SessionStatus.ENDED_PAID){
+//            throw new IllegalStateException("Cannot calculate payment on a paid session");
+//        }
         int price = session.getParkingZone().getPrice();
-        return (int) (Math.ceil(Duration.between(session.getTimeEnd(),session.getTimeStart()).toMinutes()/60.0)*price);
+        return (int) (Math.ceil(Duration.between(session.getTimeStart(),session.getTimeEnd()).toMinutes()/60.0)*price);
     }
     @Transactional
@@ -111 +119 @@
         if(!parkingZone.getParkingSpaces().contains(parkingSpaceRepository.findByPsName(parkingSpaceName))){
             throw new IllegalStateException("Ivalid parking space inserted. Type in a new parking space or let the admin know that they should add the parking space to this zone");
+        }
+        if(parkingSpaceRepository.findByPsName(parkingSpaceName).isTaken()){
+            throw new IllegalStateException("Ivalid parking space inserted. Type in a new parking space, this space is already in a session");
         }
         parkingSession.setStatus(SessionStatus.STARTED_VERIFIED);