Changeset 9dd526f for sources/app/src/main/java/parkup/services/ParkingSpaceService.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/ParkingSpaceService.java (modified) (4 diffs)

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

@@ -4 +4 @@
 import org.springframework.stereotype.Service;
 import parkup.entities.ParkingSpace;
+import parkup.entities.ParkingZone;
 import parkup.repositories.ParkingSpaceRepository;
 import parkup.repositories.ParkingZoneRepository;
@@ -48 +49 @@
         Optional<ParkingSpace> ParkingSpaceOpt = Optional.ofNullable(parkingSpaceRepository.findByPsId(parkingSpaceId));
         if (ParkingSpaceOpt.isPresent()) {
-            ParkingSpace ParkingSpaceNov = parkingSpaceRepository.findByPsId(parkingSpaceId);
-            if (psName != null && psName.length() > 1 && !Objects.equals(ParkingSpaceNov.getPsName(), psName)) {
+            ParkingSpace parkingSpaceNew = parkingSpaceRepository.findByPsId(parkingSpaceId);
+            if (psName != null && psName.length() > 1 && !Objects.equals(parkingSpaceNew.getPsName(), psName)) {
                 Optional<ParkingSpace> parkingSpaceOpt1 = Optional.ofNullable(parkingSpaceRepository.findByPsName(psName));
                 if (parkingSpaceOpt1.isPresent()) {
@@ -55 +56 @@
                 }
 
-                ParkingSpaceNov.setPsName(psName);
+                parkingSpaceNew.setPsName(psName);
             }
 
-            if (!Objects.equals(ParkingSpaceNov.isTaken(), taken)) {
-                ParkingSpaceNov.setTaken(taken);
+            if (!Objects.equals(parkingSpaceNew.isTaken(), taken)) {
+                parkingSpaceNew.setTaken(taken);
             }
 
 
-            if(lat!=0 && !Objects.equals(ParkingSpaceNov.getLat(), lat)){
-                ParkingSpaceNov.setLat(lat);
+            if(lat!=0 && !Objects.equals(parkingSpaceNew.getLat(), lat)){
+                parkingSpaceNew.setLat(lat);
             }
 
-            if(lng!=0 && !Objects.equals(ParkingSpaceNov.getLng(), lng)){
-                ParkingSpaceNov.setLng(lng);
+            if(lng!=0 && !Objects.equals(parkingSpaceNew.getLng(), lng)){
+                parkingSpaceNew.setLng(lng);
             }
-            return ParkingSpaceNov;
+            return parkingSpaceNew;
         }else{
             throw new IllegalStateException("ParkingSpace does not exist");
@@ -80 +81 @@
         Optional<ParkingSpace> parkingSpaceOpt = Optional.ofNullable(parkingSpaceRepository.findByPsId(parkingSpaceId));
         if (parkingSpaceOpt.isPresent()) {
+            for(ParkingZone pz: parkingZoneRepository.findAll()){
+                pz.getParkingSpaces().remove(parkingSpaceOpt.get());
+                parkingZoneRepository.save(pz);
+            }
             parkingSpaceRepository.deleteByPsId(parkingSpaceId);
         } else {