Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do homework. #1115

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions src/main/java/mate/academy/service/AuthenticationService.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
package mate.academy.service;

public class AuthenticationService {
/**
* 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 <code>UserService</code> class.
* @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) {
return false;
UserService userService = new UserService();
return userService.findByEmail(email)
.map(user -> user.getPassword().equals(password))
.orElse(false);
}
}


// User user = userService.findByEmail(email);
// return userService.findByEmail(email) != null
// ? user.getPassword().equals(password) : false;

// return Optional.ofNullable(userService.findByEmail(email))
// .map(user -> user.getPassword().equals(password))
// .orElse(false);
23 changes: 16 additions & 7 deletions src/main/java/mate/academy/service/UserService.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package mate.academy.service;

import java.util.Arrays;
import java.util.Optional;
import mate.academy.model.User;

public class UserService {
Expand All @@ -8,13 +10,20 @@ public class UserService {
new User("[email protected]", "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 User findByEmailClassic(String email) {
for (User user : users
) {
if (user.getEmail().equals(email)) {
return user;
}
}
return null;
}

public Optional<User> findByEmail(String email) {
return Arrays.stream(users)
.filter(user -> user.getEmail().equals(email))
.findFirst();
}

}
Loading