From 809f9c4a50aeaf2f9add92ebbeb030ab2c01e2be Mon Sep 17 00:00:00 2001 From: Sasha Koval Date: Mon, 23 Sep 2024 21:27:34 +0300 Subject: [PATCH 1/8] for bonus task? with new branch --- .../java/mate/academy/service/AuthenticationService.java | 9 +++++++++ src/main/java/mate/academy/service/UserService.java | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 8f7c7c97..aef6b452 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,13 @@ public class AuthenticationService { * Return false in any other cases. */ public boolean login(String email, String password) { + UserService userService = new UserService(); + User user = userService.findByEmail(email); + if (user != null) { + if (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..95883562 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -15,6 +15,12 @@ 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 c03d5b9e6b68040747943f145f430826749de23d Mon Sep 17 00:00:00 2001 From: Sasha Koval Date: Thu, 26 Sep 2024 19:57:41 +0300 Subject: [PATCH 2/8] for bonus task? with new branch --- src/main/java/mate/academy/service/AuthenticationService.java | 2 +- src/main/java/mate/academy/service/UserService.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index aef6b452..4199bea6 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -12,8 +12,8 @@ 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 userService = new UserService(); public boolean login(String email, String password) { - UserService userService = new UserService(); User user = userService.findByEmail(email); if (user != null) { if (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 95883562..5d1d7903 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -15,8 +15,7 @@ public class UserService { * Return null if there is no suitable user */ public User findByEmail(String email) { - for (User user:users - ) { + for (User user:users) { if (user.getEmail().equals(email)) { return user; } From 13c37ddf30b3e125355d7f6bc586c611872ee450 Mon Sep 17 00:00:00 2001 From: Sasha Koval Date: Thu, 26 Sep 2024 19:59:58 +0300 Subject: [PATCH 3/8] for bonus task? with new branch --- src/main/java/mate/academy/service/AuthenticationService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 4199bea6..05970101 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -13,6 +13,7 @@ public class AuthenticationService { * Return false in any other cases. */ private UserService userService = new UserService(); + public boolean login(String email, String password) { User user = userService.findByEmail(email); if (user != null) { From 52a29edcae92221ac868b38873cf40d142add48e Mon Sep 17 00:00:00 2001 From: Sasha Koval Date: Sat, 28 Sep 2024 23:41:34 +0300 Subject: [PATCH 4/8] Can you see now? --- src/main/java/mate/academy/service/AuthenticationService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 05970101..6b7ab5c5 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -14,6 +14,7 @@ public class AuthenticationService { */ private UserService userService = new UserService(); + public boolean login(String email, String password) { User user = userService.findByEmail(email); if (user != null) { From 4473f53120c534c015a69edb8b48899806909848 Mon Sep 17 00:00:00 2001 From: Sasha Koval Date: Sat, 28 Sep 2024 23:42:00 +0300 Subject: [PATCH 5/8] Can you see now? --- src/main/java/mate/academy/service/AuthenticationService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 6b7ab5c5..05970101 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -14,7 +14,6 @@ public class AuthenticationService { */ private UserService userService = new UserService(); - public boolean login(String email, String password) { User user = userService.findByEmail(email); if (user != null) { From 23511742809b000a786ac44c9dd7b031c5595b4a Mon Sep 17 00:00:00 2001 From: Sasha Koval Date: Mon, 30 Sep 2024 09:22:30 +0300 Subject: [PATCH 6/8] I have already fixed it --- src/main/java/mate/academy/service/UserService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mate/academy/service/UserService.java b/src/main/java/mate/academy/service/UserService.java index 5d1d7903..94210665 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -15,7 +15,7 @@ public class UserService { * Return null if there is no suitable user */ public User findByEmail(String email) { - for (User user:users) { + for (User user : users) { if (user.getEmail().equals(email)) { return user; } From 142095fc6923c2d033724808238ea96721d3515c Mon Sep 17 00:00:00 2001 From: Sasha Koval Date: Mon, 30 Sep 2024 17:21:08 +0300 Subject: [PATCH 7/8] I hope it`s over --- .../java/mate/academy/service/AuthenticationService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 05970101..6bc63ee7 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -15,12 +15,13 @@ public class AuthenticationService { private UserService userService = new UserService(); public boolean login(String email, String password) { + boolean userExist = false; User user = userService.findByEmail(email); if (user != null) { if (user.getPassword().equals(password)) { - return true; + userExist = true; } } - return false; + return userExist; } } From 5be4abffd557d0f25791caceafef74f63d5a5f86 Mon Sep 17 00:00:00 2001 From: Sasha Koval Date: Tue, 1 Oct 2024 15:44:21 +0300 Subject: [PATCH 8/8] I updated method "login" --- .../java/mate/academy/service/AuthenticationService.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 6bc63ee7..9901a63b 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -15,13 +15,8 @@ public class AuthenticationService { private UserService userService = new UserService(); public boolean login(String email, String password) { - boolean userExist = false; User user = userService.findByEmail(email); - if (user != null) { - if (user.getPassword().equals(password)) { - userExist = true; - } - } - return userExist; + + return user != null && user.getPassword().equals(password); } }