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

Timestamp:

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

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

b2e6513

Parents:

7bb19d4

Message:

paying session fix

File:

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

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;