Changeset 9dd526f for sources/app/src/main/java/parkup/entities/Worker.java

Timestamp:

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

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

df4089c

Parents:

9ff45d6

Message:

backend refactoring

File:

• sources/app/src/main/java/parkup/entities/Worker.java (moved) (moved from sources/app/src/main/java/parkup/entities/Vraboten.java ) (10 diffs)

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

@@ -2 +2 @@
 
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
-import parkup.data.VrabotenDemo;
 import parkup.data.enumarations.EmployeeStatus;
+import parkup.data.enumarations.UserRole;
 
 import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 @Entity
-@Table(name = "vraboten")
-public class Vraboten implements UserDetails {
+@Table(name = "worker")
+public class Worker implements UserDetails {
     @Id
     @SequenceGenerator(
-            name="vraboten_sequence_generator",
-            sequenceName = "vraboten_sequence",
+            name="worker_sequence_generator",
+            sequenceName = "worker_sequence",
             allocationSize = 1,
             initialValue = 200
@@ -23 +25 @@
     @GeneratedValue(    //za postgres treba sequence da se namesti i ime na generator mi ga davamo kako od gore sto e
             strategy = GenerationType.SEQUENCE,
-            generator = "vraboten_sequence_generator"
+            generator = "worker_sequence_generator"
     )
-    @Column(name = "vrabotenId")
-    private int vrabotenId;
+    @Column(name = "workerId")
+    private int workerId;
 
     @Override
@@ -54 +56 @@
     private String mobile;
 
+    @Enumerated
     @Column(name = "role")
-    private String role;
+    private UserRole role;
 
     @ManyToMany(cascade = {CascadeType.ALL})
@@ -74 +77 @@
 
 
-    public Vraboten() {
-        this.role = "ROLE_VRABOTEN";
+    public Worker() {
+        this.role = UserRole.WORKER;
         this.parkingZones = new ArrayList<ParkingZone>();
         this.enabled = true;
@@ -81 +84 @@
     }
 
-    public Vraboten(int vrabotenId, String firstName, String lastName, String email, String password, String mobile, List<ParkingZone> parkingZones) {
-        this.vrabotenId = vrabotenId;
+    public Worker(int workerId, String firstName, String lastName, String email, String password, String mobile, List<ParkingZone> parkingZones) {
+        this.workerId = workerId;
         this.firstName = firstName;
         this.lastName = lastName;
@@ -89 +92 @@
         this.mobile = mobile;
         this.parkingZones = parkingZones;
-        this.role = "ROLE_VRABOTEN";
+        this.role = UserRole.WORKER;
         this.enabled = true;
         this.status = EmployeeStatus.NOT_WORKING;
     }
 
-    public Vraboten(String firstName, String lastName, String email, String password, String mobile, List<ParkingZone> parkingZones) {
+    public Worker(String firstName, String lastName, String email, String password, String mobile, List<ParkingZone> parkingZones) {
         this.firstName = firstName;
         this.lastName = lastName;
@@ -101 +104 @@
         this.mobile = mobile;
         this.parkingZones = parkingZones;
-        this.role = "ROLE_VRABOTEN";
+        this.role = UserRole.WORKER;
         this.enabled = true;
         this.status = EmployeeStatus.NOT_WORKING;
     }
 
-    public Vraboten(String firstName, String lastName, String email, String password, String mobile) {
+    public Worker(String firstName, String lastName, String email, String password, String mobile) {
         this.firstName=firstName;
         this.lastName=lastName;
@@ -113 +116 @@
         this.mobile=mobile;
         this.parkingZones=new ArrayList<>();
-        this.role="ROLE_VRABOTEN";
+        this.role = UserRole.WORKER;
         this.enabled=true;
         this.status = EmployeeStatus.NOT_WORKING;
     }
 
-    public int getVrabotenId() {
-        return vrabotenId;
-    }
-
-    public void setVrabotenId(int vrabotenId) {
-        this.vrabotenId = vrabotenId;
+    public int getWorkerId() {
+        return workerId;
+    }
+
+    public void setWorkerId(int workerId) {
+        this.workerId = workerId;
     }
 
@@ -152 +155 @@
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
-        return null;
+        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(role.getAuthority());
+        return Collections.singleton(authority);
     }
 
@@ -200 +204 @@
     }
 
-    public String getRole() {return role;}
-
-    public void setRole(String role) {this.role = role;}
+    public UserRole getRole() {return role;}
+
+    public void setRole(UserRole role) {this.role = role;}
 
     public List<ParkingZone> getParkingZones() {return parkingZones;}