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

Timestamp:

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

Author:

ppaunovski <paunovskipavel@…>

Branches:

master

Parents:

4d026a5

Message:

Added roles to Users and some minor changes

Location:

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

Files:

• model/entities/Kondukter.java (modified) (1 diff)
• model/entities/Korisnik.java (modified) (2 diffs)
• model/entities/Patnik.java (modified) (1 diff)
• model/entities/Vozac.java (modified) (1 diff)
• model/entities/Vraboten.java (modified) (2 diffs)
• repository/VrabotrenRepository.java (added)
• service/AuthService.java (modified) (2 diffs)
• service/KorisnikService.java (modified) (2 diffs)
• service/impl/AuthServiceImpl.java (modified) (2 diffs)
• service/impl/KorisnikServiceImpl.java (modified) (1 diff)
• web/RegisterController.java (modified) (3 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

src/main/java/mk/ukim/finki/busngo/service/AuthService.java

@@ -2 +2 @@
 
 import mk.ukim.finki.busngo.model.entities.Korisnik;
+import mk.ukim.finki.busngo.model.enums.Role;
 import mk.ukim.finki.busngo.model.enums.VrabotenType;
 
@@ -9 +10 @@
     Korisnik registerVraboten(String ime, String email, String password, String confirmPassword, String address, String telefon, VrabotenType type, Double salary);
 
+    Korisnik register(String name, String email, String password, String confirmPassword, String address, String phone, Role role, Double salary);
 }

src/main/java/mk/ukim/finki/busngo/service/KorisnikService.java

@@ -2 +2 @@
 
 import mk.ukim.finki.busngo.model.entities.Korisnik;
+import mk.ukim.finki.busngo.model.enums.Role;
 
 
@@ -10 +11 @@
     Korisnik findById(Long id);
     Korisnik loadUserByEmail(String email);
+
 }

src/main/java/mk/ukim/finki/busngo/service/impl/AuthServiceImpl.java

@@ -5 +5 @@
 import mk.ukim.finki.busngo.model.entities.Patnik;
 import mk.ukim.finki.busngo.model.entities.Vozac;
+import mk.ukim.finki.busngo.model.enums.Role;
 import mk.ukim.finki.busngo.model.enums.VrabotenType;
 import mk.ukim.finki.busngo.model.exceptions.InvalidCredentialsException;
@@ -128 +129 @@
     }
 
+    @Override
+    public Korisnik register(String name, String email, String password, String confirmPassword, String address, String phone, Role role, Double salary) {
+        if (email == null || password == null || email.isEmpty() || password.isEmpty()) {
+            throw new InvalidCredentialsException();
+        }
+
+        if(!password.equals(confirmPassword)){
+            throw new InvalidCredentialsException();
+        }
+
+        if(role.equals(Role.ROLE_DRIVER)){
+            Vozac vozac = new Vozac();
+            vozac.setKIme(name);
+            vozac.setKAdresa(address);
+            vozac.setKLozinka(passwordEncoder.encode(password));
+            vozac.setKEmail(email);
+            vozac.setKTelefon(phone);
+            vozac.setKIsAdmin(role.equals(Role.ROLE_ADMIN));
+            vozac.setKRole(role);
+            vozac.setVPlata(salary != null ? salary : 0.0);
+            vozac.setVDatumNaVrabotuvanje(Date.valueOf(LocalDate.now()));
+            this.korisnikRepository.save(vozac);
+            return vozacRepository.save(vozac);
+        } else if(role.equals(Role.ROLE_CONDUCTOR)){
+            Kondukter kondukter = new Kondukter();
+            kondukter.setKIme(name);
+            kondukter.setKAdresa(address);
+            kondukter.setKLozinka(passwordEncoder.encode(password));
+            kondukter.setKEmail(email);
+            kondukter.setKTelefon(phone);
+            kondukter.setKIsAdmin(role.equals(Role.ROLE_ADMIN));
+            kondukter.setKRole(role);
+            kondukter.setVPlata(salary != null ? salary : 0.0);
+            kondukter.setVDatumNaVrabotuvanje(Date.valueOf(LocalDate.now()));
+            this.korisnikRepository.save(kondukter);
+            return kondukterRepository.save(kondukter);
+        } else {
+            Patnik patnik = new Patnik();
+            patnik.setKIme(name);
+            patnik.setKAdresa(address);
+            patnik.setKLozinka(passwordEncoder.encode(password));
+            patnik.setKEmail(email);
+            patnik.setKTelefon(phone);
+            patnik.setKIsAdmin(role.equals(Role.ROLE_ADMIN));
+            patnik.setKRole(role);
+            this.korisnikRepository.save(patnik);
+            return patnikRepository.save(patnik);
+        }
+    }
+
 
 }

src/main/java/mk/ukim/finki/busngo/service/impl/KorisnikServiceImpl.java

@@ -2 +2 @@
 
 import mk.ukim.finki.busngo.model.entities.Korisnik;
+import mk.ukim.finki.busngo.model.enums.Role;
 import mk.ukim.finki.busngo.model.exceptions.InvalidUserId;
 import mk.ukim.finki.busngo.repository.KorisnikRepository;

src/main/java/mk/ukim/finki/busngo/web/RegisterController.java

@@ -2 +2 @@
 
 import mk.ukim.finki.busngo.model.entities.Korisnik;
+import mk.ukim.finki.busngo.model.enums.Role;
 import mk.ukim.finki.busngo.model.enums.VrabotenType;
 import mk.ukim.finki.busngo.model.exceptions.InvalidCredentialsException;
@@ -35 +36 @@
         }
 
-        model.addAttribute("types", VrabotenType.values());
+        model.addAttribute("roles", Role.values());
 
         model.addAttribute("bodyContent", "register");
@@ -48 +49 @@
                            @RequestParam String address,
                            @RequestParam String phone,
-                           @RequestParam(required = false)VrabotenType vrabotenType,
+                           @RequestParam Role role,
                            @RequestParam(required = false) Double salary
                            ) {
         try{
-            Korisnik korisnik;
-            if(vrabotenType != null){
-                 korisnik = this.authService.registerVraboten(name, email, password, confirmPassword, address, phone, vrabotenType, salary);
+            Korisnik korisnik = authService.register(name, email, password, confirmPassword, address, phone, role, salary);
 
-            }
-            else
-                korisnik = this.authService.registerPatnik(name, email, password, confirmPassword, address, phone);
             return "redirect:/login";
         } catch (InvalidCredentialsException | UserAlreadyExistsException exception) {