Changeset ebc5eee for sources/app/src
- Timestamp:
- 02/13/22 12:52:33 (3 years ago)
- Branches:
- master
- Children:
- c52cdbb
- Parents:
- 0ad69c1
- Location:
- sources/app/src/main/java/parkup
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/controllers/ParkingSessionController.java
r0ad69c1 rebc5eee 50 50 51 51 @DeleteMapping({"/parkingSession/{parkingSessionId}"}) 52 public ParkingSessiondeleteParkingSession(@PathVariable int parkingSessionId) {52 public Optional<ParkingSession> deleteParkingSession(@PathVariable int parkingSessionId) { 53 53 return this.parkingSessionService.deleteParkingSession(parkingSessionId); 54 54 } -
sources/app/src/main/java/parkup/services/ParkingSessionService.java
r0ad69c1 rebc5eee 59 59 60 60 @Transactional 61 public ParkingSessiondeleteParkingSession(int parkingSessionId) {62 ParkingSession parkingSession = getParkingSession();63 if (parkingSession !=null) {64 if(parkingSession .getStatus()!=SessionStatus.STARTED_UNVERIFIED)65 parkingSession.getParkingSpace().setTaken(false);66 parkingSession .setPlate(null);67 registeredUserRepository.findAll().stream().filter(u->u.getSession().equals(parkingSession )).forEach(u->u.setSession(null));68 guestRepository.findAll().stream().filter(u->u.getSession().equals(parkingSession )).forEach(u->u.setSession(null));61 public Optional<ParkingSession> deleteParkingSession(int parkingSessionId) { 62 Optional<ParkingSession> parkingSessionOpt = Optional.ofNullable(parkingSessionRepository.findByPssId(parkingSessionId)); 63 if (parkingSessionOpt.isPresent()) { 64 if(parkingSessionOpt.get().getStatus()!=SessionStatus.STARTED_UNVERIFIED) 65 parkingSessionOpt.get().getParkingSpace().setTaken(false); 66 parkingSessionOpt.get().setPlate(null); 67 registeredUserRepository.findAll().stream().filter(u->u.getSession().equals(parkingSessionOpt.get())).forEach(u->u.setSession(null)); 68 guestRepository.findAll().stream().filter(u->u.getSession().equals(parkingSessionOpt.get())).forEach(u->u.setSession(null)); 69 69 parkingSessionRepository.deleteByPssId(parkingSessionId); 70 return parkingSession ;70 return parkingSessionOpt; 71 71 } else { 72 72 throw new IllegalStateException("ParkingSpace doesn't exist, therefore can't be deleted");
Note:
See TracChangeset
for help on using the changeset viewer.