Changeset f6bc52d for sources/app/src/main/java/parkup/services/ParkingSessionService.java

Timestamp:

11/04/21 16:59:49 (3 years ago)

Author:

DavidTrajkovski <davidtrajkovski11@…>

Branches:

master

Children:

9504a09

Parents:

ce6ad22

Message:

fixed delete methods

File:

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

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

@@ -3 +3 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import parkup.data.Tablicka;
 import parkup.entities.ParkingSession;
 import parkup.repositories.ParkingSessionRepository;
 
+import javax.transaction.Transactional;
 import java.util.List;
 import java.util.Objects;
@@ -28 +30 @@
     }
 
-    public void updateParkingSession(int parkingSessionId, String timeStart, String timeEnd) {
+    @Transactional
+    public void updateParkingSession(int parkingSessionId, String timeStart, String timeEnd, Tablicka tablicka) {
         Optional<ParkingSession> parkingSessionOpt = Optional.ofNullable(parkingSessionRepository.findByPssId(parkingSessionId));
         if (parkingSessionOpt.isPresent()) {
             ParkingSession parkingSessionNov = parkingSessionRepository.findByPssId(parkingSessionId);
+
             if(!parkingSessionNov.getTimeStart().equals(timeStart) && !parkingSessionNov.getTimeStart().equals(timeEnd))
                 parkingSessionNov.setTimeStart(timeStart);
@@ -37 +41 @@
             if(!parkingSessionNov.getTimeEnd().equals(timeEnd) && !parkingSessionNov.getTimeEnd().equals(timeStart))
                 parkingSessionNov.setTimeEnd(timeEnd);
+
+            if(tablicka!=null && !Objects.equals(parkingSessionNov.getTablica(),tablicka)){
+                parkingSessionNov.setTablica(tablicka);
+            }
+        }else{
+            throw new IllegalStateException("The ParkingSession does not exist");
         }
     }
 
-    public void deleteParkingSession(int parkingSessionId) {
+    public Optional<ParkingSession> deleteParkingSession(int parkingSessionId) {
         Optional<ParkingSession> parkingSessionOpt = Optional.ofNullable(parkingSessionRepository.findByPssId(parkingSessionId));
         if (parkingSessionOpt.isPresent()) {
             parkingSessionRepository.deleteByPssId(parkingSessionId);
+            return parkingSessionOpt;
         } else {
             throw new IllegalStateException("ParkingSpace doesn't exist, therefore can't be deleted");
@@ -49 +60 @@
     }
 
-    public void addParkingSession(ParkingSession parkingSession) {
-        Optional <ParkingSession> parkingSessionOpt = Optional.ofNullable(parkingSessionRepository.findByPssId(parkingSession.getPssId()));
+    public Optional<ParkingSession> addParkingSession(ParkingSession parkingSession) {
+        Optional<ParkingSession> parkingSessionOpt = Optional.ofNullable(parkingSessionRepository.findByPssId(parkingSession.getPssId()));
         if (parkingSessionOpt.isPresent()) {
             throw new IllegalStateException("ID already taken, ParkingSession cannot be added");
@@ -56 +67 @@
             System.out.println(parkingSession);
             parkingSessionRepository.save(parkingSession);
+            return parkingSessionOpt;
         }
     }