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

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

File:

• src/main/java/mk/ukim/finki/busngo/web/RegisterController.java (modified) (3 diffs)

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) {