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

Timestamp:

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

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

df4089c

Parents:

9ff45d6

Message:

backend refactoring

File:

• sources/app/src/main/java/parkup/entities/RegisteredUser.java (moved) (moved from sources/app/src/main/java/parkup/entities/RegistriranParkirac.java ) (7 diffs)

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

@@ -10 +10 @@
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
-import parkup.data.Tablicka;
+import parkup.data.Plate;
+import parkup.data.enumarations.UserRole;
 
 @Entity
-@Table(name = "registriranParkirac")
-public class RegistriranParkirac implements UserDetails {
+@Table(name = "registeredUser")
+public class RegisteredUser implements UserDetails {
     @Id
     @SequenceGenerator(
-            name="registriranParkirac_sequence_generator",
-            sequenceName = "registriranParkirac_sequence",
+            name="registeredUser_sequence_generator",
+            sequenceName = "registeredUser_sequence",
             allocationSize = 1,
             initialValue = 300
@@ -24 +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 = "registriranParkirac_sequence_generator"
+            generator = "registeredUser_sequence_generator"
     )
     @Column(name = "regParkId")
@@ -39 +40 @@
 
     @OneToMany(cascade ={CascadeType.ALL})
-    @Column(name = "regTablicki")
-    private List<Tablicka> regTablicki;
+    @Column(name = "regPlates")
+    private List<Plate> plates;
 
     @Column(name = "email")
@@ -48 +49 @@
     private String mobile;
 
+    @Enumerated
     @Column(name = "role")
-    private String role;
+    private UserRole role;
 
     @OneToOne
@@ -58 +60 @@
     private boolean enabled;
 
-    public RegistriranParkirac() {
-        this.regTablicki = new ArrayList<Tablicka>();
-        this.role = "ROLE_REGISTRIRAN_PARKIRAC";
-        session=null;
-    }
-
-    public RegistriranParkirac(int regParkId, String name, String surname, String password, List<Tablicka> regTablicki, String email, String mobile) {
+    public RegisteredUser() {
+        this.plates = new ArrayList<Plate>();
+        this.role = UserRole.REG_USER;
+        session=null;
+    }
+
+    public RegisteredUser(int regParkId, String name, String surname, String password, List<Plate> plates, String email, String mobile) {
         this.regParkId = regParkId;
         this.name = name;
         this.surname = surname;
         this.password = password;
-        this.regTablicki = regTablicki;
-        this.email = email;
-        this.mobile = mobile;
-        this.role = "ROLE_REGISTRIRAN_PARKIRAC";
-        session=null;
-    }
-
-    public RegistriranParkirac(String name, String surname, String password, List<Tablicka> regTablicki, String email, String mobile) {
-        this.name = name;
-        this.surname = surname;
-        this.password = password;
-        this.regTablicki = regTablicki;
-        this.email = email;
-        this.mobile = mobile;
-        this.role = "ROLE_REGISTRIRAN_PARKIRAC";
-        session=null;
-    }
-
-    public RegistriranParkirac(String name, String surname, String email, String password, String mobile) {
-        this.name = name;
-        this.surname = surname;
-        this.password = password;
-        this.email = email;
-        this.mobile = mobile;
-        this.role = "ROLE_REGISTRIRAN_PARKIRAC";
+        this.plates = plates;
+        this.email = email;
+        this.mobile = mobile;
+        this.role = UserRole.REG_USER;
+        session=null;
+    }
+
+    public RegisteredUser(String name, String surname, String password, List<Plate> plates, String email, String mobile) {
+        this.name = name;
+        this.surname = surname;
+        this.password = password;
+        this.plates = plates;
+        this.email = email;
+        this.mobile = mobile;
+        this.role = UserRole.REG_USER;
+        session=null;
+    }
+
+    public RegisteredUser(String name, String surname, String email, String password, String mobile) {
+        this.name = name;
+        this.surname = surname;
+        this.password = password;
+        this.email = email;
+        this.mobile = mobile;
+        this.role = UserRole.REG_USER;
         session=null;
     }
@@ -142 +144 @@
     }
 
-    public List<Tablicka> getRegTablicki() {
-        return regTablicki;
-    }
-
-    public void setRegTablicki(List<Tablicka> regTablicki) {
-        this.regTablicki = regTablicki;
+    public List<Plate> getPlates() {
+        return plates;
+    }
+
+    public void setPlates(List<Plate> plates) {
+        this.plates = plates;
     }
 
@@ -166 +168 @@
     }
 
-    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;}
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
-        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(role);
+        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(role.getAuthority());
         return Collections.singleton(authority);
     }