Changeset d7f5da9 for src/main

Timestamp:

02/07/23 13:48:25 (22 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

fc448f5

Parents:

f7b0906

Message:

changes for login (not working)

Location:

src/main/java/com/example/moviezone

Files:

• model/Customer.java (modified) (1 diff)
• model/Worker.java (modified) (2 diffs)
• service/Impl/UserServiceImpl.java (modified) (1 diff)
• service/UserService.java (modified) (1 diff)
• web/HomeController.java (modified) (2 diffs)

src/main/java/com/example/moviezone/model/Customer.java

@@ -34 +34 @@
 
     @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Customer customer = (Customer) o;
+        return id_user!=null && Objects.equals(id_user,customer.id_user);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash();
+    }
+
+    @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         return Collections.singletonList(Role.ROLE_USER);

src/main/java/com/example/moviezone/model/Worker.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Objects;
 
 @Entity
@@ -32 +33 @@
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Worker worker = (Worker) o;
+        return id_user!=null && Objects.equals(id_user, worker.id_user);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash();
+    }
+
     public Worker() {
 

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

@@ -48 +48 @@
 
     @Override
-    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();
-       if (username==null || username.isEmpty()  || password==null || password.isEmpty())
-            throw new InvalidUsernameOrPasswordException();
+    public void register(String first_name, String last_name, String username, String email, String number, String password, Role role) {
+//       if(!password.equals(repeatedPassword))
+//           throw new PasswordsDoNotMatchException();
+//       if (username==null || username.isEmpty()  || password==null || password.isEmpty())
+//            throw new InvalidUsernameOrPasswordException();
 
        if(role.equals(Role.ROLE_ADMIN))
         {
-            User user= new User(passwordEncoder.encode(password),first_name,last_name,username,email,number);
-            workerRepository.save((Worker) user);
-            return userRepository.save(user);
+//            User user= new User(passwordEncoder.encode(password),first_name,last_name,username,email,number);
+//            workerRepository.save((Worker) user);
+            userRepository.save(new Worker(password,first_name,last_name,email,number,username));
         }
         else
        {
-           Customer customer=new Customer(passwordEncoder.encode(password),first_name,last_name,username,email,number);
-          customerRepository.save(customer);
-           return userRepository.save(customer);
+//           Customer customer=new Customer(passwordEncoder.encode(password),first_name,last_name,username,email,number);
+//           customerRepository.save(customer);
+           userRepository.save(new Customer(password,first_name,last_name,email,number,username));
 
        }

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

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

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

@@ -77 +77 @@
 
     @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);
+    public String login(@RequestParam String username,
+                        @RequestParam String password,Model model, HttpSession session)
+    {
+//        User user = null;
+//        try {
+           User user=userService.login(username,password);
+        System.out.println(user.getFirst_name());
+//            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";
-        }
+//
+//        }catch (UserNotFoundException e)
+//        {
+//            model.addAttribute("hasError", true);
+//            model.addAttribute("error", e.getMessage());
+//            return "login";
+//        }
 
     }
@@ -106 +108 @@
     {
         try {
-           User user=userService.register(first_name,last_name,username,email,number,password,repeatedPassword,role);
+           userService.register(first_name,last_name,username,email,number,password,role);
             return "redirect:/login";
         }catch (PasswordsDoNotMatchException exception)