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

Timestamp:

02/08/22 23:27:06 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

ad4da86

Parents:

c71fa06 (diff), 80ddcae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/ParkUp

# Conflicts:
# sources/app/src/main/java/parkup/data/WorkerDemoParkingZones.java

File:

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

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

@@ -147 +147 @@
                     }
                 }else{
-                    parkingZoneNov.setParkingSpaces(null);
+                    parkingZoneNov.setParkingSpaces(new ArrayList<>());
                 }
                 if (!responsibleWorkers.isEmpty()) {
@@ -196 +196 @@
             pz.setCapacity(calculateCapacity(pz.getId()));
             pz.setTakenSpaces(calculateTakenSpaces(pz.getId()));
+            pz.setResponsibleWorkers(getWorkers(pz.getId()));
         }
         public List<WorkerDemo> getResponsibleWorkers(int pzId){
@@ -201 +202 @@
             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());
+
+        }
+    }
+