From b8de3684d89fd059c8460edf121202c243f90ccf Mon Sep 17 00:00:00 2001
From: Polina Kirf <polinakirf06@gmail.com>
Date: Wed, 4 Dec 2024 14:39:38 +0200
Subject: [PATCH 1/2] implemented login method and findByEmail method

---
 src/main/java/mate/academy/model/User.java                  | 1 -
 .../java/mate/academy/service/AuthenticationService.java    | 6 ++++++
 src/main/java/mate/academy/service/UserService.java         | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/mate/academy/model/User.java b/src/main/java/mate/academy/model/User.java
index 22dc6ff8b..d46001d82 100644
--- a/src/main/java/mate/academy/model/User.java
+++ b/src/main/java/mate/academy/model/User.java
@@ -12,7 +12,6 @@ public User(String email, String password) {
     public String getEmail() {
         return email;
     }
-
     public String getPassword() {
         return password;
     }
diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java
index 8f7c7c975..b6b012825 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,10 @@ public class AuthenticationService {
      * Return false in any other cases.
      */
     public boolean login(String email, String password) {
+        User users = new User(email, password);
+        if (users.getPassword().equals(password) && email != null) {
+            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 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 <code>null</code> 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 aaf8b106ef43f4bb61b7e55cc1dd415e22f6bc48 Mon Sep 17 00:00:00 2001
From: Polina Kirf <polinakirf06@gmail.com>
Date: Mon, 9 Dec 2024 13:52:58 +0200
Subject: [PATCH 2/2] implemented login method and findByEmail method

---
 .../java/mate/academy/service/AuthenticationService.java    | 6 +++---
 src/main/java/mate/academy/service/UserService.java         | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java
index b6b012825..b69430bca 100644
--- a/src/main/java/mate/academy/service/AuthenticationService.java
+++ b/src/main/java/mate/academy/service/AuthenticationService.java
@@ -13,9 +13,9 @@ public class AuthenticationService {
      * Return false in any other cases.
      */
     public boolean login(String email, String password) {
-        User users = new User(email, password);
-        if (users.getPassword().equals(password) && email != null) {
-            return true;
+        User findByEmail = UserService.findByEmail(email);
+        if (findByEmail != null) {
+            return findByEmail.getPassword().equals(password);
         }
         return false;
     }
diff --git a/src/main/java/mate/academy/service/UserService.java b/src/main/java/mate/academy/service/UserService.java
index 94210665c..1b489414c 100644
--- a/src/main/java/mate/academy/service/UserService.java
+++ b/src/main/java/mate/academy/service/UserService.java
@@ -8,13 +8,14 @@ public class UserService {
             new User("alice@i.ua", "1234")
     };
 
+
     /**
      * Find user by email. All users are stored in <code>private static final User[] users</code>
      * @param email - the input parameter
      * @return - user if his email is equal to passed email.
      * Return <code>null</code> if there is no suitable user
      */
-    public User findByEmail(String email) {
+    public static User findByEmail(String email) {
         for (User user : users) {
             if (user.getEmail().equals(email)) {
                 return user;