Changeset 0c049e9

Timestamp:

02/08/22 23:27:06 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

ad4da86

Parents:

c71fa06 (diff), 80ddcae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/ParkUp

# Conflicts:
# sources/app/src/main/java/parkup/data/WorkerDemoParkingZones.java

Location:

sources/app

Files:

• src/main/java/parkup/data/WorkerDemoParkingZones.java (modified) (1 diff)
• src/main/java/parkup/entities/ParkingZone.java (modified) (2 diffs)
• src/main/java/parkup/entities/Worker.java (modified) (1 diff)
• src/main/java/parkup/services/ParkingZoneService.java (modified) (3 diffs)
• src/main/resources/application.properties (modified) (1 diff)
• target/classes/application.properties (modified) (1 diff)
• target/classes/parkup/controllers/VrabotenController.class (modified) ( previous)
• target/classes/parkup/data/AddUpdateWorker.class (modified) ( previous)
• target/classes/parkup/data/WorkerDemoParkingZones.class (modified) ( previous)
• target/classes/parkup/data/enumarations/SessionStatus.class (modified) ( previous)
• target/classes/parkup/entities/ParkingZone.class (modified) ( previous)
• target/classes/parkup/entities/Worker.class (modified) ( previous)
• target/classes/parkup/services/AdministratorService.class (modified) ( previous)
• target/classes/parkup/services/ParkingSessionService.class (modified) ( previous)
• target/classes/parkup/services/ParkingZoneService.class (modified) ( previous)
• target/classes/parkup/services/WorkerService.class (modified) ( previous)

sources/app/src/main/java/parkup/data/WorkerDemoParkingZones.java

@@ -38 +38 @@
         this.role = v.getRole();
         this.status = v.getStatus();
-        this.locked=!v.isAccountNonLocked();
+        this.locked= !v.isAccountNonLocked();
         this.pzNames = v.getParkingZones().stream().map(ParkingZone::getPzName).collect(Collectors.toList());
     }

sources/app/src/main/java/parkup/entities/ParkingZone.java

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

sources/app/src/main/java/parkup/entities/Worker.java

@@ -60 +60 @@
     private UserRole role;
 
-    @ManyToMany
+    @ManyToMany(fetch = FetchType.EAGER)
     private List<ParkingZone> parkingZones;
 

sources/app/src/main/java/parkup/services/ParkingZoneService.java

@@ -147 +147 @@
                     }
                 }else{
-                    parkingZoneNov.setParkingSpaces(null);
+                    parkingZoneNov.setParkingSpaces(new ArrayList<>());
                 }
                 if (!responsibleWorkers.isEmpty()) {
@@ -196 +196 @@
             pz.setCapacity(calculateCapacity(pz.getId()));
             pz.setTakenSpaces(calculateTakenSpaces(pz.getId()));
+            pz.setResponsibleWorkers(getWorkers(pz.getId()));
         }
         public List<WorkerDemo> getResponsibleWorkers(int pzId){
@@ -201 +202 @@
             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());
+
+        }
+    }
+

sources/app/src/main/resources/application.properties

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

sources/app/target/classes/application.properties

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