From c4968a674a41b9a18f2fcd826dcb9c02caf165e9 Mon Sep 17 00:00:00 2001 From: Serhii Senkiv Date: Wed, 16 Oct 2024 14:48:21 +0200 Subject: [PATCH 1/3] Implementation of solution for jv-oop-lesson-0 --- .../mate/academy/service/AuthenticationService.java | 11 ++++++++++- src/main/java/mate/academy/service/UserService.java | 7 ++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 8f7c7c97..1257642b 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -1,6 +1,10 @@ package mate.academy.service; +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. @@ -11,6 +15,11 @@ public class AuthenticationService { * Return false in any other cases. */ public boolean login(String email, String password) { - return false; + User user = userService.findByEmail(email); + if (user != null && user.getPassword().equals(password)) { + return true; + } else { + return false; + } } } diff --git a/src/main/java/mate/academy/service/UserService.java b/src/main/java/mate/academy/service/UserService.java index 1652d7d6..cb41e4f8 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -1,5 +1,6 @@ package mate.academy.service; +import java.util.Arrays; import mate.academy.model.User; public class UserService { @@ -14,7 +15,11 @@ 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) { - return null; + return Arrays.stream(users) + .filter(user -> user.getEmail().equals(email)) + .findFirst() + .orElse(null); } } From b52854a21f1e25c6590a292a7eb8cdd64d7efb69 Mon Sep 17 00:00:00 2001 From: Serhii Senkiv Date: Wed, 16 Oct 2024 15:03:07 +0200 Subject: [PATCH 2/3] Changed implementation of UserService.findByEmail --- src/main/java/mate/academy/service/UserService.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/mate/academy/service/UserService.java b/src/main/java/mate/academy/service/UserService.java index cb41e4f8..b9701582 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -1,6 +1,5 @@ package mate.academy.service; -import java.util.Arrays; import mate.academy.model.User; public class UserService { @@ -17,9 +16,11 @@ public class UserService { */ public User findByEmail(String email) { - return Arrays.stream(users) - .filter(user -> user.getEmail().equals(email)) - .findFirst() - .orElse(null); + for (User user : users) { + if (user.getEmail().equals(email)) { + return user; + } + } + return null; } } From 01d49a3897e293901f6696aed9c8374b1eb90678 Mon Sep 17 00:00:00 2001 From: Serhii Senkiv Date: Wed, 16 Oct 2024 15:13:24 +0200 Subject: [PATCH 3/3] Changed implementation of AuthenticationService.login() --- .../java/mate/academy/service/AuthenticationService.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 1257642b..d0a1960f 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -16,10 +16,6 @@ public class AuthenticationService { */ public boolean login(String email, String password) { User user = userService.findByEmail(email); - if (user != null && user.getPassword().equals(password)) { - return true; - } else { - return false; - } + return user != null && user.getPassword().equals(password); } }