Changeset 3b17c69

Timestamp:

02/12/22 15:38:23 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

0707e4e

Parents:

b6e52e1

Message:

fix

Location:

sources/app/src/main/java/parkup

Files:

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

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

@@ -21 +21 @@
     public List<ParkingSession> getAllParkingSessions(@PathVariable Integer parkingZoneId) {
         return parkingSessionService.getAllParkingSessionsFromZone(parkingZoneId);
+    }
+    @GetMapping({"/parkingSession"})
+    public ParkingSession getParkingSession(){
+        return parkingSessionService.getParkingSession();
     }
 

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

@@ -77 +77 @@
         Authentication token = ParkUpApplication.getToken();
         Plate plate = plateRepository.findByPlate(tablica);
-        if(plate ==null) {
-            plateRepository.save(new Plate(tablica));
-        }
-        plate = plateRepository.findByPlate(tablica);
         ParkingSession sessionToAdd = new ParkingSession(plate);
         sessionToAdd.setParkingZone(parkingZone);
@@ -145 +141 @@
     @Transactional
     public ParkingSession endParkingSession(){
-        Authentication token = ParkUpApplication.getToken();
-        String role =token.getAuthorities().stream().findFirst().get().getAuthority();
-        String email =token.getName();
-        ParkingSession session;
-        if(role.equals("ROLE_REG_USER")){
-            RegisteredUser user = registeredUserRepository.findRegisteredUserByEmail(email).get();
-            session=user.getSession();
-        }
-        else{
-            Guest user = guestRepository.findGuestByEmail(email).get();
-            session=user.getSession();
-        }
-        if(session==null){
-            throw new IllegalStateException("No such session exists");
-        }
-        else if(session.getStatus()==SessionStatus.ENDED_UNPAID){
+        ParkingSession parkingSession=getParkingSession();
+        if(parkingSession==null){
+            throw new IllegalStateException("No such session exists");
+        }
+        else if(parkingSession.getStatus()==SessionStatus.ENDED_UNPAID){
             throw new IllegalStateException("The session you are trying to end has already been ended");
         }
-        session.setStatus(SessionStatus.ENDED_UNPAID);
-        session.setTimeEnd(LocalDateTime.now());
-        return session;
-//        ParkingSession parkingSession = parkingSessionRepository.findByPssId(id);
-//        if(parkingSession==null){
-//            throw new IllegalStateException("No such session exists");
-//        }
-//        else if(parkingSession.getStatus()==SessionStatus.ENDED_UNPAID){
-//            throw new IllegalStateException("The session you are trying to end has already been ended");
-//        }
-//        parkingSession.setStatus(SessionStatus.ENDED_UNPAID);
-//        parkingSession.setTimeEnd(LocalDateTime.now());
-//        return parkingSession;
+        parkingSession.setStatus(SessionStatus.ENDED_UNPAID);
+        parkingSession.setTimeEnd(LocalDateTime.now());
+        return parkingSession;
     }
     @Transactional
@@ -196 +171 @@
                 throw new IllegalStateException("Your card has expired or the date that you have entered is incorrect");
         }
+        ParkingSession parkingSession=getParkingSession();
+        if(parkingSession==null){
+            throw new IllegalStateException("No such session exists");
+        }
+        else if(parkingSession.getStatus()==SessionStatus.ENDED_PAID){
+            throw new IllegalStateException("The session has already been paid for");
+        }
+        parkingSession.setStatus(SessionStatus.ENDED_PAID);
+        parkingSession.getParkingSpace().setTaken(false);
+        return true;
+    }
+
+    public SessionStatus getStatusOfParkirac(int regParkId){
+        RegisteredUser registeredUser = registeredUserRepository.findByRegParkId(regParkId);
+        List<String> plates =parkingSessionRepository.findAll().stream().filter(ps->registeredUser.getPlates().contains(ps.getPlate())).map(ps->ps.getPlate().getPlate()).collect(Collectors.toList());
+        if(plates.size()>0)
+        return parkingSessionRepository.findAll().stream().filter(ps->ps.getPlate().getPlate().equals(plates.get(0))).collect(Collectors.toList()).get(0).getStatus();
+        return null;
+    }
+
+    public ParkingSession getParkingSession() {
         Authentication token = ParkUpApplication.getToken();
         String role =token.getAuthorities().stream().findFirst().get().getAuthority();
@@ -208 +204 @@
             parkingSession=user.getSession();
         }
-        if(parkingSession==null){
-            throw new IllegalStateException("No such session exists");
-        }
-        else if(parkingSession.getStatus()==SessionStatus.ENDED_PAID){
-            throw new IllegalStateException("The session has already been paid for");
-        }
-        parkingSession.setStatus(SessionStatus.ENDED_PAID);
-        parkingSession.getParkingSpace().setTaken(false);
-        return true;
-    }
-
-    public SessionStatus getStatusOfParkirac(int regParkId){
-        RegisteredUser registeredUser = registeredUserRepository.findByRegParkId(regParkId);
-        List<String> plates =parkingSessionRepository.findAll().stream().filter(ps->registeredUser.getPlates().contains(ps.getPlate())).map(ps->ps.getPlate().getPlate()).collect(Collectors.toList());
-        if(plates.size()>0)
-        return parkingSessionRepository.findAll().stream().filter(ps->ps.getPlate().getPlate().equals(plates.get(0))).collect(Collectors.toList()).get(0).getStatus();
-        return null;
+        return parkingSession;
     }
 }