Changeset ad4da86 for sources/app/src/main/java/parkup/services
- Timestamp:
- 02/10/22 11:13:18 (3 years ago)
- Branches:
- master
- Children:
- ccb2d72
- Parents:
- 0c049e9
- Location:
- sources/app/src/main/java/parkup/services
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/services/ParkingSessionService.java
r0c049e9 rad4da86 41 41 return parkingSessionRepository.findAll().stream() 42 42 .filter(s->!s.getStatus().equals(SessionStatus.ENDED_PAID)) 43 .collect(Collectors.toList()); 44 } 45 46 public List<ParkingSession> getAllParkingSessionsFromZone(Integer pzId) { 47 //Get all sessions that arent paid 48 49 return parkingSessionRepository.findAll().stream() 50 .filter(s->!s.getStatus().equals(SessionStatus.ENDED_PAID) && s.getParkingZone().getId()==pzId) 43 51 .collect(Collectors.toList()); 44 52 } … … 92 100 throw new IllegalStateException("No such session exists"); 93 101 } 94 else if(session.getStatus()== SessionStatus.ENDED_UNPAID){95 throw new IllegalStateException("Cannot calculate payment on an ended session");96 }102 // else if(session.getStatus()!= SessionStatus.ENDED_PAID){ 103 // throw new IllegalStateException("Cannot calculate payment on a paid session"); 104 // } 97 105 int price = session.getParkingZone().getPrice(); 98 return (int) (Math.ceil(Duration.between(session.getTime End(),session.getTimeStart()).toMinutes()/60.0)*price);106 return (int) (Math.ceil(Duration.between(session.getTimeStart(),session.getTimeEnd()).toMinutes()/60.0)*price); 99 107 } 100 108 @Transactional … … 111 119 if(!parkingZone.getParkingSpaces().contains(parkingSpaceRepository.findByPsName(parkingSpaceName))){ 112 120 throw new IllegalStateException("Ivalid parking space inserted. Type in a new parking space or let the admin know that they should add the parking space to this zone"); 121 } 122 if(parkingSpaceRepository.findByPsName(parkingSpaceName).isTaken()){ 123 throw new IllegalStateException("Ivalid parking space inserted. Type in a new parking space, this space is already in a session"); 113 124 } 114 125 parkingSession.setStatus(SessionStatus.STARTED_VERIFIED); -
sources/app/src/main/java/parkup/services/ParkingZoneService.java
r0c049e9 rad4da86 17 17 import static parkup.ParkUpApplication.getToken; 18 18 import javax.transaction.Transactional; 19 import java.util.ArrayList; 20 import java.util.List; 21 import java.util.Objects; 22 import java.util.Optional; 19 import java.util.*; 23 20 import java.util.stream.Collectors; 24 21 … … 105 102 106 103 //TODO prati niza od objekti ParkingSpaces i prati objekt ParkingZoneLocation 107 ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId);104 ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId); 108 105 ParkingZone parkingZoneNov = parkingZoneRepository.findByPzId(parkingZoneId); 109 106 if (parkingZoneNov!=null) { 110 if (pzName != null && pzName.length() > 1) { ;107 if (pzName != null && pzName.length() > 1) { 111 108 if (parkingZoneNov.getPzName().equals(pzName)&&parkingZoneNov.getId()!=parkingZoneId) { 112 109 throw new IllegalStateException("There is already a ParkingZone with the same name"); … … 141 138 142 139 if (!parkingSpaces.isEmpty()) { 143 List< String> psNamesInZone=parkingZoneNov.getParkingSpaces().stream().map(ParkingSpace::getPsName).collect(Collectors.toList());144 List<ParkingSpace> psToAdd=parkingSpaces.stream().filter(ps->!psNamesInZone.contains(ps.getPsName())).collect(Collectors.toList());145 for(ParkingSpace ps:psToAdd){146 parkingZoneNov.getParkingSpaces().add(ps);147 148 }else{140 List<ParkingSpace> spacesToDelete = parkingZoneNov.getParkingSpaces(); 141 parkingZoneNov.setParkingSpaces(null); 142 parkingSpaceRepository.deleteAll(spacesToDelete); 143 parkingZoneNov.setParkingSpaces(parkingSpaces); 144 } 145 else{ 149 146 parkingZoneNov.setParkingSpaces(new ArrayList<>()); 150 147 }
Note:
See TracChangeset
for help on using the changeset viewer.