Changeset 98f448a for sources/app/src/main/java/parkup/services
- Timestamp:
- 02/02/22 19:35:14 (2 years ago)
- Branches:
- master
- Children:
- 80ddcae, c71fa06
- Parents:
- df4089c
- Location:
- sources/app/src/main/java/parkup/services
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/services/AdministratorService.java
rdf4089c r98f448a 5 5 import java.util.Optional; 6 6 import java.util.UUID; 7 import java.util.stream.Collectors; 7 8 import javax.transaction.Transactional; 8 9 import org.springframework.beans.factory.annotation.Autowired; … … 59 60 if (administratorOpt.isPresent()) { 60 61 Administrator administratorNov = this.administratorRepository.findByAdministratorId(administratorId); 61 if (email != null && email.length() > 1 && email.contains("@") && !Objects.equals(administratorNov.getEmail(), email)) {62 Optional<Administrator> userOpt1 = this.administratorRepository.findAdministratorByEmail(email);63 if (userOpt1.isPresent()) {64 throw new IllegalStateException("email taken");65 }66 administratorNov.setEmail(email);62 if (email != null && email.length() > 1 && email.contains("@")) { 63 List<String> emails = administratorRepository.findAll().stream().map(Administrator::getEmail).collect(Collectors.toList()); 64 for(String mailToCheck :emails) 65 if (email.equals(mailToCheck) && administratorNov.getAdministratorId()!=administratorId) { 66 throw new IllegalStateException("email taken"); 67 } 67 68 }else{ 68 69 throw new IllegalStateException("email not valid"); -
sources/app/src/main/java/parkup/services/ParkingSessionService.java
rdf4089c r98f448a 49 49 } 50 50 51 /* @Transactional52 public void updateParkingSession(int parkingSessionId, String timeStart, String timeEnd, Tablicka tablicka) {53 Optional<ParkingSession> parkingSessionOpt = Optional.ofNullable(parkingSessionRepository.findByPssId(parkingSessionId));54 if (parkingSessionOpt.isPresent()) {55 ParkingSession parkingSessionNov = parkingSessionRepository.findByPssId(parkingSessionId);56 57 if(!parkingSessionNov.getTimeStart().equals(timeStart) && !parkingSessionNov.getTimeStart().equals(timeEnd))58 parkingSessionNov.setTimeStart(timeStart);59 60 if(!parkingSessionNov.getTimeEnd().equals(timeEnd) && !parkingSessionNov.getTimeEnd().equals(timeStart))61 parkingSessionNov.setTimeEnd(timeEnd);62 63 if(tablicka!=null && !Objects.equals(parkingSessionNov.getTablica(),tablicka)){64 parkingSessionNov.setTablica(tablicka);65 }66 }else{67 throw new IllegalStateException("The ParkingSession does not exist");68 }69 }*/70 51 @Transactional 71 52 public Optional<ParkingSession> deleteParkingSession(int parkingSessionId) { … … 156 137 String expYearString=date.split("/")[1]; 157 138 if(expMonthString.startsWith("0")) 158 expMonthString=exp YearString.substring(1);139 expMonthString=expMonthString.substring(1); 159 140 if(expYearString.startsWith("0")) 160 141 expYearString=expYearString.substring(1); -
sources/app/src/main/java/parkup/services/ParkingZoneService.java
rdf4089c r98f448a 91 91 92 92 //TODO prati niza od objekti ParkingSpaces i prati objekt ParkingZoneLocation 93 93 ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId); 94 94 ParkingZone parkingZoneNov = parkingZoneRepository.findByPzId(parkingZoneId); 95 95 if (parkingZoneNov!=null) { … … 132 132 parkingZoneNov.getParkingSpaces().add(ps); 133 133 } 134 }else{ 135 parkingZoneNov.setParkingSpaces(null); 134 136 } 135 137 if (!responsibleWorkers.isEmpty()) { 136 ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId); 138 139 for(Integer workerId: getResponsibleWorkers(parkingZoneId).stream().map(WorkerDemo::getWorkerId).collect(Collectors.toList())){ 140 workerRepository.findByWorkerId(workerId).getParkingZones().remove(parkingZone); 141 } 137 142 for (Integer workerId : responsibleWorkers.stream().map(WorkerDemo::getWorkerId).collect(Collectors.toList())) { 138 143 Worker workerToAdd = workerRepository.findByWorkerId(workerId); … … 140 145 workerToAdd.getParkingZones().add(parkingZone); 141 146 } 147 }else{ 148 workerRepository.findAll().stream().filter(w->w.getParkingZones().contains(parkingZone)).forEach(w->w.getParkingZones().remove(parkingZone)); 142 149 } 143 150 … … 156 163 parkingZoneOpt.get().setParkingSpaces(null); 157 164 parkingZoneOpt.get().setParkingZoneLocation(null); 165 workerRepository.findAll().stream().filter(w->w.getParkingZones().contains(parkingZoneOpt.get())).forEach(w->w.getParkingZones().remove(parkingZoneOpt.get())); 158 166 parkingZoneRepository.deleteByPzId(parkingZoneId); 159 167 } else { -
sources/app/src/main/java/parkup/services/WorkerService.java
rdf4089c r98f448a 31 31 } 32 32 33 public List<Worker Demo> getWorkers() {34 return this.workerRepository.findAll() .stream().map(WorkerDemo::new).collect(Collectors.toList());33 public List<Worker> getWorkers() { 34 return this.workerRepository.findAll(); 35 35 } 36 36 37 37 public WorkerDemoParkingZones findById(int workerId) { 38 38 Worker worker = this.workerRepository.findByWorkerId(workerId); 39 WorkerDemoParkingZones workerToReturn = new WorkerDemoParkingZones(worker); 40 return workerToReturn; 39 return new WorkerDemoParkingZones(worker); 41 40 } 42 41 … … 103 102 Optional<Worker> workerOpt = Optional.ofNullable(this.workerRepository.findByWorkerId(workerId)); 104 103 if (workerOpt.isPresent()) { 105 106 104 if (email != null && email.length() > 1 && email.contains("@") ) { 107 105 List<String> emails = workerRepository.findAll().stream().map(Worker::getEmail).collect(Collectors.toList()); … … 117 115 workerOpt.get().setPassword(bCryptPasswordEncoder.encode(password)); 118 116 } 119 workerOpt.get().set Locked(locked);117 workerOpt.get().setAccount(locked); 120 118 121 119 if (firstName != null && firstName.length() > 1 && !Objects.equals(workerOpt.get().getFirstName(), firstName)) {
Note:
See TracChangeset
for help on using the changeset viewer.