From f39562054ab1841e638bed50f4c9103ec3c98585 Mon Sep 17 00:00:00 2001 From: Nikita Myroniuk Date: Fri, 2 Aug 2024 01:46:56 +0200 Subject: [PATCH 1/3] added solution --- .../java/mate/academy/service/AuthenticationService.java | 7 +++++++ src/main/java/mate/academy/service/UserService.java | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 8f7c7c97..779663bc 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,11 @@ public class AuthenticationService { * Return false in any other cases. */ public boolean login(String email, String password) { + UserService userServiece = new UserService(); + User user = userServiece.findByEmail(email); + if (user != null && user.getPassword().equals(password)) { + return true; + } return false; } } diff --git a/src/main/java/mate/academy/service/UserService.java b/src/main/java/mate/academy/service/UserService.java index 1652d7d6..94210665 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 43c0113f12183c0004c4d4a17f88c7a034eff02c Mon Sep 17 00:00:00 2001 From: Nikita Myroniuk Date: Sat, 3 Aug 2024 03:09:49 +0200 Subject: [PATCH 2/3] added right solution but build problem --- .../java/mate/academy/service/AuthenticationService.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 779663bc..6cb7001f 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -3,6 +3,7 @@ import mate.academy.model.User; public class AuthenticationService { + private UserService userServiece = 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. @@ -13,11 +14,7 @@ public class AuthenticationService { * Return false in any other cases. */ public boolean login(String email, String password) { - UserService userServiece = new UserService(); User user = userServiece.findByEmail(email); - if (user != null && user.getPassword().equals(password)) { - return true; - } - return false; + return user != null && user.getPassword().equals(password); } } From dab3a7796da18142829930194ef3bf04a19bbad2 Mon Sep 17 00:00:00 2001 From: Nikita Myroniuk Date: Sat, 3 Aug 2024 03:37:22 +0200 Subject: [PATCH 3/3] solution-number2builded --- .../java/mate/academy/service/AuthenticationService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 6cb7001f..b80c2a7d 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -3,18 +3,21 @@ import mate.academy.model.User; public class AuthenticationService { - private UserService userServiece = new UserService(); + 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. * All users are stored in UserService class. - * @param email - user's email + * + * @param email - user's email * @param password - user's password * @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) { - User user = userServiece.findByEmail(email); + User user = userService.findByEmail(email); return user != null && user.getPassword().equals(password); } }