Changeset c71fa06

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

Location:

sources/app/src/main/java/parkup

Files:

• ParkUpApplication.java (modified) (2 diffs)
• data/WorkerDemoParkingZones.java (modified) (1 diff)
• data/enumarations/SessionStatus.java (modified) (1 diff)
• services/ParkingZoneService.java (modified) (3 diffs)
• services/WorkerService.java (modified) (1 diff)

sources/app/src/main/java/parkup/ParkUpApplication.java

@@ -3 +3 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 
 @SpringBootApplication
@@ -12 +15 @@
         SpringApplication.run(ParkUpApplication.class, args);
     }
+
+    @Bean
+    public static Authentication getToken() {
+        Authentication token = null;
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication != null && !authentication.getAuthorities().stream().findFirst().get().getAuthority().equals("ROLE_ANONYMOUS")) {
+            token = authentication;
+        }
+        return token;
+    }
 }

sources/app/src/main/java/parkup/data/WorkerDemoParkingZones.java

@@ -38 +38 @@
         this.role = v.getRole();
         this.status = v.getStatus();
-        this.locked=v.isEnabled();
+        this.locked=!v.isAccountNonLocked();
         this.pzNames = v.getParkingZones().stream().map(ParkingZone::getPzName).collect(Collectors.toList());
     }

sources/app/src/main/java/parkup/data/enumarations/SessionStatus.java

@@ -2 +2 @@
 
 public enum SessionStatus {
+    STARTED_UNVERIFIED,
     STARTED_VERIFIED,
-    STARTED_UNVERIFIED,
     ENDED_UNPAID,
     ENDED_PAID

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);

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

@@ -115 +115 @@
                 workerOpt.get().setPassword(bCryptPasswordEncoder.encode(password));
             }
-            workerOpt.get().setAccount(locked);
+            workerOpt.get().setLocked(locked);
 
             if (firstName != null && firstName.length() > 1 && !Objects.equals(workerOpt.get().getFirstName(), firstName)) {