Changeset 6032d44 for src/main/java

Timestamp:

02/04/23 19:01:47 (22 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

e097c1c

Parents:

27adfc8

Message:

login method

Location:

src/main/java/com/example/moviezone

Files:

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

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

@@ -25 +25 @@
     Integer points;
 
-//    public Customer(String password, String first_name, String last_name, String address, String contact_number, String username) {
-//        super(password, first_name, last_name, address, contact_number, username);
-//    }
+    public Customer(String password, String first_name, String last_name, String address, String contact_number, String username) {
+        super(password, first_name, last_name, address, contact_number, username);
+    }
+
+    public Customer() {
+
+    }
 
     @Override

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

@@ -28 +28 @@
     Cinema cinema;
 
-//    public Worker(String password, String first_name, String last_name, String address, String contact_number, String username) {
-//        super(password, first_name, last_name, address, contact_number, username);
-//    }
+    public Worker(String password, String first_name, String last_name, String address, String contact_number, String username) {
+        super(password, first_name, last_name, address, contact_number, username);
+    }
+
+    public Worker() {
+
+    }
 
     @Override

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

@@ -38 +38 @@
     }
 
-//    @Override
-//    public User register(String first_name, String last_name, String username, String email, String number, String password, String role) {
-//        if(role.equals("worker"))
-//        {
-//            return userRepository.save(new Worker(passwordEncoder.encode(password),first_name,last_name,username,email,number));
-//        }
-//        else if (role.equals("user"))
-//            return userRepository.save(new Customer(passwordEncoder.encode(password),first_name,last_name,username,email,number));
-//    }
+    @Override
+    public User register(String first_name, String last_name, String username, String email, String number, String password, String role) {
+        if(role.equals("worker"))
+        {
+            return userRepository.save(new Worker(passwordEncoder.encode(password),first_name,last_name,username,email,number));
+        }
+        else
+            return userRepository.save(new Customer(passwordEncoder.encode(password),first_name,last_name,username,email,number));
+    }
+
+    @Override
+    public User login(String username, String password) {
+        return userRepository.findAllByUsernameAndPassword(username,password).stream().findFirst().orElseThrow(UserNotFoundException::new);
+    }
 
 

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 role);
+    User login(String username,String password);
 }

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

@@ -24 +24 @@
     }
 
+    
 
 }