Changeset 0ad69c1 for sources/app/src
- Timestamp:
- 02/13/22 12:46:15 (3 years ago)
- Branches:
- master
- Children:
- ebc5eee
- Parents:
- b2e6513
- Location:
- sources/app/src/main/java/parkup
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/controllers/ParkingSessionController.java
rb2e6513 r0ad69c1 40 40 return this.parkingSessionService.verifyParkingSession(parkingSessionId,parkingSpaceName); 41 41 } 42 @GetMapping("/parkingSession/ calculate")42 @GetMapping("/parkingSession/end/calculate") 43 43 public int calculateParkingSession(){ 44 44 return this.parkingSessionService.calculatePayment(); … … 50 50 51 51 @DeleteMapping({"/parkingSession/{parkingSessionId}"}) 52 public Optional<ParkingSession>deleteParkingSession(@PathVariable int parkingSessionId) {52 public ParkingSession deleteParkingSession(@PathVariable int parkingSessionId) { 53 53 return this.parkingSessionService.deleteParkingSession(parkingSessionId); 54 54 } -
sources/app/src/main/java/parkup/controllers/ParkingZoneController.java
rb2e6513 r0ad69c1 34 34 } 35 35 36 @GetMapping({"/parkingZone/name/{parkingZoneName}"}) 37 public ParkingZone getParkingZone(@PathVariable String parkingZoneName){ 38 return parkingZoneService.getParkingZoneByName(parkingZoneName); 39 } 40 36 41 @GetMapping({"parkingZone/parkingZoneNames"}) 37 42 public List<String> getParkingZoneNames(){ -
sources/app/src/main/java/parkup/controllers/RegisteredUserController.java
rb2e6513 r0ad69c1 84 84 return registrationServiceRP.confirmToken(token); 85 85 } 86 87 @GetMapping({"/testToken"}) 88 public boolean testToken(){ 89 return true; 90 } 86 91 } -
sources/app/src/main/java/parkup/entities/ParkingZone.java
rb2e6513 r0ad69c1 49 49 private String color; 50 50 51 // @ManyToMany(cascade = {CascadeType.ALL})52 // private List<Vraboten> odgovorniLica;53 54 51 @OneToMany(cascade = {CascadeType.ALL}) 55 52 private List<ParkingSpace> parkingSpaces; … … 57 54 @Transient 58 55 private List<String> responsibleWorkers; 59 60 61 56 62 57 @OneToOne(cascade = {CascadeType.ALL}) -
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.