From c92729e369d28296b69128cd5ed19d9b331b2429 Mon Sep 17 00:00:00 2001 From: Irina Levchenko Date: Mon, 30 Dec 2024 11:52:36 +0200 Subject: [PATCH 1/3] methods implemented --- .../java/mate/academy/service/AuthenticationService.java | 6 +++++- src/main/java/mate/academy/service/UserService.java | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 8f7c7c975..6d04dc4c2 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -1,5 +1,7 @@ package mate.academy.service; +import mate.academy.model.User; + public class AuthenticationService { /** * Imagine that some user wants to login to your site. @@ -11,6 +13,8 @@ public class AuthenticationService { * Return false in any other cases. */ public boolean login(String email, String password) { - return false; + UserService newService = new UserService(); + User user = newService.findByEmail(email); + return user != null && user.getPassword().equals(password); } } diff --git a/src/main/java/mate/academy/service/UserService.java b/src/main/java/mate/academy/service/UserService.java index 1652d7d68..94210665c 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -15,6 +15,11 @@ public class UserService { * Return null if there is no suitable user */ public User findByEmail(String email) { + for (User user : users) { + if (user.getEmail().equals(email)) { + return user; + } + } return null; } } From d0dfddb8098e18ba93a586c7550b317b745db764 Mon Sep 17 00:00:00 2001 From: Irina Levchenko Date: Mon, 30 Dec 2024 14:38:56 +0200 Subject: [PATCH 2/3] newService is made as a class-level variable --- src/main/java/mate/academy/service/AuthenticationService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 6d04dc4c2..884ac6f49 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -12,8 +12,10 @@ public class AuthenticationService { * @return true if user by email exists and passed password is equal to user's password. * Return false in any other cases. */ + private UserService newService = new UserService(); + public boolean login(String email, String password) { - UserService newService = new UserService(); + //UserService newService = new UserService(); User user = newService.findByEmail(email); return user != null && user.getPassword().equals(password); } From d16c7fc030e2bebeb602053aedddd2f60433299c Mon Sep 17 00:00:00 2001 From: Irina Levchenko Date: Mon, 30 Dec 2024 15:07:17 +0200 Subject: [PATCH 3/3] newService is made as a class-level variable (private final) --- src/main/java/mate/academy/service/AuthenticationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 884ac6f49..947b782b3 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -12,7 +12,7 @@ public class AuthenticationService { * @return true if user by email exists and passed password is equal to user's password. * Return false in any other cases. */ - private UserService newService = new UserService(); + private final UserService newService = new UserService(); public boolean login(String email, String password) { //UserService newService = new UserService();