Changeset 0ad69c1 for sources/app/src/main/java/parkup/services
- Timestamp:
- 02/13/22 12:46:15 (2 years ago)
- Branches:
- master
- Children:
- ebc5eee
- Parents:
- b2e6513
- Location:
- sources/app/src/main/java/parkup/services
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/services/ParkingSessionService.java
rb2e6513 r0ad69c1 59 59 60 60 @Transactional 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); 61 public ParkingSession deleteParkingSession(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)); 67 69 parkingSessionRepository.deleteByPssId(parkingSessionId); 68 return parkingSession Opt;70 return parkingSession; 69 71 } else { 70 72 throw new IllegalStateException("ParkingSpace doesn't exist, therefore can't be deleted"); … … 142 144 @Transactional 143 145 public boolean payParkingSession(String date){ 146 if(!date.isEmpty()){ 144 147 String expMonthString=date.split("/")[0]; 145 148 String expYearString=date.split("/")[1]; … … 159 162 throw new IllegalStateException("Your card has expired or the date that you have entered is incorrect"); 160 163 } 164 } 161 165 ParkingSession parkingSession=getParkingSession(); 162 166 if(parkingSession==null){ -
sources/app/src/main/java/parkup/services/ParkingZoneService.java
rb2e6513 r0ad69c1 204 204 205 205 } 206 } 207 206 207 public ParkingZone getParkingZoneByName(String parkingZoneName){ 208 return parkingZoneRepository.findByPzName(parkingZoneName); 209 } 210 } 211
Note:
See TracChangeset
for help on using the changeset viewer.