Changeset ccb2d72

Timestamp:

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

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

d770228

Parents:

ad4da86

Message:

fix in verifyParkingSession

Location:

sources/app/src/main/java/parkup

Files:

• controllers/ParkingSessionController.java (modified) (1 diff)
• controllers/RegisteredUserController.java (moved) (moved from sources/app/src/main/java/parkup/controllers/RegistriranParkiracController.java ) (1 diff)
• controllers/WorkerController.java (moved) (moved from sources/app/src/main/java/parkup/controllers/VrabotenController.java ) (1 diff)
• services/ParkingSessionService.java (modified) (3 diffs)

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

@@ -53 +53 @@
     }
     @PutMapping("/parkingSession/verify/{parkingSessionId}")
-    public ParkingSession verifyParkingSession(@PathVariable int parkingSessionId,@RequestParam String parkingSpaceName,@RequestParam int parkingZoneId){
-        return this.parkingSessionService.verifyParkingSession(parkingSessionId,parkingSpaceName,parkingZoneId);
+    public ParkingSession verifyParkingSession(@PathVariable int parkingSessionId,@RequestParam String parkingSpaceName){
+        return this.parkingSessionService.verifyParkingSession(parkingSessionId,parkingSpaceName);
     }
     @GetMapping("/parkingSession/calculate/{parkingSessionId}")

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

@@ -12 +12 @@
 
 @RestController
-public class RegistriranParkiracController {
+public class RegisteredUserController {
     private final RegisteredUserService registeredUserService;
     private final RegistrationServiceRP registrationServiceRP;
 
     @Autowired
-    public RegistriranParkiracController(RegisteredUserService registeredUserService, RegistrationServiceRP registrationServiceRP) {
+    public RegisteredUserController(RegisteredUserService registeredUserService, RegistrationServiceRP registrationServiceRP) {
         this.registeredUserService = registeredUserService;
         this.registrationServiceRP = registrationServiceRP;

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

@@ -14 +14 @@
 
 @RestController
-public class VrabotenController {
+public class WorkerController {
     private final WorkerService workerService;
 //    private final RegistrationServiceW registrationServiceW;
 
     @Autowired
-    public VrabotenController(WorkerService workerService) {
+    public WorkerController(WorkerService workerService) {
         this.workerService = workerService;
     }

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);