Changeset 8b875e6 for src/main/java/mk/ukim/finki/busngo/model

Timestamp:

05/05/24 01:27:16 (7 months ago)

Author:

ppaunovski <paunovskipavel@…>

Branches:

master

Children:

baf4cc4

Parents:

4d026a5

Message:

Added roles to Users and some minor changes

Location:

src/main/java/mk/ukim/finki/busngo/model/entities

Files:

• Kondukter.java (modified) (1 diff)
• Korisnik.java (modified) (2 diffs)
• Patnik.java (modified) (1 diff)
• Vozac.java (modified) (1 diff)
• Vraboten.java (modified) (2 diffs)

src/main/java/mk/ukim/finki/busngo/model/entities/Kondukter.java

@@ -3 +3 @@
 import jakarta.persistence.*;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 import java.util.Objects;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Entity

src/main/java/mk/ukim/finki/busngo/model/entities/Korisnik.java

@@ -50 +50 @@
     private String kLozinka;
 
+    @Basic
+    @Column(name = "k_role")
+    @Enumerated(EnumType.STRING)
+    private Role kRole;
+
 //    @OneToMany(mappedBy = "korisnikByPatnikKId")
 //    private List<Bilet> biletsByKId;
@@ -60 +65 @@
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
-        return kIsAdmin ? Collections.singletonList(Role.ROLE_ADMIN) : Collections.singletonList(Role.ROLE_USER);
+        return Collections.singletonList(kRole);
     }
 

src/main/java/mk/ukim/finki/busngo/model/entities/Patnik.java

@@ -3 +3 @@
 import jakarta.persistence.*;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 import java.util.Objects;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Entity

src/main/java/mk/ukim/finki/busngo/model/entities/Vozac.java

@@ -3 +3 @@
 import jakarta.persistence.*;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 import java.util.Objects;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Entity

src/main/java/mk/ukim/finki/busngo/model/entities/Vraboten.java

@@ -3 +3 @@
 import jakarta.persistence.*;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
@@ -8 +9 @@
 import java.util.Objects;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Entity