Context Navigation

Changes in / [0c049e9:c71fa06]

Location:

sources/app

Files:

r0c049e9	rc71fa06
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	}

-              r0c049e9
+              rc71fa06
     @OneToMany(cascade = {CascadeType.ALL})
     private List<ParkingSpace> parkingSpaces;
-    @Transient
-    private List<String> responsibleWorkers;
 …
         this.price = price;
+    }
-    public List<String> getResponsibleWorkers() {
-        return responsibleWorkers;
+    }
-    public void setResponsibleWorkers(List<String> responsibleWorkers) {
-        this.responsibleWorkers = responsibleWorkers;
+    }
     public int getCapacity() {
         return this.capacity;

r0c049e9	rc71fa06
60	60	private UserRole role;
61	61
62		@ManyToMany~~(fetch = FetchType.EAGER)~~
	62	@ManyToMany
63	63	private List<ParkingZone> parkingZones;
64	64

-              r0c049e9
+              rc71fa06
+                    }
                 }else{
                     parkingZoneNov.setParkingSpaces(new ArrayList<>());
+                    parkingZoneNov.setParkingSpaces(null);
+                }
                 if (!responsibleWorkers.isEmpty()) {
 …
             pz.setCapacity(calculateCapacity(pz.getId()));
             pz.setTakenSpaces(calculateTakenSpaces(pz.getId()));
-            pz.setResponsibleWorkers(getWorkers(pz.getId()));
+        }
         public List<WorkerDemo> getResponsibleWorkers(int pzId){
 …
             return workerRepository.findAll().stream().filter(w->w.getParkingZones().contains(parkingZone)).map(WorkerDemo::new).collect(Collectors.toList());
+        }
+        public List<String> getWorkers(int pzId){
+            ParkingZone parkingZone =parkingZoneRepository.findByPzId(pzId);
+            return workerRepository.findAll().stream().filter(w->w.getParkingZones().contains(parkingZone)).map(w->w.getFirstName() + " " + w.getLastName()).collect(Collectors.toList());
+        }
+    }
+    }

-              r0c049e9
+              rc71fa06
 spring.datasource.url=jdbc:postgresql://localhost:5432/parkupdb
 spring.datasource.username=postgres
 spring.datasource.password=Lampion123
 spring.jpa.hibernate.ddl-auto=create-drop
+spring.datasource.password=1234
+spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect

-              r0c049e9
+              rc71fa06
 spring.datasource.url=jdbc:postgresql://localhost:5432/parkupdb
 spring.datasource.username=postgres
 spring.datasource.password=Lampion123
 spring.jpa.hibernate.ddl-auto=create-drop
+spring.datasource.password=1234
+spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect

Note: See TracChangeset for help on using the changeset viewer.