Changeset 97fbc67 for sources/app/src/main/java/parkup/entities/RegistriranParkirac.java

Timestamp:

11/11/21 11:55:43 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

2ace8f0

Parents:

3a58bd6

Message:

fixed deleteVraboten and deleteRegistriranParkirac

File:

• sources/app/src/main/java/parkup/entities/RegistriranParkirac.java (modified) (7 diffs)

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import javax.persistence.*;
 
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
 import parkup.data.Tablicka;
 
 @Entity
 @Table(name = "registriranParkirac")
-public class RegistriranParkirac {
+public class RegistriranParkirac implements UserDetails {
     @Id
     @SequenceGenerator(
@@ -33 +38 @@
     private String password;
 
-    @OneToMany
+    @OneToMany(cascade ={CascadeType.ALL})
     @Column(name = "regTablicki")
     private List<Tablicka> regTablicki;
@@ -46 +51 @@
     private String role;
 
+    private boolean locked;
+
+    private boolean enabled;
+
     public RegistriranParkirac() {
-
         this.regTablicki = new ArrayList<Tablicka>();
-        this.role = "ROLE_REGISTIRAN_PARKIRAC";
+        this.role = "ROLE_REGISTRIRAN_PARKIRAC";
     }
 
@@ -60 +68 @@
         this.email = email;
         this.mobile = mobile;
-        this.role = "ROLE_REGISTIRAN_PARKIRAC";
+        this.role = "ROLE_REGISTRIRAN_PARKIRAC";
     }
 
@@ -70 +78 @@
         this.email = email;
         this.mobile = mobile;
-        this.role = "ROLE_REGISTIRAN_PARKIRAC";
+        this.role = "ROLE_REGISTRIRAN_PARKIRAC";
+    }
+
+    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";
     }
 
@@ -95 +112 @@
     public void setSurname(String surname) {
         this.surname = surname;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
     }
 
@@ -132 +141 @@
 
     public void setRole(String role) {this.role = role;}
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(role);
+        return Collections.singleton(authority);
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public String getUsername() {
+        return email;
+    }
+
+    @Override
+    public boolean isAccountNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isAccountNonLocked() {
+        return !locked;
+    }
+
+    @Override
+    public boolean isCredentialsNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return enabled;
+    }
 }