Changeset 97fbc67 for sources/app/src/main/java/parkup/entities/Vraboten.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/Vraboten.java (modified) (7 diffs)

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

@@ -1 +1 @@
 package parkup.entities;
 
-import parkup.data.Tablicka;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import parkup.data.VrabotenDemo;
 
 import javax.persistence.*;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 @Entity
 @Table(name = "vraboten")
-public class Vraboten {
+public class Vraboten implements UserDetails {
     @Id
     @SequenceGenerator(
@@ -24 +27 @@
     private int vrabotenId;
 
+    @Override
+    public String toString() {
+        return "Vraboten{" +
+                "firstName='" + firstName + '\'' +
+                ", lastName='" + lastName + '\'' +
+                ", parkingZones=" + parkingZones +
+                ", locked=" + locked +
+                ", enabled=" + enabled +
+                '}';
+    }
+
     @Column(name = "firstName")
     private String firstName;
@@ -49 +63 @@
     private String status;
 
-    @Column(name = "account")
-    private boolean account;
+    @Column(name="locked")
+    private boolean locked;
+
+    @Column(name = "enabled")
+    private boolean enabled;
+
 
     public Vraboten() {
         this.role = "ROLE_VRABOTEN";
         this.parkingZones = new ArrayList<ParkingZone>();
-        this.account = true;
+        this.enabled = false;
         this.status = "neRaboti";
     }
@@ -68 +86 @@
         this.parkingZones = parkingZones;
         this.role = "ROLE_VRABOTEN";
-        this.account = true;
+        this.enabled = false;
         this.status = "neRaboti";
     }
@@ -80 +98 @@
         this.parkingZones = parkingZones;
         this.role = "ROLE_VRABOTEN";
-        this.account = true;
+        this.enabled = false;
         this.status = "neRaboti";
+    }
+
+    public Vraboten(String firstName, String lastName, String email, String password, String mobile) {
+        this.firstName=firstName;
+        this.lastName=lastName;
+        this.email=email;
+        this.password=password;
+        this.mobile=mobile;
+        this.parkingZones=new ArrayList<>();
+        this.enabled=false;
+        this.status="neRaboti";
+        this.role="ROLE_VRABOTEN";
     }
 
@@ -116 +146 @@
     }
 
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return null;
+    }
+
     public String getPassword() {
         return password;
     }
 
+    @Override
+    public String getUsername() {
+        return email;
+    }
+
+    @Override
+    public boolean isAccountNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isAccountNonLocked() {
+        return !locked;
+    }
+
+    public void lockVraboten(){
+        this.locked = !locked;
+    }
+
+    @Override
+    public boolean isCredentialsNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return enabled;
+    }
+
     public void setPassword(String password) {
         this.password = password;
@@ -144 +208 @@
     public void setStatus(String status) {this.status = status;}
 
-    public boolean isAccount() {return account;}
-
-    public void setAccount(boolean account) {this.account = account;}
+    public boolean isAccount() {return enabled;}
+
+    public void setAccount(boolean account) {this.enabled = account;}
 }