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

Timestamp:

02/10/22 11:13:18 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

ccb2d72

Parents:

0c049e9

Message:

calculate payment fix and added error handling

File:

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

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

@@ -17 +17 @@
 import static parkup.ParkUpApplication.getToken;
 import javax.transaction.Transactional;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
@@ -105 +102 @@
 
         //TODO prati niza od objekti ParkingSpaces i prati objekt ParkingZoneLocation
-        ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId);
+            ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId);
             ParkingZone parkingZoneNov = parkingZoneRepository.findByPzId(parkingZoneId);
             if (parkingZoneNov!=null) {
-                if (pzName != null && pzName.length() > 1) { ;
+                if (pzName != null && pzName.length() > 1) {
                     if (parkingZoneNov.getPzName().equals(pzName)&&parkingZoneNov.getId()!=parkingZoneId) {
                         throw new IllegalStateException("There is already a ParkingZone with the same name");
@@ -141 +138 @@
 
                 if (!parkingSpaces.isEmpty()) {
-                    List<String> psNamesInZone=parkingZoneNov.getParkingSpaces().stream().map(ParkingSpace::getPsName).collect(Collectors.toList());
-                    List<ParkingSpace> psToAdd=parkingSpaces.stream().filter(ps->!psNamesInZone.contains(ps.getPsName())).collect(Collectors.toList());
-                    for(ParkingSpace ps:psToAdd){
-                        parkingZoneNov.getParkingSpaces().add(ps);
-                    }
-                }else{
+                    List<ParkingSpace> spacesToDelete = parkingZoneNov.getParkingSpaces();
+                    parkingZoneNov.setParkingSpaces(null);
+                    parkingSpaceRepository.deleteAll(spacesToDelete);
+                    parkingZoneNov.setParkingSpaces(parkingSpaces);
+                }
+                else{
                     parkingZoneNov.setParkingSpaces(new ArrayList<>());
                 }