Changeset 0c049e9 for sources/app/src/main/java/parkup/entities

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/src/main/java/parkup/entities

Files:

• ParkingZone.java (modified) (2 diffs)
• Worker.java (modified) (1 diff)

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;