Changeset c71fa06 for sources/app/src/main/java/parkup/services/ParkingZoneService.java

Timestamp:

02/08/22 23:21:50 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

0c049e9

Parents:

98f448a

Message:

change in getParkingSpaces logic

File:

• sources/app/src/main/java/parkup/services/ParkingZoneService.java (modified) (3 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);