From 15946fe9b916b936295e74913625cdd8035f2c92 Mon Sep 17 00:00:00 2001 From: maxima Date: Sun, 7 Sep 2025 22:54:53 +0300 Subject: [PATCH 1/3] task was solved --- .../mate/academy/service/AuthenticationService.java | 12 ++++++++++-- src/main/java/mate/academy/service/UserService.java | 9 ++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 8f7c7c975..bf76edb49 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. @@ -10,7 +12,13 @@ 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. */ - public boolean login(String email, String password) { - return false; + public static boolean login(String email, String password) { + User user = new User(email, password); + + if (UserService.findByEmail(email) == null) { + return false; + } + + return user.getPassword().equals(UserService.findByEmail(email).getPassword()); } } diff --git a/src/main/java/mate/academy/service/UserService.java b/src/main/java/mate/academy/service/UserService.java index 1652d7d68..1ae04421a 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -14,7 +14,14 @@ public class UserService { * @return - user if his email is equal to passed email. * Return null if there is no suitable user */ - public User findByEmail(String email) { + public static User findByEmail(String email) { + + for (User currentUser : users) { + if (currentUser.getEmail().equals(email)) { + return currentUser; + } + } + return null; } } From 6e90d1b2a1a472b5cc7f29142c7805748c78f98f Mon Sep 17 00:00:00 2001 From: maxima Date: Mon, 8 Sep 2025 17:26:30 +0300 Subject: [PATCH 2/3] methods were simplified and optimized --- .../mate/academy/service/AuthenticationService.java | 11 +++++------ src/main/java/mate/academy/service/UserService.java | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index bf76edb49..d9173f45b 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -3,6 +3,8 @@ import mate.academy.model.User; public class AuthenticationService { + private UserService userService = new UserService(); + /** * Imagine that some user wants to login to your site. * You should check if user credentials (login and password) are valid or not. @@ -12,13 +14,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. */ - public static boolean login(String email, String password) { - User user = new User(email, password); - if (UserService.findByEmail(email) == null) { - return false; - } + public boolean login(String email, String password) { + User user = userService.findByEmail(email); - return user.getPassword().equals(UserService.findByEmail(email).getPassword()); + return (user == null) ? false : 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 1ae04421a..9f5afc28d 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -14,7 +14,7 @@ public class UserService { * @return - user if his email is equal to passed email. * Return null if there is no suitable user */ - public static User findByEmail(String email) { + public User findByEmail(String email) { for (User currentUser : users) { if (currentUser.getEmail().equals(email)) { From 4065e7b5b74fdf56adb969ad451dae037b2ca340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=93=D1=80=D0=B8?= =?UTF-8?q?=D1=86=D1=8E=D0=BA?= Date: Wed, 10 Sep 2025 19:09:20 +0300 Subject: [PATCH 3/3] Update src/main/java/mate/academy/service/AuthenticationService.java Co-authored-by: Olena Bruiako --- 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 d9173f45b..a15a68e1a 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -18,6 +18,6 @@ public class AuthenticationService { public boolean login(String email, String password) { User user = userService.findByEmail(email); - return (user == null) ? false : user.getPassword().equals(password); + return user != null && user.getPassword().equals(password); } }