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

Add new Method #1060

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
4 changes: 3 additions & 1 deletion src/main/java/mate/academy/Main.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package mate.academy;

import mate.academy.service.AuthenticationService;
import mate.academy.service.UserService;

public class Main {
private static final AuthenticationService authenticationService = new AuthenticationService();
private static final AuthenticationService authenticationService =
new AuthenticationService(new UserService());

public static void main(String[] args) {
test("[email protected]", "1234", true);
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/mate/academy/model/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,15 @@ public String getEmail() {
return email;
}

public void setEmail(String email) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

this.email = email;
}

public String getPassword() {
return password;
}

public void setPassword(String password) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

this.password = password;
}
}
17 changes: 15 additions & 2 deletions src/main/java/mate/academy/service/AuthenticationService.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,29 @@
package mate.academy.service;

import mate.academy.model.User;

public class AuthenticationService {
private final UserService userService;

public AuthenticationService(UserService userService) {
this.userService = 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 <code>UserService</code> 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) {
return false;
User user = userService.findByEmail(email);
if (user == null) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (user == null) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not fixed

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not fixed

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you make this validation on 29th line, so this check is redundant

return false;
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (user == null) {
return false;
}

return user.getPassword().equals(password);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return user.getPassword().equals(password);
return user != null && user.getPassword().equals(password);

}
}
5 changes: 5 additions & 0 deletions src/main/java/mate/academy/service/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Loading