Changeset 98f448a for sources/app/src/main/java/parkup/entities

Timestamp:

02/02/22 19:35:14 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

80ddcae, c71fa06

Parents:

df4089c

Message:

parkingZone and parkingSession services fix

Location:

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

Files:

• Administrator.java (modified) (4 diffs)
• Guest.java (modified) (3 diffs)
• RegisteredUser.java (modified) (4 diffs)
• Worker.java (modified) (5 diffs)

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

@@ -51 +51 @@
 
     public Administrator(){
-        this.role = UserRole.ADMIN;
+        this.role = UserRole.ROLE_ADMIN;
         this.enabled=true;
     }
@@ -63 +63 @@
         this.mobile = mobile;
         this.enabled=true;
-        this.role = UserRole.ADMIN;
+        this.role = UserRole.ROLE_ADMIN;
     }
 
@@ -72 +72 @@
         this.password = password;
         this.mobile = mobile;
-        this.role = UserRole.ADMIN;
+        this.role = UserRole.ROLE_ADMIN;
         this.enabled=true;
     }
@@ -82 +82 @@
         this.password = password;
         this.mobile = mobile;
-        this.role = UserRole.ADMIN;
+        this.role = UserRole.ROLE_ADMIN;
         this.enabled=true;
     }

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

@@ -47 +47 @@
 
 
-    public Guest() {this.role=UserRole.GUEST;}
+    public Guest() {this.role=UserRole.ROLE_USER;}
 
     public Guest(int guestId, Plate plate, String email, String mobile) {
@@ -54 +54 @@
         this.email = email;
         this.mobile = mobile;
-        this.role=UserRole.GUEST;
+        this.role=UserRole.ROLE_USER;
     }
 
@@ -61 +61 @@
         this.email = email;
         this.mobile = mobile;
-        this.role=UserRole.GUEST;
+        this.role=UserRole.ROLE_USER;
     }
 

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

@@ -62 +62 @@
     public RegisteredUser() {
         this.plates = new ArrayList<Plate>();
-        this.role = UserRole.REG_USER;
+        this.role = UserRole.ROLE_REG_USER;
         session=null;
     }
@@ -74 +74 @@
         this.email = email;
         this.mobile = mobile;
-        this.role = UserRole.REG_USER;
+        this.role = UserRole.ROLE_REG_USER;
         session=null;
     }
@@ -85 +85 @@
         this.email = email;
         this.mobile = mobile;
-        this.role = UserRole.REG_USER;
+        this.role = UserRole.ROLE_REG_USER;
         session=null;
     }
@@ -95 +95 @@
         this.email = email;
         this.mobile = mobile;
-        this.role = UserRole.REG_USER;
+        this.role = UserRole.ROLE_REG_USER;
         session=null;
     }

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

@@ -60 +60 @@
     private UserRole role;
 
-    @ManyToMany(cascade = {CascadeType.ALL})
+    @ManyToMany
     private List<ParkingZone> parkingZones;
 
@@ -78 +78 @@
 
     public Worker() {
-        this.role = UserRole.WORKER;
+        this.role = UserRole.ROLE_WORKER;
         this.parkingZones = new ArrayList<ParkingZone>();
         this.enabled = true;
@@ -92 +92 @@
         this.mobile = mobile;
         this.parkingZones = parkingZones;
-        this.role = UserRole.WORKER;
+        this.role = UserRole.ROLE_WORKER;
         this.enabled = true;
         this.status = EmployeeStatus.NOT_WORKING;
@@ -104 +104 @@
         this.mobile = mobile;
         this.parkingZones = parkingZones;
-        this.role = UserRole.WORKER;
+        this.role = UserRole.ROLE_WORKER;
         this.enabled = true;
         this.status = EmployeeStatus.NOT_WORKING;
@@ -116 +116 @@
         this.mobile=mobile;
         this.parkingZones=new ArrayList<>();
-        this.role = UserRole.WORKER;
+        this.role = UserRole.ROLE_WORKER;
         this.enabled=true;
         this.status = EmployeeStatus.NOT_WORKING;