Changeset 97fbc67 for sources/app/src/main/java/parkup/services/ParkingSpaceService.java

Timestamp:

11/11/21 11:55:43 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

2ace8f0

Parents:

3a58bd6

Message:

fixed deleteVraboten and deleteRegistriranParkirac

File:

• sources/app/src/main/java/parkup/services/ParkingSpaceService.java (modified) (5 diffs)

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

@@ -6 +6 @@
 import parkup.repositories.ParkingSpaceRepository;
 
+import javax.transaction.Transactional;
 import java.util.List;
 import java.util.Objects;
@@ -28 +29 @@
     }
 
-    public void addParkingSpace(ParkingSpace parkingSpace) {
-        Optional <ParkingSpace> parkingSpaceOpt = Optional.ofNullable(parkingSpaceRepository.findByPsName(parkingSpace.getPsName()));
+    public Optional<ParkingSpace> addParkingSpace(ParkingSpace parkingSpace) {
+        Optional<ParkingSpace> parkingSpaceOpt = Optional.ofNullable(parkingSpaceRepository.findByPsName(parkingSpace.getPsName()));
         if (parkingSpaceOpt.isPresent()) {
             throw new IllegalStateException("Name already taken, try adding a ParkingZone with a different name");
@@ -36 +37 @@
             parkingSpaceRepository.save(parkingSpace);
         }
+        return parkingSpaceOpt;
     }
 
-    public void updateParkingSpace(int parkingSpaceId, String psName, boolean taken, boolean handicaped) {
+    @Transactional
+    public ParkingSpace updateParkingSpace(int parkingSpaceId, String psName, boolean taken, boolean handicaped, float lat, float lng) {
         Optional<ParkingSpace> ParkingSpaceOpt = Optional.ofNullable(parkingSpaceRepository.findByPsId(parkingSpaceId));
         if (ParkingSpaceOpt.isPresent()) {
@@ -58 +61 @@
                 ParkingSpaceNov.setHandicaped(handicaped);
             }
+
+            if(lat!=0 && !Objects.equals(ParkingSpaceNov.getLat(), lat)){
+                ParkingSpaceNov.setLat(lat);
+            }
+
+            if(lng!=0 && !Objects.equals(ParkingSpaceNov.getLng(), lng)){
+                ParkingSpaceNov.setLng(lng);
+            }
+            return ParkingSpaceNov;
+        }else{
+            throw new IllegalStateException("ParkingSpace does not exist");
         }
     }
 
-    public void deleteParkingSpace(int parkingSpaceId) {
+    @Transactional
+    public Optional<ParkingSpace> deleteParkingSpace(int parkingSpaceId) {
         Optional<ParkingSpace> parkingSpaceOpt = Optional.ofNullable(parkingSpaceRepository.findByPsId(parkingSpaceId));
         if (parkingSpaceOpt.isPresent()) {
@@ -68 +83 @@
             throw new IllegalStateException("ParkingSpace doesn't exist, therefore can't be deleted");
         }
+        return parkingSpaceOpt;
     }
 }