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

Timestamp:

02/02/22 14:15:35 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

df4089c

Parents:

9ff45d6

Message:

backend refactoring

File:

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

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

@@ -4 +4 @@
 import org.springframework.stereotype.Service;
 import parkup.data.ParkingZoneLocation;
-import parkup.entities.ParkingSession;
 import parkup.entities.ParkingSpace;
 import parkup.entities.ParkingZone;
-import parkup.entities.Vraboten;
+import parkup.entities.Worker;
 import parkup.repositories.ParkingSessionRepository;
 import parkup.repositories.ParkingSpaceRepository;
 import parkup.repositories.ParkingZoneRepository;
-import parkup.repositories.VrabotenRepository;
+import parkup.repositories.WorkerRepository;
 
 import javax.transaction.Transactional;
@@ -23 +22 @@
     private final ParkingZoneRepository parkingZoneRepository;
     private final ParkingSpaceRepository parkingSpaceRepository;
-    private final VrabotenRepository vrabotenRepository;
+    private final WorkerRepository workerRepository;
     private final ParkingSessionRepository parkingSessionRepository;
 
     @Autowired
-    public ParkingZoneService(ParkingZoneRepository parkingZoneRepository, ParkingSpaceRepository parkingSpaceRepository, VrabotenRepository vrabotenRepository, ParkingSessionRepository parkingSessionRepository) {
+    public ParkingZoneService(ParkingZoneRepository parkingZoneRepository, ParkingSpaceRepository parkingSpaceRepository, WorkerRepository workerRepository, ParkingSessionRepository parkingSessionRepository) {
         this.parkingZoneRepository = parkingZoneRepository;
         this.parkingSpaceRepository = parkingSpaceRepository;
         this.parkingSessionRepository = parkingSessionRepository;
-        this.vrabotenRepository = vrabotenRepository;
+        this.workerRepository = workerRepository;
     }
 
     public List<ParkingZone> getAllParkingZones() {
-        return parkingZoneRepository.findAll();
+        List<ParkingZone> parkingZones= parkingZoneRepository.findAll();
+        for(ParkingZone pz:parkingZones){
+            setTransientVariables(pz.getId());
+        }
+        return parkingZones;
     }
 
     public ParkingZone findById(int parkingZoneId) {
         Optional<ParkingZone> parkingZone = Optional.ofNullable(this.parkingZoneRepository.findByPzId(parkingZoneId));
-        return parkingZone.orElse(null);
+        if (!parkingZone.isPresent()) {
+            throw new IllegalStateException("ParkingZone does not exist");
+        }
+        setTransientVariables(parkingZone.get().getId());
+        return parkingZone.get();
     }
 
@@ -134 +141 @@
                     ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId);
                     for (Integer vrabotenId : odgovorniLica) {
-                        Vraboten vrabotenToAdd = vrabotenRepository.findByVrabotenId(vrabotenId);
-                        if(vrabotenToAdd!=null)
-                        vrabotenToAdd.getParkingZones().add(parkingZone);
+                        Worker workerToAdd = workerRepository.findByWorkerId(vrabotenId);
+                        if(workerToAdd !=null)
+                        workerToAdd.getParkingZones().add(parkingZone);
                     }
                 }
@@ -158 +165 @@
             return parkingZoneOpt;
         }
+
+        public int calculateTakenSpaces(int pzId){
+            ParkingZone parkingZone=parkingZoneRepository.findByPzId(pzId);
+            return (int)parkingZone.getParkingSpaces().stream().filter(ParkingSpace::isTaken).count();
+        }
+        public int calculateCapacity(int pzId){
+            ParkingZone parkingZone=parkingZoneRepository.findByPzId(pzId);
+            return parkingZone.getParkingSpaces().size();
+        }
+        public void setTransientVariables(int pzId){
+            calculateCapacity(pzId);
+            calculateTakenSpaces(pzId);
+        }
     }