Changeset 0707e4e

Timestamp:

02/12/22 15:44:00 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

843a941

Parents:

3b17c69

Message:

fix

File:

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

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

@@ -49 +49 @@
 
         return parkingSessionRepository.findAll().stream()
-                .filter(s->!s.getStatus().equals(SessionStatus.ENDED_PAID) && s.getParkingZone().getId()==pzId)
+                .filter(s->!s.getStatus().equals(SessionStatus.ENDED_PAID) && s.getParkingZone()!=null && s.getParkingZone().getId()==pzId)
                 .collect(Collectors.toList());
     }
@@ -110 +110 @@
             throw new IllegalStateException("No such session exists");
         }
-//        else if(session.getStatus()!= SessionStatus.ENDED_PAID){
-//            throw new IllegalStateException("Cannot calculate payment on a paid session");
-//        }
+        else if(session.getStatus()!= SessionStatus.ENDED_PAID){
+            throw new IllegalStateException("Cannot calculate payment on a session that is not ended");
+        }
         int price = session.getParkingZone().getPrice();
         return (int) (Math.ceil(Duration.between(session.getTimeStart(),session.getTimeEnd()).toMinutes()/60.0)*price);