Changeset 80ddcae

Timestamp:

02/02/22 20:21:58 (2 years ago)

Author:

Tasevski2 <39170279+Tasevski2@…>

Branches:

master

Children:

0c049e9

Parents:

98f448a

Message:

Fixed small bugs

Location:

sources/app

Files:

• src/main/java/parkup/data/WorkerDemoParkingZones.java (modified) (1 diff)
• src/main/java/parkup/data/enumarations/SessionStatus.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/java/parkup/services/WorkerService.java (modified) (1 diff)
• 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.isEnabled();
+        this.locked= !v.isAccountNonLocked();
         this.pzNames = v.getParkingZones().stream().map(ParkingZone::getPzName).collect(Collectors.toList());
     }

sources/app/src/main/java/parkup/data/enumarations/SessionStatus.java

@@ -2 +2 @@
 
 public enum SessionStatus {
+    STARTED_UNVERIFIED,
     STARTED_VERIFIED,
-    STARTED_UNVERIFIED,
     ENDED_UNPAID,
     ENDED_PAID

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

@@ -133 +133 @@
                     }
                 }else{
-                    parkingZoneNov.setParkingSpaces(null);
+                    parkingZoneNov.setParkingSpaces(new ArrayList<>());
                 }
                 if (!responsibleWorkers.isEmpty()) {
@@ -182 +182 @@
             pz.setCapacity(calculateCapacity(pz.getId()));
             pz.setTakenSpaces(calculateTakenSpaces(pz.getId()));
+            pz.setResponsibleWorkers(getWorkers(pz.getId()));
         }
         public List<WorkerDemo> getResponsibleWorkers(int pzId){
@@ -187 +188 @@
             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/java/parkup/services/WorkerService.java

@@ -115 +115 @@
                 workerOpt.get().setPassword(bCryptPasswordEncoder.encode(password));
             }
-            workerOpt.get().setAccount(locked);
+            workerOpt.get().setLocked(locked);
 
             if (firstName != null && firstName.length() > 1 && !Objects.equals(workerOpt.get().getFirstName(), firstName)) {

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