Changeset e097c1c for src/main/java

Timestamp:

02/04/23 19:28:58 (22 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

a554435

Parents:

6032d44

Message:

login and register in HomeController

Location:

src/main/java/com/example/moviezone

Files:

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

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

@@ -4 +4 @@
 import com.example.moviezone.model.User;
 import com.example.moviezone.model.Worker;
+import com.example.moviezone.model.exceptions.PasswordsDoNotMatchException;
 import com.example.moviezone.model.exceptions.UserNotFoundException;
 import com.example.moviezone.repository.UserRepository;
@@ -39 +40 @@
 
     @Override
-    public User register(String first_name, String last_name, String username, String email, String number, String password, String role) {
+    public User register(String first_name, String last_name, String username, String email, String number, String password,String repeatedPassword, String role) {
+       if(!password.equals(repeatedPassword))
+           throw new PasswordsDoNotMatchException();
+       else
         if(role.equals("worker"))
         {

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

@@ -10 +10 @@
     User findByUsername(String username);
 
-  User register(String first_name, String last_name,String username, String email, String number, String password, String role);
+  User register(String first_name, String last_name,String username, String email, String number, String password,String repeatedPassword, String role);
     User login(String username,String password);
 }

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

@@ -2 +2 @@
 
 
+import com.example.moviezone.model.User;
+import com.example.moviezone.model.exceptions.UserNotFoundException;
 import com.example.moviezone.service.FilmService;
+import com.example.moviezone.service.UserService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpSession;
 
 @Controller
@@ -13 +20 @@
 
 private final FilmService filmService;
+private final UserService userService;
 
-    public HomeController(FilmService filmService) {
+    public HomeController(FilmService filmService, UserService userService) {
         this.filmService = filmService;
+        this.userService = userService;
     }
 
@@ -24 +33 @@
     }
 
-    
+    @GetMapping("/login")
+    public String getLoginPage(Model model)
+    {
+        model.addAttribute("bodyContent", "login");
+        return "master-template";
+    }
+
+    @GetMapping("/register")
+    public String getRegisterPage(Model model)
+    {
+        model.addAttribute("bodyContent", "register");
+        return "master-template";
+    }
+
+    @PostMapping("/login")
+    public String login(@RequestParam String username,@RequestParam String password,Model model, HttpSession session)
+    {
+        User user = null;
+        try {
+            user=userService.login(username,password);
+            session.setAttribute("sessionUser",user);
+            model.addAttribute("user",user);
+            return "redirect:/home";
+
+        }catch (UserNotFoundException e)
+        {
+            model.addAttribute("hasError", true);
+            model.addAttribute("error", e.getMessage());
+            return "login";
+        }
+
+    }
+
+    @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);
+            return "redirect:/login";
+    }
 
 }