Changeset df4089c for sources/app
- Timestamp:
- 02/02/22 17:25:17 (3 years ago)
- Branches:
- master
- Children:
- 98f448a
- Parents:
- 9dd526f
- Location:
- sources/app
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/controllers/ParkingZoneController.java
r9dd526f rdf4089c 25 25 26 26 @GetMapping({"/parkingZone/{parkingZoneId}"}) 27 public ParkingZone getParkingZone(@PathVariable int parkingZoneId) {28 ParkingZone parkingZone = parkingZoneService.findById(parkingZoneId);27 public ParkingZoneAdminView getParkingZone(@PathVariable int parkingZoneId) { 28 ParkingZoneAdminView parkingZone = parkingZoneService.findById(parkingZoneId); 29 29 if (parkingZone != null) { 30 30 return parkingZone; … … 50 50 51 51 @PutMapping({"/parkingZone/{parkingZoneId}"}) 52 public ParkingZone updateParkingZone(@PathVariable int parkingZoneId, @RequestBody ParkingZoneAdminView parkingZone) {52 public ParkingZoneAdminView updateParkingZone(@PathVariable int parkingZoneId, @RequestBody ParkingZoneAdminView parkingZone) { 53 53 return this.parkingZoneService.updateParkingZone(parkingZoneId, parkingZone.getPzName(), parkingZone.getPrice(), 54 parkingZone.getAddress(), parkingZone.get Time_from(), parkingZone.getTime_to(), parkingZone.getColor(),54 parkingZone.getAddress(), parkingZone.getFrom(), parkingZone.getTo(), parkingZone.getColor(), 55 55 parkingZone.getParkingSpaces(), parkingZone.getParkingZoneLocation(),parkingZone.getResponsibleWorkers()); 56 57 56 } 58 57 -
sources/app/src/main/java/parkup/controllers/VrabotenController.java
r9dd526f rdf4089c 24 24 25 25 @GetMapping({"/vraboten"}) 26 public List<Worker > getAllVraboten() {26 public List<WorkerDemo> getAllVraboten() { 27 27 return this.workerService.getWorkers(); 28 28 } -
sources/app/src/main/java/parkup/data/ParkingZoneAdminView.java
r9dd526f rdf4089c 2 2 3 3 import parkup.entities.ParkingSpace; 4 import parkup.entities.ParkingZone; 4 5 5 6 import java.util.List; … … 9 10 private String pzName; 10 11 private int price; 11 private int time_from;12 private int t ime_to;12 private int from; 13 private int to; 13 14 private String address; 14 15 private String color; 15 16 private List<ParkingSpace> parkingSpaces; 16 17 private ParkingZoneLocation parkingZoneLocation; 17 private List< Integer> responsibleWorkers;18 private List<WorkerDemo> responsibleWorkers; 18 19 19 public ParkingZoneAdminView( int pzId, String pzName, int price, int time_from, int time_to, String address, String color, List<ParkingSpace> parkingSpaces, ParkingZoneLocation parkingZoneLocation, List<Integer> responsibleWorkers) {20 this.pzId = pz Id;21 this.pzName = pz Name;22 this.price = p rice;23 this. time_from = time_from;24 this.t ime_to = time_to;25 this.address = address;26 this.color = color;27 this.parkingSpaces = p arkingSpaces;28 this.parkingZoneLocation = p arkingZoneLocation;20 public ParkingZoneAdminView(ParkingZone pz,List<WorkerDemo> responsibleWorkers) { 21 this.pzId = pz.getId(); 22 this.pzName = pz.getPzName(); 23 this.price = pz.getPrice(); 24 this.from = pz.getFrom(); 25 this.to = pz.getTo(); 26 this.address = pz.getAddress(); 27 this.color = pz.getColor(); 28 this.parkingSpaces = pz.getParkingSpaces(); 29 this.parkingZoneLocation = pz.getParkingZoneLocation(); 29 30 this.responsibleWorkers = responsibleWorkers; 30 31 } 31 32 32 33 public ParkingZoneAdminView() {} 34 35 33 36 34 37 public int getPzId() { … … 56 59 } 57 60 58 public int get Time_from() {59 return time_from;61 public int getFrom() { 62 return from; 60 63 } 61 64 62 public void set Time_from(int time_from) {63 this. time_from = time_from;65 public void setFrom(int from) { 66 this.from = from; 64 67 } 65 68 66 public int getT ime_to() {67 return t ime_to;69 public int getTo() { 70 return to; 68 71 } 69 72 70 public void setT ime_to(int time_to) {71 this.t ime_to = time_to;73 public void setTo(int to) { 74 this.to = to; 72 75 } 73 76 … … 104 107 } 105 108 106 public List< Integer> getResponsibleWorkers() {109 public List<WorkerDemo> getResponsibleWorkers() { 107 110 return responsibleWorkers; 108 111 } 109 112 110 public void setResponsibleWorkers(List< Integer> responsibleWorkers) {113 public void setResponsibleWorkers(List<WorkerDemo> responsibleWorkers) { 111 114 this.responsibleWorkers = responsibleWorkers; 112 115 } -
sources/app/src/main/java/parkup/data/WorkerDemo.java
r9dd526f rdf4089c 1 1 package parkup.data; 2 3 import parkup.entities.Worker; 2 4 3 5 public class WorkerDemo { … … 9 11 public WorkerDemo() {} 10 12 11 public WorkerDemo( int id, String firstName, String lastName, String email) {12 this.workerId = id;13 this.firstName = firstName;14 this.lastName = lastName;15 this.email = email;13 public WorkerDemo(Worker w) { 14 this.workerId =w.getWorkerId(); 15 this.firstName = w.getFirstName(); 16 this.lastName = w.getLastName(); 17 this.email = w.getEmail(); 16 18 } 19 17 20 18 21 public int getWorkerId() { -
sources/app/src/main/java/parkup/services/ParkingZoneService.java
r9dd526f rdf4089c 3 3 import org.springframework.beans.factory.annotation.Autowired; 4 4 import org.springframework.stereotype.Service; 5 import parkup.data.ParkingZoneAdminView; 5 6 import parkup.data.ParkingZoneLocation; 7 import parkup.data.WorkerDemo; 6 8 import parkup.entities.ParkingSpace; 7 9 import parkup.entities.ParkingZone; … … 17 19 import java.util.Objects; 18 20 import java.util.Optional; 21 import java.util.stream.Collectors; 19 22 20 23 @Service … … 36 39 List<ParkingZone> parkingZones= parkingZoneRepository.findAll(); 37 40 for(ParkingZone pz:parkingZones){ 38 setTransientVariables(pz .getId());41 setTransientVariables(pz); 39 42 } 40 43 return parkingZones; 41 44 } 42 45 43 public ParkingZone findById(int parkingZoneId) {46 public ParkingZoneAdminView findById(int parkingZoneId) { 44 47 Optional<ParkingZone> parkingZone = Optional.ofNullable(this.parkingZoneRepository.findByPzId(parkingZoneId)); 45 48 if (!parkingZone.isPresent()) { 46 49 throw new IllegalStateException("ParkingZone does not exist"); 47 50 } 48 setTransientVariables(parkingZone.get() .getId());49 return parkingZone.get();51 setTransientVariables(parkingZone.get()); 52 return new ParkingZoneAdminView(parkingZone.get(),getResponsibleWorkers(parkingZoneId)); 50 53 } 51 54 … … 83 86 //TODO proveri dali ima odgovorni i dokolku ima dali postojat vo bazata 84 87 @Transactional 85 public ParkingZone updateParkingZone(int parkingZoneId, String pzName, int price,88 public ParkingZoneAdminView updateParkingZone(int parkingZoneId, String pzName, int price, 86 89 String location, int from, int to, String color, 87 List<ParkingSpace> parkingSpaces, ParkingZoneLocation parkingZoneLocation, List< Integer> odgovorniLica) {90 List<ParkingSpace> parkingSpaces, ParkingZoneLocation parkingZoneLocation, List<WorkerDemo> responsibleWorkers) { 88 91 89 92 //TODO prati niza od objekti ParkingSpaces i prati objekt ParkingZoneLocation … … 124 127 125 128 if (!parkingSpaces.isEmpty()) { 129 List<String> psNamesInZone=parkingZoneNov.getParkingSpaces().stream().map(ParkingSpace::getPsName).collect(Collectors.toList()); 130 List<ParkingSpace> psToAdd=parkingSpaces.stream().filter(ps->!psNamesInZone.contains(ps.getPsName())).collect(Collectors.toList()); 131 for(ParkingSpace ps:psToAdd){ 132 parkingZoneNov.getParkingSpaces().add(ps); 133 } 134 } 135 if (!responsibleWorkers.isEmpty()) { 126 136 ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId); 127 // for(ParkingSpace space :parkingZone.getParkingSpaces()){ 128 // if(!parkingSpaces.contains(space)){ 129 // for(ParkingSession session: parkingSessionRepository.findByParkingZonePzName(pzName)){ 130 // if(session.getParkingSpace().getPsId()==space.getPsId()) 131 // throw new IllegalStateException("Vlegov vo iffot"); 132 // } 133 // } 134 // } 135 //TODO: treba da se opravi 136 parkingZone.setParkingSpaces(null); 137 List<ParkingSpace> spacesToAdd = new ArrayList<>(parkingSpaces); 138 parkingZone.setParkingSpaces(spacesToAdd); 139 } 140 if (!odgovorniLica.isEmpty()) { 141 ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId); 142 for (Integer vrabotenId : odgovorniLica) { 143 Worker workerToAdd = workerRepository.findByWorkerId(vrabotenId); 137 for (Integer workerId : responsibleWorkers.stream().map(WorkerDemo::getWorkerId).collect(Collectors.toList())) { 138 Worker workerToAdd = workerRepository.findByWorkerId(workerId); 144 139 if(workerToAdd !=null) 145 140 workerToAdd.getParkingZones().add(parkingZone); … … 147 142 } 148 143 149 150 return parkingZoneNov;144 setTransientVariables(parkingZoneNov); 145 return new ParkingZoneAdminView(parkingZoneNov,getResponsibleWorkers(parkingZoneId)); 151 146 } else { 152 147 throw new IllegalStateException("There ParkingZone does not exist"); … … 159 154 Optional<ParkingZone> parkingZoneOpt = Optional.ofNullable(parkingZoneRepository.findByPzId(parkingZoneId)); 160 155 if (parkingZoneOpt.isPresent()) { 156 parkingZoneOpt.get().setParkingSpaces(null); 157 parkingZoneOpt.get().setParkingZoneLocation(null); 161 158 parkingZoneRepository.deleteByPzId(parkingZoneId); 162 159 } else { … … 174 171 return parkingZone.getParkingSpaces().size(); 175 172 } 176 public void setTransientVariables(int pzId){ 177 calculateCapacity(pzId); 178 calculateTakenSpaces(pzId); 173 public void setTransientVariables(ParkingZone pz){ 174 pz.setCapacity(calculateCapacity(pz.getId())); 175 pz.setTakenSpaces(calculateTakenSpaces(pz.getId())); 176 } 177 public List<WorkerDemo> getResponsibleWorkers(int pzId){ 178 ParkingZone parkingZone =parkingZoneRepository.findByPzId(pzId); 179 return workerRepository.findAll().stream().filter(w->w.getParkingZones().contains(parkingZone)).map(WorkerDemo::new).collect(Collectors.toList()); 179 180 } 180 181 } -
sources/app/src/main/java/parkup/services/WorkerService.java
r9dd526f rdf4089c 31 31 } 32 32 33 public List<Worker > getWorkers() {34 return this.workerRepository.findAll() ;33 public List<WorkerDemo> getWorkers() { 34 return this.workerRepository.findAll().stream().map(WorkerDemo::new).collect(Collectors.toList()); 35 35 } 36 36 … … 44 44 List<Worker> workers = this.workerRepository.findAll(); 45 45 List<WorkerDemo> workerDemos = new ArrayList<>(); 46 for (Worker v: workers){47 WorkerDemo vd = new WorkerDemo( v.getWorkerId(),v.getFirstName(), v.getLastName(), v.getEmail());46 for (Worker w : workers){ 47 WorkerDemo vd = new WorkerDemo(w); 48 48 workerDemos.add(vd); 49 49 } -
sources/app/target/classes/application.properties
r9dd526f rdf4089c 2 2 spring.datasource.username=postgres 3 3 spring.datasource.password=1234 4 spring.jpa.hibernate.ddl-auto= create-drop4 spring.jpa.hibernate.ddl-auto=update 5 5 spring.jpa.show-sql=true 6 6 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
Note:
See TracChangeset
for help on using the changeset viewer.