Changeset d7f5da9 for src/main/java/com/example/moviezone/service

Timestamp:

02/07/23 13:48:25 (23 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/service

Files:

• Impl/UserServiceImpl.java (modified) (1 diff)
• UserService.java (modified) (1 diff)

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);
 }