Changes in sources/app/src/main/java/parkup/services/ParkingZoneService.java [80ddcae:c71fa06]

File:

• sources/app/src/main/java/parkup/services/ParkingZoneService.java (modified) (6 diffs)

sources/app/src/main/java/parkup/services/ParkingZoneService.java

@@ -2 +2 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
+import parkup.ParkUpApplication;
 import parkup.data.ParkingZoneAdminView;
 import parkup.data.ParkingZoneLocation;
@@ -13 +15 @@
 import parkup.repositories.ParkingZoneRepository;
 import parkup.repositories.WorkerRepository;
-
+import static parkup.ParkUpApplication.getToken;
 import javax.transaction.Transactional;
 import java.util.ArrayList;
@@ -37 +39 @@
 
     public List<ParkingZone> getAllParkingZones() {
-        List<ParkingZone> parkingZones= parkingZoneRepository.findAll();
+        Authentication user = getToken();
+        String role =user.getAuthorities().stream().findFirst().get().getAuthority();
+        String email = user.getName();
+        List<ParkingZone> parkingZones;
+        if(role.equals("ROLE_REG_USER"))
+            parkingZones= parkingZoneRepository.findAll();
+        else if(role.equals("ROLE_WORKER")){
+            Worker loggedInWorker = workerRepository.findWorkerByEmail(email).orElseThrow(null);
+            parkingZones= parkingZoneRepository.findAll().stream().filter(pz->loggedInWorker.getParkingZones().contains(pz)).collect(Collectors.toList());
+        }else if(role.equals("ROLE_ADMIN"))
+            parkingZones= parkingZoneRepository.findAll();
+        else
+            parkingZones=parkingZoneRepository.findAll();
         for(ParkingZone pz:parkingZones){
             setTransientVariables(pz);
@@ -133 +147 @@
                     }
                 }else{
-                    parkingZoneNov.setParkingSpaces(new ArrayList<>());
+                    parkingZoneNov.setParkingSpaces(null);
                 }
                 if (!responsibleWorkers.isEmpty()) {
@@ -182 +196 @@
             pz.setCapacity(calculateCapacity(pz.getId()));
             pz.setTakenSpaces(calculateTakenSpaces(pz.getId()));
-            pz.setResponsibleWorkers(getWorkers(pz.getId()));
         }
         public List<WorkerDemo> getResponsibleWorkers(int pzId){
@@ -188 +201 @@
             return workerRepository.findAll().stream().filter(w->w.getParkingZones().contains(parkingZone)).map(WorkerDemo::new).collect(Collectors.toList());
         }
-        public List<String> getWorkers(int pzId){
-            ParkingZone parkingZone =parkingZoneRepository.findByPzId(pzId);
-            return workerRepository.findAll().stream().filter(w->w.getParkingZones().contains(parkingZone)).map(w->w.getFirstName() + " " + w.getLastName()).collect(Collectors.toList());
-
-        }
-    }
-
+    }
+