Changeset ccb2d72 for sources/app/src
- Timestamp:
- 02/10/22 12:55:53 (3 years ago)
- Branches:
- master
- Children:
- d770228
- Parents:
- ad4da86
- Location:
- sources/app/src/main/java/parkup
- Files:
-
- 2 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/controllers/ParkingSessionController.java
rad4da86 rccb2d72 53 53 } 54 54 @PutMapping("/parkingSession/verify/{parkingSessionId}") 55 public ParkingSession verifyParkingSession(@PathVariable int parkingSessionId,@RequestParam String parkingSpaceName ,@RequestParam int parkingZoneId){56 return this.parkingSessionService.verifyParkingSession(parkingSessionId,parkingSpaceName ,parkingZoneId);55 public ParkingSession verifyParkingSession(@PathVariable int parkingSessionId,@RequestParam String parkingSpaceName){ 56 return this.parkingSessionService.verifyParkingSession(parkingSessionId,parkingSpaceName); 57 57 } 58 58 @GetMapping("/parkingSession/calculate/{parkingSessionId}") -
sources/app/src/main/java/parkup/controllers/RegisteredUserController.java
rad4da86 rccb2d72 12 12 13 13 @RestController 14 public class Regist riranParkiracController {14 public class RegisteredUserController { 15 15 private final RegisteredUserService registeredUserService; 16 16 private final RegistrationServiceRP registrationServiceRP; 17 17 18 18 @Autowired 19 public Regist riranParkiracController(RegisteredUserService registeredUserService, RegistrationServiceRP registrationServiceRP) {19 public RegisteredUserController(RegisteredUserService registeredUserService, RegistrationServiceRP registrationServiceRP) { 20 20 this.registeredUserService = registeredUserService; 21 21 this.registrationServiceRP = registrationServiceRP; -
sources/app/src/main/java/parkup/controllers/WorkerController.java
rad4da86 rccb2d72 14 14 15 15 @RestController 16 public class VrabotenController {16 public class WorkerController { 17 17 private final WorkerService workerService; 18 18 // private final RegistrationServiceW registrationServiceW; 19 19 20 20 @Autowired 21 public VrabotenController(WorkerService workerService) {21 public WorkerController(WorkerService workerService) { 22 22 this.workerService = workerService; 23 23 } -
sources/app/src/main/java/parkup/services/ParkingSessionService.java
rad4da86 rccb2d72 107 107 } 108 108 @Transactional 109 public ParkingSession verifyParkingSession(int id,String parkingSpaceName ,int parkingZoneId){109 public ParkingSession verifyParkingSession(int id,String parkingSpaceName){ 110 110 ParkingSession parkingSession = parkingSessionRepository.findByPssId(id); 111 ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId);112 111 if(parkingSession==null){ 113 112 throw new IllegalStateException("No such session exists"); … … 116 115 throw new IllegalStateException("The session you are trying to verify has already been verified"); 117 116 } 117 ParkingZone parkingZone = parkingSession.getParkingZone(); 118 118 // else if(parkingSession.getStatus()!=SessionStatus.STARTED_) 119 119 if(!parkingZone.getParkingSpaces().contains(parkingSpaceRepository.findByPsName(parkingSpaceName))){ … … 124 124 } 125 125 parkingSession.setStatus(SessionStatus.STARTED_VERIFIED); 126 ParkingSpace parkingSpace = parkingZoneRepository.findByPzId(parkingZone Id).getParkingSpaces().stream().filter(ps->ps.getPsName().equals(parkingSpaceName)).findFirst().get();126 ParkingSpace parkingSpace = parkingZoneRepository.findByPzId(parkingZone.getId()).getParkingSpaces().stream().filter(ps->ps.getPsName().equals(parkingSpaceName)).findFirst().get(); 127 127 parkingSpace.setTaken(true); 128 128 parkingSession.setParkingSpace(parkingSpace);
Note:
See TracChangeset
for help on using the changeset viewer.