Changeset 97fbc67 for sources/app/src/main/java/parkup/services/ParkingZoneService.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/ParkingZoneService.java (modified) (5 diffs)

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

@@ -2 +2 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.stereotype.Service;
-import parkup.entities.Administrator;
+import parkup.data.ParkingZoneLocation;
+import parkup.entities.ParkingSpace;
 import parkup.entities.ParkingZone;
+import parkup.entities.Vraboten;
 import parkup.repositories.ParkingZoneRepository;
 
 import javax.transaction.Transactional;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -30 +34 @@
     }
 
-    public void addParkingZone(ParkingZone parkingZone) {   //zavisno vo koj grad ili opstina i napravi proverki pred dodavanje, implementiraj u naredna faza
+    public List<String> getAllParkingZoneNames() {
+        List<ParkingZone> parkingZones = this.parkingZoneRepository.findAll();
+        List<String> parkingZonesNames = new ArrayList<>();
+        for (ParkingZone pz : parkingZones){
+            parkingZonesNames.add(pz.getPzName());
+        }
+        return parkingZonesNames;
+    }
+
+    public Optional<ParkingZone> addParkingZone(ParkingZone parkingZone) {   //zavisno vo koj grad ili opstina i napravi proverki pred dodavanje, implementiraj u naredna faza
         Optional<ParkingZone> parkingZoneOpt = Optional.ofNullable(parkingZoneRepository.findByPzName(parkingZone.getPzName()));
         if (parkingZoneOpt.isPresent()) {
@@ -38 +51 @@
             parkingZoneRepository.save(parkingZone);
         }
+        return parkingZoneOpt;
     }
 
+    public ParkingZone addParkingZoneNameOnly(String name) {
+        Optional<ParkingZone> parkingZoneOpt = Optional.ofNullable(parkingZoneRepository.findByPzName(name));
+        if (parkingZoneOpt.isPresent()) {
+            throw new IllegalStateException("Name already taken, try adding a ParkingZone with a different name");
+        } else {
+            ParkingZone parkingZone = new ParkingZone(name.trim());
+            parkingZoneRepository.save(parkingZone);
+            return parkingZone;
+        }
+    }
+
+    //TODO proveri dali ima odgovorni i dokolku ima dali postojat vo bazata
     @Transactional
-    public void updateParkingZone(int parkingZoneId, String pzName, int price, int capacity, String workHours, String location) {
+    public ParkingZone updateParkingZone(int parkingZoneId, String pzName, int price, int capacity,
+                                         String location, int from, int to, String color,
+                                         List<ParkingSpace> parkingSpaces, ParkingZoneLocation parkingZoneLocation, List<Vraboten> odgovorniLica) {
+
+        for(ParkingSpace space:parkingSpaces){
+            System.out.println(space);
+        }
+        for(Vraboten v : odgovorniLica){
+            System.out.println(v.toString());
+        }
         Optional<ParkingZone> parkingZoneOpt = Optional.ofNullable(parkingZoneRepository.findByPzId(parkingZoneId));
         if (parkingZoneOpt.isPresent()) {
@@ -62 +97 @@
             }
 
-            if (workHours != null && workHours.length() > 0 && !Objects.equals(parkingZoneNov.getWorkHours(), workHours)) {
-                parkingZoneNov.setWorkHours(workHours);
-            }
-
             if (location != null && location.length() > 0 && !Objects.equals(parkingZoneNov.getLocation(), location)) {
                 parkingZoneNov.setLocation(location);
             }
+
+            if (from != 0 && !Objects.equals(parkingZoneNov.getFrom(), from)) {
+                parkingZoneNov.setFrom(from);
+            }
+
+            if (to != 0 && !Objects.equals(parkingZoneNov.getTo(), to)) {
+                parkingZoneNov.setTo(to);
+            }
+
+            if (color != null && color.length() > 0 && !Objects.equals(parkingZoneNov.getColor(), color)) {
+                parkingZoneNov.setColor(color);
+            }
+
+            if(parkingZoneLocation!=null){
+                parkingZoneNov.setParkingZoneLocation(parkingZoneLocation);
+            }
+
+            if(!parkingSpaces.isEmpty()){
+                //TODO kreiraj lista od parkingSpaces, ni gi prakja false isHandicaped i isTaken
+                parkingZoneNov.setParkingSpaces(parkingSpaces);
+            }
+            if(!odgovorniLica.isEmpty()){
+
+                parkingZoneNov.setOdgovorniLica(odgovorniLica);
+            }
+
+            return parkingZoneNov;
+        } else {
+            throw new IllegalStateException("There ParkingZone does not exist");
         }
     }
 
-    public void deleteParkingZone(int parkingZoneId) {
+    @Transactional
+    public Optional<ParkingZone> deleteParkingZone(int parkingZoneId) {
         Optional<ParkingZone> parkingZoneOpt = Optional.ofNullable(parkingZoneRepository.findByPzId(parkingZoneId));
         if (parkingZoneOpt.isPresent()) {
@@ -79 +140 @@
             throw new IllegalStateException("ParkingZone doesn't exist, therefore can't be deleted");
         }
+        return parkingZoneOpt;
     }
 }