Changeset f9cc555 for src/main/java/com/example/moviezone

Timestamp:

02/06/23 17:05:56 (22 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

a69d48c

Parents:

43a1688

Message:

changes to register

Location:

src/main/java/com/example/moviezone

Files:

• model/exceptions/InvalidUsernameOrPasswordException.java (added)
• service/Impl/UserServiceImpl.java (modified) (3 diffs)
• service/UserService.java (modified) (2 diffs)
• web/HomeController.java (modified) (2 diffs)

src/main/java/com/example/moviezone/service/Impl/UserServiceImpl.java

@@ -2 +2 @@
 
 import com.example.moviezone.model.Customer;
+import com.example.moviezone.model.Role;
 import com.example.moviezone.model.User;
 import com.example.moviezone.model.Worker;
+import com.example.moviezone.model.exceptions.InvalidUsernameOrPasswordException;
 import com.example.moviezone.model.exceptions.PasswordsDoNotMatchException;
 import com.example.moviezone.model.exceptions.UserNotFoundException;
+import com.example.moviezone.repository.CustomerRepository;
 import com.example.moviezone.repository.UserRepository;
+import com.example.moviezone.repository.WorkerRepository;
 import com.example.moviezone.service.UserService;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -18 +22 @@
     private final UserRepository userRepository;
     private final PasswordEncoder passwordEncoder;
+    private final WorkerRepository workerRepository;
+    private final CustomerRepository customerRepository;
 
-    public UserServiceImpl(UserRepository userRepository, PasswordEncoder passwordEncoder) {
+    public UserServiceImpl(UserRepository userRepository, PasswordEncoder passwordEncoder, WorkerRepository workerRepository, CustomerRepository customerRepository) {
         this.userRepository = userRepository;
         this.passwordEncoder = passwordEncoder;
+        this.workerRepository = workerRepository;
+        this.customerRepository = customerRepository;
     }
 
@@ -40 +48 @@
 
     @Override
-    public User register(String first_name, String last_name, String username, String email, String number, String password,String repeatedPassword, String role) {
+    public User register(String first_name, String last_name, String username, String email, String number, String password,String repeatedPassword, Role role) {
        if(!password.equals(repeatedPassword))
            throw new PasswordsDoNotMatchException();
-       else
-        if(role.equals("worker"))
+       if (username==null || username.isEmpty()  || password==null || password.isEmpty())
+            throw new InvalidUsernameOrPasswordException();
+
+       if(role.equals(Role.ROLE_ADMIN))
         {
-            return userRepository.save(new Worker(passwordEncoder.encode(password),first_name,last_name,username,email,number));
+            Worker worker=new Worker(passwordEncoder.encode(password),first_name,last_name,username,email,number);
+            workerRepository.save(worker);
+            return userRepository.save(worker);
         }
         else
-            return userRepository.save(new Customer(passwordEncoder.encode(password),first_name,last_name,username,email,number));
+       {
+           Customer customer=new Customer(passwordEncoder.encode(password),first_name,last_name,username,email,number);
+          customerRepository.save(customer);
+           return userRepository.save(customer);
+
+       }
+
     }
 

src/main/java/com/example/moviezone/service/UserService.java

@@ -1 +1 @@
 package com.example.moviezone.service;
 
+import com.example.moviezone.model.Role;
 import com.example.moviezone.model.User;
 
@@ -10 +11 @@
     User findByUsername(String username);
 
-  User register(String first_name, String last_name,String username, String email, String number, String password,String repeatedPassword, String role);
+  User register(String first_name, String last_name,String username, String email, String number, String password,String repeatedPassword, Role role);
     User login(String username,String password);
 }

src/main/java/com/example/moviezone/web/HomeController.java

@@ -4 +4 @@
 import com.example.moviezone.model.Customer;
 import com.example.moviezone.model.Film;
+import com.example.moviezone.model.Role;
 import com.example.moviezone.model.User;
+import com.example.moviezone.model.exceptions.PasswordsDoNotMatchException;
 import com.example.moviezone.model.exceptions.UserNotFoundException;
 import com.example.moviezone.service.*;
@@ -93 +95 @@
     }
 
-    @PostMapping("register")
-    public String register(@RequestParam String username, @RequestParam String first_name, @RequestParam String last_name,
-                         @RequestParam String password, @RequestParam String repeatedPassword,
-                         @RequestParam String email, @RequestParam String number,
-                         @RequestParam String role)
-    {
-        User user = null;
-            user=userService.register(first_name,last_name,username,email,number,password,repeatedPassword,role);
+    @PostMapping()
+    public String register(@RequestParam String username,
+                           @RequestParam String first_name,
+                           @RequestParam String last_name,
+                           @RequestParam String password,
+                           @RequestParam String repeatedPassword,
+                           @RequestParam String email,
+                           @RequestParam String number,
+                           @RequestParam Role role)
+    {
+        try {
+           User user=userService.register(first_name,last_name,username,email,number,password,repeatedPassword,role);
             return "redirect:/login";
+        }catch (PasswordsDoNotMatchException exception)
+        {
+            return "redirect:/register?error=" + exception.getMessage();
+        }
+
     }