Changes in / [c71fa06:0c049e9]
- Location:
- sources/app
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/data/WorkerDemoParkingZones.java
rc71fa06 r0c049e9 38 38 this.role = v.getRole(); 39 39 this.status = v.getStatus(); 40 this.locked= !v.isAccountNonLocked();40 this.locked= !v.isAccountNonLocked(); 41 41 this.pzNames = v.getParkingZones().stream().map(ParkingZone::getPzName).collect(Collectors.toList()); 42 42 } -
sources/app/src/main/java/parkup/entities/ParkingZone.java
rc71fa06 r0c049e9 54 54 @OneToMany(cascade = {CascadeType.ALL}) 55 55 private List<ParkingSpace> parkingSpaces; 56 57 @Transient 58 private List<String> responsibleWorkers; 56 59 57 60 … … 119 122 this.price = price; 120 123 } 124 public List<String> getResponsibleWorkers() { 125 return responsibleWorkers; 126 } 121 127 128 public void setResponsibleWorkers(List<String> responsibleWorkers) { 129 this.responsibleWorkers = responsibleWorkers; 130 } 122 131 public int getCapacity() { 123 132 return this.capacity; -
sources/app/src/main/java/parkup/entities/Worker.java
rc71fa06 r0c049e9 60 60 private UserRole role; 61 61 62 @ManyToMany 62 @ManyToMany(fetch = FetchType.EAGER) 63 63 private List<ParkingZone> parkingZones; 64 64 -
sources/app/src/main/java/parkup/services/ParkingZoneService.java
rc71fa06 r0c049e9 147 147 } 148 148 }else{ 149 parkingZoneNov.setParkingSpaces(n ull);149 parkingZoneNov.setParkingSpaces(new ArrayList<>()); 150 150 } 151 151 if (!responsibleWorkers.isEmpty()) { … … 196 196 pz.setCapacity(calculateCapacity(pz.getId())); 197 197 pz.setTakenSpaces(calculateTakenSpaces(pz.getId())); 198 pz.setResponsibleWorkers(getWorkers(pz.getId())); 198 199 } 199 200 public List<WorkerDemo> getResponsibleWorkers(int pzId){ … … 201 202 return workerRepository.findAll().stream().filter(w->w.getParkingZones().contains(parkingZone)).map(WorkerDemo::new).collect(Collectors.toList()); 202 203 } 203 } 204 204 public List<String> getWorkers(int pzId){ 205 ParkingZone parkingZone =parkingZoneRepository.findByPzId(pzId); 206 return workerRepository.findAll().stream().filter(w->w.getParkingZones().contains(parkingZone)).map(w->w.getFirstName() + " " + w.getLastName()).collect(Collectors.toList()); 207 208 } 209 } 210 -
sources/app/src/main/resources/application.properties
rc71fa06 r0c049e9 1 1 spring.datasource.url=jdbc:postgresql://localhost:5432/parkupdb 2 2 spring.datasource.username=postgres 3 spring.datasource.password= 12344 spring.jpa.hibernate.ddl-auto= update3 spring.datasource.password=Lampion123 4 spring.jpa.hibernate.ddl-auto=create-drop 5 5 spring.jpa.show-sql=true 6 6 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect -
sources/app/target/classes/application.properties
rc71fa06 r0c049e9 1 1 spring.datasource.url=jdbc:postgresql://localhost:5432/parkupdb 2 2 spring.datasource.username=postgres 3 spring.datasource.password= 12344 spring.jpa.hibernate.ddl-auto= update3 spring.datasource.password=Lampion123 4 spring.jpa.hibernate.ddl-auto=create-drop 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.