Ignore:
Timestamp:
02/02/22 14:15:35 (2 years ago)
Author:
andrejTavchioski <andrej.tavchioski@…>
Branches:
master
Children:
df4089c
Parents:
9ff45d6
Message:

backend refactoring

Location:
sources/app/src/main/java/parkup/entities
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed

  • sources/app/src/main/java/parkup/entities/Administrator.java

    r9ff45d6 r9dd526f  
    44import org.springframework.security.core.authority.SimpleGrantedAuthority;
    55import org.springframework.security.core.userdetails.UserDetails;
     6import parkup.data.enumarations.UserRole;
    67
    78import javax.persistence.*;
    … …  
    4142    private String mobile;
    4243
     44    @Enumerated
    4345    @Column(name = "role")
    44     private String role;
     46    private UserRole role;
    4547
    4648    private boolean locked;
    … …  
    4951
    5052    public Administrator(){
    51         this.role = "ROLE_ADMINISTRATOR";
     53        this.role = UserRole.ADMIN;
     54        this.enabled=true;
    5255    }
    5356
    … …  
    5962        this.password = password;
    6063        this.mobile = mobile;
    61         this.role = "ROLE_ADMINISTRATOR";
     64        this.enabled=true;
     65        this.role = UserRole.ADMIN;
    6266    }
    6367
    … …  
    6872        this.password = password;
    6973        this.mobile = mobile;
    70         this.role = "ROLE_ADMINISTRATOR";
     74        this.role = UserRole.ADMIN;
     75        this.enabled=true;
    7176    }
    7277
    … …  
    7782        this.password = password;
    7883        this.mobile = mobile;
    79         this.role = "ROLE_ADMINISTRATOR";
     84        this.role = UserRole.ADMIN;
     85        this.enabled=true;
    8086    }
    8187
    … …  
    124130    }
    125131
    126     public String getRole() {return role;}
     132    public UserRole getRole() {return role;}
    127133
    128     public void setRole(String role) {this.role = role;}
     134    public void setRole(UserRole role) {this.role = role;}
    129135
    130136    @Override
    131137    public Collection<? extends GrantedAuthority> getAuthorities() {
    132         SimpleGrantedAuthority authority = new SimpleGrantedAuthority(role);
     138        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(role.getAuthority());
    133139        return Collections.singleton(authority);
    134140    }

  • sources/app/src/main/java/parkup/entities/Guest.java

    r9ff45d6 r9dd526f  
    33import javax.persistence.*;
    44
    5 import parkup.data.Tablicka;
     5import org.springframework.security.core.GrantedAuthority;
     6import org.springframework.security.core.authority.SimpleGrantedAuthority;
     7import org.springframework.security.core.userdetails.UserDetails;
     8import parkup.data.Plate;
     9import parkup.data.enumarations.UserRole;
     10
     11import java.util.Collection;
     12import java.util.Collections;
    613
    714@Entity
    815@Table(name = "guest")
    9 public class Guest {
     16public class Guest implements UserDetails {
    1017    @Id
    1118    @SequenceGenerator(
    … …  
    2532    @OneToOne
    2633    @JoinColumn(name = "tablickaId", nullable = false)
    27     private Tablicka tablicka;
     34    private Plate plate;
    2835
    2936    @Column(name = "email")
    … …  
    3643    private ParkingSession session;
    3744
    38     public Guest() {}
     45    @Enumerated
     46    private UserRole role;
    3947
    40     public Guest(int guestId, Tablicka tablicka, String email, String mobile) {
     48
     49    public Guest() {this.role=UserRole.GUEST;}
     50
     51    public Guest(int guestId, Plate plate, String email, String mobile) {
    4152        this.guestId = guestId;
    42         this.tablicka = tablicka;
     53        this.plate = plate;
    4354        this.email = email;
    4455        this.mobile = mobile;
     56        this.role=UserRole.GUEST;
    4557    }
    4658
    47     public Guest(Tablicka tablicka, String email, String mobile) {
    48         this.tablicka = tablicka;
     59    public Guest(Plate plate, String email, String mobile) {
     60        this.plate = plate;
    4961        this.email = email;
    5062        this.mobile = mobile;
     63        this.role=UserRole.GUEST;
    5164    }
    5265
    … …  
    5972    }
    6073
    61     public Tablicka getTablicka() {
    62         return tablicka;
     74    public Plate getTablicka() {
     75        return plate;
    6376    }
    6477
    65     public void setTablicka(Tablicka tablicka) {
    66         this.tablicka = tablicka;
     78    public void setTablicka(Plate plate) {
     79        this.plate = plate;
    6780    }
    6881
    … …  
    7588    }
    7689
     90    public ParkingSession getSession() {
     91        return session;
     92    }
     93
     94    public void setSession(ParkingSession session) {
     95        this.session = session;
     96    }
     97
     98    public UserRole getRole() {
     99        return role;
     100    }
     101
     102    public void setRole(UserRole role) {
     103        this.role = role;
     104    }
     105
    77106    public String getMobile() {
    78107        return mobile;
    … …  
    82111        this.mobile = mobile;
    83112    }
     113
     114    @Override
     115    public Collection<? extends GrantedAuthority> getAuthorities() {
     116        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(role.name());
     117        return Collections.singleton(authority);
     118    }
     119
     120    @Override
     121    public String getPassword() {
     122        return null;
     123    }
     124
     125    @Override
     126    public String getUsername() {
     127        return Integer.toString(guestId);
     128    }
     129
     130    @Override
     131    public boolean isAccountNonExpired() {
     132        return false;
     133    }
     134
     135    @Override
     136    public boolean isAccountNonLocked() {
     137        return false;
     138    }
     139
     140    @Override
     141    public boolean isCredentialsNonExpired() {
     142        return false;
     143    }
     144
     145    @Override
     146    public boolean isEnabled() {
     147        return false;
     148    }
    84149}

  • sources/app/src/main/java/parkup/entities/ParkingSession.java

    r9ff45d6 r9dd526f  
    22
    33import org.springframework.format.annotation.DateTimeFormat;
    4 import parkup.data.Tablicka;
     4import parkup.data.Plate;
    55import parkup.data.enumarations.SessionStatus;
    66
    … …  
    3434
    3535    @OneToOne(cascade = {CascadeType.ALL})
    36     @JoinColumn(name = "reg_tablicka", nullable = false)
    37     private Tablicka tablica;
     36    @JoinColumn(name = "plate", nullable = false)
     37    private Plate plate;
    3838
    3939    @Column(name="session_status")
    … …  
    6060    }
    6161
    62     public ParkingSession(Tablicka tablica){
     62    public ParkingSession(Plate plate){
    6363        this.timeStart= LocalDateTime.now();
    6464        this.timeEnd=null;
    65         this.tablica=tablica;
     65        this.plate=plate;
    6666        this.status=SessionStatus.STARTED_UNVERIFIED;
    6767    }
    … …  
    9292    }
    9393
    94     public Tablicka getTablica() {
    95         return tablica;
     94    public Plate getPlate() {
     95        return plate;
    9696    }
    9797
    98     public void setTablica(Tablicka tablica) {
    99         this.tablica = tablica;
     98    public void setPlate(Plate plate) {
     99        this.plate = plate;
    100100    }
    101101

  • sources/app/src/main/java/parkup/entities/ParkingZone.java

    r9ff45d6 r9dd526f  
    4343
    4444    @Transient
    45     @Column(name = "zafateniMesta")
     45    @Column(name = "takenSpaces")
    4646    private int takenSpaces;
    4747
    … …  
    5252//    private List<Vraboten> odgovorniLica;
    5353
    54     @OneToMany(cascade = {CascadeType.MERGE})
     54    @OneToMany(cascade = {CascadeType.ALL})
    5555    private List<ParkingSpace> parkingSpaces;
    5656

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

    r9ff45d6 r9dd526f  
    1010import org.springframework.security.core.authority.SimpleGrantedAuthority;
    1111import org.springframework.security.core.userdetails.UserDetails;
    12 import parkup.data.Tablicka;
     12import parkup.data.Plate;
     13import parkup.data.enumarations.UserRole;
    1314
    1415@Entity
    15 @Table(name = "registriranParkirac")
    16 public class RegistriranParkirac implements UserDetails {
     16@Table(name = "registeredUser")
     17public class RegisteredUser implements UserDetails {
    1718    @Id
    1819    @SequenceGenerator(
    19             name="registriranParkirac_sequence_generator",
    20             sequenceName = "registriranParkirac_sequence",
     20            name="registeredUser_sequence_generator",
     21            sequenceName = "registeredUser_sequence",
    2122            allocationSize = 1,
    2223            initialValue = 300
    … …  
    2425    @GeneratedValue(    //za postgres treba sequence da se namesti i ime na generator mi ga davamo kako od gore sto e
    2526            strategy = GenerationType.SEQUENCE,
    26             generator = "registriranParkirac_sequence_generator"
     27            generator = "registeredUser_sequence_generator"
    2728    )
    2829    @Column(name = "regParkId")
    … …  
    3940
    4041    @OneToMany(cascade ={CascadeType.ALL})
    41     @Column(name = "regTablicki")
    42     private List<Tablicka> regTablicki;
     42    @Column(name = "regPlates")
     43    private List<Plate> plates;
    4344
    4445    @Column(name = "email")
    … …  
    4849    private String mobile;
    4950
     51    @Enumerated
    5052    @Column(name = "role")
    51     private String role;
     53    private UserRole role;
    5254
    5355    @OneToOne
    … …  
    5860    private boolean enabled;
    5961
    60     public RegistriranParkirac() {
    61         this.regTablicki = new ArrayList<Tablicka>();
    62         this.role = "ROLE_REGISTRIRAN_PARKIRAC";
    63         session=null;
    64     }
    65 
    66     public RegistriranParkirac(int regParkId, String name, String surname, String password, List<Tablicka> regTablicki, String email, String mobile) {
     62    public RegisteredUser() {
     63        this.plates = new ArrayList<Plate>();
     64        this.role = UserRole.REG_USER;
     65        session=null;
     66    }
     67
     68    public RegisteredUser(int regParkId, String name, String surname, String password, List<Plate> plates, String email, String mobile) {
    6769        this.regParkId = regParkId;
    6870        this.name = name;
    6971        this.surname = surname;
    7072        this.password = password;
    71         this.regTablicki = regTablicki;
    72         this.email = email;
    73         this.mobile = mobile;
    74         this.role = "ROLE_REGISTRIRAN_PARKIRAC";
    75         session=null;
    76     }
    77 
    78     public RegistriranParkirac(String name, String surname, String password, List<Tablicka> regTablicki, String email, String mobile) {
    79         this.name = name;
    80         this.surname = surname;
    81         this.password = password;
    82         this.regTablicki = regTablicki;
    83         this.email = email;
    84         this.mobile = mobile;
    85         this.role = "ROLE_REGISTRIRAN_PARKIRAC";
    86         session=null;
    87     }
    88 
    89     public RegistriranParkirac(String name, String surname, String email, String password, String mobile) {
    90         this.name = name;
    91         this.surname = surname;
    92         this.password = password;
    93         this.email = email;
    94         this.mobile = mobile;
    95         this.role = "ROLE_REGISTRIRAN_PARKIRAC";
     73        this.plates = plates;
     74        this.email = email;
     75        this.mobile = mobile;
     76        this.role = UserRole.REG_USER;
     77        session=null;
     78    }
     79
     80    public RegisteredUser(String name, String surname, String password, List<Plate> plates, String email, String mobile) {
     81        this.name = name;
     82        this.surname = surname;
     83        this.password = password;
     84        this.plates = plates;
     85        this.email = email;
     86        this.mobile = mobile;
     87        this.role = UserRole.REG_USER;
     88        session=null;
     89    }
     90
     91    public RegisteredUser(String name, String surname, String email, String password, String mobile) {
     92        this.name = name;
     93        this.surname = surname;
     94        this.password = password;
     95        this.email = email;
     96        this.mobile = mobile;
     97        this.role = UserRole.REG_USER;
    9698        session=null;
    9799    }
    … …  
    142144    }
    143145
    144     public List<Tablicka> getRegTablicki() {
    145         return regTablicki;
    146     }
    147 
    148     public void setRegTablicki(List<Tablicka> regTablicki) {
    149         this.regTablicki = regTablicki;
     146    public List<Plate> getPlates() {
     147        return plates;
     148    }
     149
     150    public void setPlates(List<Plate> plates) {
     151        this.plates = plates;
    150152    }
    151153
    … …  
    166168    }
    167169
    168     public String getRole() {return role;}
    169 
    170     public void setRole(String role) {this.role = role;}
     170    public UserRole getRole() {return role;}
     171
     172    public void setRole(UserRole role) {this.role = role;}
    171173
    172174    @Override
    173175    public Collection<? extends GrantedAuthority> getAuthorities() {
    174         SimpleGrantedAuthority authority = new SimpleGrantedAuthority(role);
     176        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(role.getAuthority());
    175177        return Collections.singleton(authority);
    176178    }

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

    r9ff45d6 r9dd526f  
    22
    33import org.springframework.security.core.GrantedAuthority;
     4import org.springframework.security.core.authority.SimpleGrantedAuthority;
    45import org.springframework.security.core.userdetails.UserDetails;
    5 import parkup.data.VrabotenDemo;
    66import parkup.data.enumarations.EmployeeStatus;
     7import parkup.data.enumarations.UserRole;
    78
    89import javax.persistence.*;
    910import java.util.ArrayList;
    1011import java.util.Collection;
     12import java.util.Collections;
    1113import java.util.List;
    1214
    1315@Entity
    14 @Table(name = "vraboten")
    15 public class Vraboten implements UserDetails {
     16@Table(name = "worker")
     17public class Worker implements UserDetails {
    1618    @Id
    1719    @SequenceGenerator(
    18             name="vraboten_sequence_generator",
    19             sequenceName = "vraboten_sequence",
     20            name="worker_sequence_generator",
     21            sequenceName = "worker_sequence",
    2022            allocationSize = 1,
    2123            initialValue = 200
    … …  
    2325    @GeneratedValue(    //za postgres treba sequence da se namesti i ime na generator mi ga davamo kako od gore sto e
    2426            strategy = GenerationType.SEQUENCE,
    25             generator = "vraboten_sequence_generator"
     27            generator = "worker_sequence_generator"
    2628    )
    27     @Column(name = "vrabotenId")
    28     private int vrabotenId;
     29    @Column(name = "workerId")
     30    private int workerId;
    2931
    3032    @Override
    … …  
    5456    private String mobile;
    5557
     58    @Enumerated
    5659    @Column(name = "role")
    57     private String role;
     60    private UserRole role;
    5861
    5962    @ManyToMany(cascade = {CascadeType.ALL})
    … …  
    7477
    7578
    76     public Vraboten() {
    77         this.role = "ROLE_VRABOTEN";
     79    public Worker() {
     80        this.role = UserRole.WORKER;
    7881        this.parkingZones = new ArrayList<ParkingZone>();
    7982        this.enabled = true;
    … …  
    8184    }
    8285
    83     public Vraboten(int vrabotenId, String firstName, String lastName, String email, String password, String mobile, List<ParkingZone> parkingZones) {
    84         this.vrabotenId = vrabotenId;
     86    public Worker(int workerId, String firstName, String lastName, String email, String password, String mobile, List<ParkingZone> parkingZones) {
     87        this.workerId = workerId;
    8588        this.firstName = firstName;
    8689        this.lastName = lastName;
    … …  
    8992        this.mobile = mobile;
    9093        this.parkingZones = parkingZones;
    91         this.role = "ROLE_VRABOTEN";
     94        this.role = UserRole.WORKER;
    9295        this.enabled = true;
    9396        this.status = EmployeeStatus.NOT_WORKING;
    9497    }
    9598
    96     public Vraboten(String firstName, String lastName, String email, String password, String mobile, List<ParkingZone> parkingZones) {
     99    public Worker(String firstName, String lastName, String email, String password, String mobile, List<ParkingZone> parkingZones) {
    97100        this.firstName = firstName;
    98101        this.lastName = lastName;
    … …  
    101104        this.mobile = mobile;
    102105        this.parkingZones = parkingZones;
    103         this.role = "ROLE_VRABOTEN";
     106        this.role = UserRole.WORKER;
    104107        this.enabled = true;
    105108        this.status = EmployeeStatus.NOT_WORKING;
    106109    }
    107110
    108     public Vraboten(String firstName, String lastName, String email, String password, String mobile) {
     111    public Worker(String firstName, String lastName, String email, String password, String mobile) {
    109112        this.firstName=firstName;
    110113        this.lastName=lastName;
    … …  
    113116        this.mobile=mobile;
    114117        this.parkingZones=new ArrayList<>();
    115         this.role="ROLE_VRABOTEN";
     118        this.role = UserRole.WORKER;
    116119        this.enabled=true;
    117120        this.status = EmployeeStatus.NOT_WORKING;
    118121    }
    119122
    120     public int getVrabotenId() {
    121         return vrabotenId;
    122     }
    123 
    124     public void setVrabotenId(int vrabotenId) {
    125         this.vrabotenId = vrabotenId;
     123    public int getWorkerId() {
     124        return workerId;
     125    }
     126
     127    public void setWorkerId(int workerId) {
     128        this.workerId = workerId;
    126129    }
    127130
    … …  
    152155    @Override
    153156    public Collection<? extends GrantedAuthority> getAuthorities() {
    154         return null;
     157        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(role.getAuthority());
     158        return Collections.singleton(authority);
    155159    }
    156160
    … …  
    200204    }
    201205
    202     public String getRole() {return role;}
    203 
    204     public void setRole(String role) {this.role = role;}
     206    public UserRole getRole() {return role;}
     207
     208    public void setRole(UserRole role) {this.role = role;}
    205209
    206210    public List<ParkingZone> getParkingZones() {return parkingZones;}
Note: See TracChangeset for help on using the changeset viewer.