Changeset c71fa06 for sources/app/src/main/java/parkup/services
- Timestamp:
- 02/08/22 23:21:50 (3 years ago)
- Branches:
- master
- Children:
- 0c049e9
- Parents:
- 98f448a
- Location:
- sources/app/src/main/java/parkup/services
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/services/ParkingZoneService.java
r98f448a rc71fa06 2 2 3 3 import org.springframework.beans.factory.annotation.Autowired; 4 import org.springframework.security.core.Authentication; 4 5 import org.springframework.stereotype.Service; 6 import parkup.ParkUpApplication; 5 7 import parkup.data.ParkingZoneAdminView; 6 8 import parkup.data.ParkingZoneLocation; … … 13 15 import parkup.repositories.ParkingZoneRepository; 14 16 import parkup.repositories.WorkerRepository; 15 17 import static parkup.ParkUpApplication.getToken; 16 18 import javax.transaction.Transactional; 17 19 import java.util.ArrayList; … … 37 39 38 40 public List<ParkingZone> getAllParkingZones() { 39 List<ParkingZone> parkingZones= parkingZoneRepository.findAll(); 41 Authentication user = getToken(); 42 String role =user.getAuthorities().stream().findFirst().get().getAuthority(); 43 String email = user.getName(); 44 List<ParkingZone> parkingZones; 45 if(role.equals("ROLE_REG_USER")) 46 parkingZones= parkingZoneRepository.findAll(); 47 else if(role.equals("ROLE_WORKER")){ 48 Worker loggedInWorker = workerRepository.findWorkerByEmail(email).orElseThrow(null); 49 parkingZones= parkingZoneRepository.findAll().stream().filter(pz->loggedInWorker.getParkingZones().contains(pz)).collect(Collectors.toList()); 50 }else if(role.equals("ROLE_ADMIN")) 51 parkingZones= parkingZoneRepository.findAll(); 52 else 53 parkingZones=parkingZoneRepository.findAll(); 40 54 for(ParkingZone pz:parkingZones){ 41 55 setTransientVariables(pz); -
sources/app/src/main/java/parkup/services/WorkerService.java
r98f448a rc71fa06 115 115 workerOpt.get().setPassword(bCryptPasswordEncoder.encode(password)); 116 116 } 117 workerOpt.get().set Account(locked);117 workerOpt.get().setLocked(locked); 118 118 119 119 if (firstName != null && firstName.length() > 1 && !Objects.equals(workerOpt.get().getFirstName(), firstName)) {
Note:
See TracChangeset
for help on using the changeset viewer.