Changeset ccb2d72 for sources/app/src/main/java/parkup/services

Timestamp:

02/10/22 12:55:53 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

d770228

Parents:

ad4da86

Message:

fix in verifyParkingSession

File:

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

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

@@ -107 +107 @@
     }
     @Transactional
-    public ParkingSession verifyParkingSession(int id,String parkingSpaceName,int parkingZoneId){
+    public ParkingSession verifyParkingSession(int id,String parkingSpaceName){
         ParkingSession parkingSession = parkingSessionRepository.findByPssId(id);
-        ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId);
         if(parkingSession==null){
             throw new IllegalStateException("No such session exists");
@@ -116 +115 @@
             throw new IllegalStateException("The session you are trying to verify has already been verified");
         }
+        ParkingZone parkingZone = parkingSession.getParkingZone();
 //        else if(parkingSession.getStatus()!=SessionStatus.STARTED_)
         if(!parkingZone.getParkingSpaces().contains(parkingSpaceRepository.findByPsName(parkingSpaceName))){
@@ -124 +124 @@
         }
         parkingSession.setStatus(SessionStatus.STARTED_VERIFIED);
-        ParkingSpace parkingSpace = parkingZoneRepository.findByPzId(parkingZoneId).getParkingSpaces().stream().filter(ps->ps.getPsName().equals(parkingSpaceName)).findFirst().get();
+        ParkingSpace parkingSpace = parkingZoneRepository.findByPzId(parkingZone.getId()).getParkingSpaces().stream().filter(ps->ps.getPsName().equals(parkingSpaceName)).findFirst().get();
         parkingSpace.setTaken(true);
         parkingSession.setParkingSpace(parkingSpace);