- Timestamp:
- 11/11/21 11:55:43 (3 years ago)
- Branches:
- master
- Children:
- 2ace8f0
- Parents:
- 3a58bd6
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/services/ParkingSessionService.java
r3a58bd6 r97fbc67 3 3 import org.springframework.beans.factory.annotation.Autowired; 4 4 import org.springframework.stereotype.Service; 5 import parkup.data.Tablicka; 5 6 import parkup.entities.ParkingSession; 6 7 import parkup.repositories.ParkingSessionRepository; 7 8 9 import javax.transaction.Transactional; 8 10 import java.util.List; 9 11 import java.util.Objects; … … 28 30 } 29 31 30 public void updateParkingSession(int parkingSessionId, String timeStart, String timeEnd) { 32 @Transactional 33 public void updateParkingSession(int parkingSessionId, String timeStart, String timeEnd, Tablicka tablicka) { 31 34 Optional<ParkingSession> parkingSessionOpt = Optional.ofNullable(parkingSessionRepository.findByPssId(parkingSessionId)); 32 35 if (parkingSessionOpt.isPresent()) { 33 36 ParkingSession parkingSessionNov = parkingSessionRepository.findByPssId(parkingSessionId); 37 34 38 if(!parkingSessionNov.getTimeStart().equals(timeStart) && !parkingSessionNov.getTimeStart().equals(timeEnd)) 35 39 parkingSessionNov.setTimeStart(timeStart); … … 37 41 if(!parkingSessionNov.getTimeEnd().equals(timeEnd) && !parkingSessionNov.getTimeEnd().equals(timeStart)) 38 42 parkingSessionNov.setTimeEnd(timeEnd); 43 44 if(tablicka!=null && !Objects.equals(parkingSessionNov.getTablica(),tablicka)){ 45 parkingSessionNov.setTablica(tablicka); 46 } 47 }else{ 48 throw new IllegalStateException("The ParkingSession does not exist"); 39 49 } 40 50 } 41 51 42 public voiddeleteParkingSession(int parkingSessionId) {52 public Optional<ParkingSession> deleteParkingSession(int parkingSessionId) { 43 53 Optional<ParkingSession> parkingSessionOpt = Optional.ofNullable(parkingSessionRepository.findByPssId(parkingSessionId)); 44 54 if (parkingSessionOpt.isPresent()) { 45 55 parkingSessionRepository.deleteByPssId(parkingSessionId); 56 return parkingSessionOpt; 46 57 } else { 47 58 throw new IllegalStateException("ParkingSpace doesn't exist, therefore can't be deleted"); … … 49 60 } 50 61 51 public voidaddParkingSession(ParkingSession parkingSession) {52 Optional 62 public Optional<ParkingSession> addParkingSession(ParkingSession parkingSession) { 63 Optional<ParkingSession> parkingSessionOpt = Optional.ofNullable(parkingSessionRepository.findByPssId(parkingSession.getPssId())); 53 64 if (parkingSessionOpt.isPresent()) { 54 65 throw new IllegalStateException("ID already taken, ParkingSession cannot be added"); … … 56 67 System.out.println(parkingSession); 57 68 parkingSessionRepository.save(parkingSession); 69 return parkingSessionOpt; 58 70 } 59 71 }
Note:
See TracChangeset
for help on using the changeset viewer.