From 3d59648b8c6924a3b2c1d05c663c35244937b11b Mon Sep 17 00:00:00 2001 From: Angelika Date: Wed, 8 Jul 2020 14:22:33 +0300 Subject: [PATCH] Done --- .../online/exception/NotAccessException.java | 18 +++++++++++ .../NotCorrectPasswordException.java | 19 ++++++++++++ .../exception/SimplePasswordException.java | 18 +++++++++++ .../UserAlreadyRegisteredException.java | 18 +++++++++++ .../exception/UserNotFoundException.java | 19 ++++++++++++ .../online/service/AuthenticationService.java | 16 ++++++---- .../service/IAuthenticationService.java | 4 ++- .../izh/rd/online/service/IUserService.java | 7 +++-- .../izh/rd/online/service/UserService.java | 30 +++++++++++++++---- .../epam/izh/rd/online/UserServiceTest.java | 4 ++- 10 files changed, 138 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/epam/izh/rd/online/exception/NotAccessException.java create mode 100644 src/main/java/com/epam/izh/rd/online/exception/NotCorrectPasswordException.java create mode 100644 src/main/java/com/epam/izh/rd/online/exception/SimplePasswordException.java create mode 100644 src/main/java/com/epam/izh/rd/online/exception/UserAlreadyRegisteredException.java create mode 100644 src/main/java/com/epam/izh/rd/online/exception/UserNotFoundException.java diff --git a/src/main/java/com/epam/izh/rd/online/exception/NotAccessException.java b/src/main/java/com/epam/izh/rd/online/exception/NotAccessException.java new file mode 100644 index 0000000..acc3dfe --- /dev/null +++ b/src/main/java/com/epam/izh/rd/online/exception/NotAccessException.java @@ -0,0 +1,18 @@ +package com.epam.izh.rd.online.exception; + +public class NotAccessException extends Throwable{ + public NotAccessException() { + } + + public NotAccessException(String message) { + super(message); + } + + public NotAccessException(String message, Throwable cause) { + super(message, cause); + } + + public NotAccessException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/com/epam/izh/rd/online/exception/NotCorrectPasswordException.java b/src/main/java/com/epam/izh/rd/online/exception/NotCorrectPasswordException.java new file mode 100644 index 0000000..35f065f --- /dev/null +++ b/src/main/java/com/epam/izh/rd/online/exception/NotCorrectPasswordException.java @@ -0,0 +1,19 @@ +package com.epam.izh.rd.online.exception; + +public class NotCorrectPasswordException extends Throwable { + public NotCorrectPasswordException() { + + } + + public NotCorrectPasswordException(String message) { + super(message); + } + + public NotCorrectPasswordException(String message, Throwable cause) { + super(message, cause); + } + + public NotCorrectPasswordException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/com/epam/izh/rd/online/exception/SimplePasswordException.java b/src/main/java/com/epam/izh/rd/online/exception/SimplePasswordException.java new file mode 100644 index 0000000..95a8cee --- /dev/null +++ b/src/main/java/com/epam/izh/rd/online/exception/SimplePasswordException.java @@ -0,0 +1,18 @@ +package com.epam.izh.rd.online.exception; + +public class SimplePasswordException extends Throwable{ + public SimplePasswordException() { + } + + public SimplePasswordException(String message) { + super(message); + } + + public SimplePasswordException(String message, Throwable cause) { + super(message, cause); + } + + public SimplePasswordException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/com/epam/izh/rd/online/exception/UserAlreadyRegisteredException.java b/src/main/java/com/epam/izh/rd/online/exception/UserAlreadyRegisteredException.java new file mode 100644 index 0000000..9a12983 --- /dev/null +++ b/src/main/java/com/epam/izh/rd/online/exception/UserAlreadyRegisteredException.java @@ -0,0 +1,18 @@ +package com.epam.izh.rd.online.exception; + +public class UserAlreadyRegisteredException extends Throwable { + public UserAlreadyRegisteredException() { + } + + public UserAlreadyRegisteredException(String message) { + super(message); + } + + public UserAlreadyRegisteredException(String message, Throwable cause) { + super(message, cause); + } + + public UserAlreadyRegisteredException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/com/epam/izh/rd/online/exception/UserNotFoundException.java b/src/main/java/com/epam/izh/rd/online/exception/UserNotFoundException.java new file mode 100644 index 0000000..3998026 --- /dev/null +++ b/src/main/java/com/epam/izh/rd/online/exception/UserNotFoundException.java @@ -0,0 +1,19 @@ +package com.epam.izh.rd.online.exception; + +public class UserNotFoundException extends Throwable{ + public UserNotFoundException() { + System.out.println("Пользователь с таким логином не найден"); + } + + public UserNotFoundException(String message) { + super(message); + } + + public UserNotFoundException(String message, Throwable cause) { + super(message, cause); + } + + public UserNotFoundException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/com/epam/izh/rd/online/service/AuthenticationService.java b/src/main/java/com/epam/izh/rd/online/service/AuthenticationService.java index bcb09a7..14680ae 100644 --- a/src/main/java/com/epam/izh/rd/online/service/AuthenticationService.java +++ b/src/main/java/com/epam/izh/rd/online/service/AuthenticationService.java @@ -1,6 +1,8 @@ package com.epam.izh.rd.online.service; import com.epam.izh.rd.online.entity.User; +import com.epam.izh.rd.online.exception.NotCorrectPasswordException; +import com.epam.izh.rd.online.exception.UserNotFoundException; import com.epam.izh.rd.online.repository.IUserRepository; public class AuthenticationService implements IAuthenticationService { @@ -25,14 +27,16 @@ public AuthenticationService(IUserRepository userRepository) { * @param user - пользователь проходящий авторизацию */ @Override - public User login(User user) { + public User login(User user) throws UserNotFoundException, NotCorrectPasswordException { // Находим пользователя в базе User foundUser = userRepository.findByLogin(user.getLogin()); - - // - // Здесь необходимо реализовать перечисленные выше проверки - // - + if (foundUser == null) { + throw new UserNotFoundException("Пользователь с таким логином не найден"); + } + if (!foundUser.getPassword().equals(user.getPassword())) { + throw new NotCorrectPasswordException("Пароль введен неверно!"); + } + // Устанавливаем найденного пользователя, который прошел все проверки, как вошедшего в систему. CurrentUserManager.setCurrentLoggedInUser(foundUser); diff --git a/src/main/java/com/epam/izh/rd/online/service/IAuthenticationService.java b/src/main/java/com/epam/izh/rd/online/service/IAuthenticationService.java index 3f296c3..7840306 100644 --- a/src/main/java/com/epam/izh/rd/online/service/IAuthenticationService.java +++ b/src/main/java/com/epam/izh/rd/online/service/IAuthenticationService.java @@ -1,9 +1,11 @@ package com.epam.izh.rd.online.service; import com.epam.izh.rd.online.entity.User; +import com.epam.izh.rd.online.exception.NotCorrectPasswordException; +import com.epam.izh.rd.online.exception.UserNotFoundException; public interface IAuthenticationService { - User login(User user); + User login(User user) throws UserNotFoundException, NotCorrectPasswordException; void logout(); } diff --git a/src/main/java/com/epam/izh/rd/online/service/IUserService.java b/src/main/java/com/epam/izh/rd/online/service/IUserService.java index de62d43..5cc0fcb 100644 --- a/src/main/java/com/epam/izh/rd/online/service/IUserService.java +++ b/src/main/java/com/epam/izh/rd/online/service/IUserService.java @@ -1,10 +1,13 @@ package com.epam.izh.rd.online.service; import com.epam.izh.rd.online.entity.User; +import com.epam.izh.rd.online.exception.NotAccessException; +import com.epam.izh.rd.online.exception.SimplePasswordException; +import com.epam.izh.rd.online.exception.UserAlreadyRegisteredException; public interface IUserService { - User register(User user); + User register(User user) throws UserAlreadyRegisteredException, SimplePasswordException; - void delete(String login); + void delete(String login) throws NotAccessException; } diff --git a/src/main/java/com/epam/izh/rd/online/service/UserService.java b/src/main/java/com/epam/izh/rd/online/service/UserService.java index 78c39ed..04db16d 100644 --- a/src/main/java/com/epam/izh/rd/online/service/UserService.java +++ b/src/main/java/com/epam/izh/rd/online/service/UserService.java @@ -1,9 +1,15 @@ package com.epam.izh.rd.online.service; import com.epam.izh.rd.online.entity.User; +import com.epam.izh.rd.online.exception.NotAccessException; +import com.epam.izh.rd.online.exception.SimplePasswordException; +import com.epam.izh.rd.online.exception.UserAlreadyRegisteredException; import com.epam.izh.rd.online.repository.IUserRepository; import com.epam.izh.rd.online.repository.UserRepository; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + public class UserService implements IUserService { private IUserRepository userRepository; @@ -30,12 +36,25 @@ public UserService(IUserRepository userRepository) { * @param user - даныне регистрирующегося пользователя */ @Override - public User register(User user) { + public User register(User user) throws UserAlreadyRegisteredException, SimplePasswordException { // // Здесь необходимо реализовать перечисленные выше проверки // + if (user.getLogin().isEmpty() || user.getPassword().isEmpty()) { + throw new IllegalArgumentException("Ошибка в заполнении полей"); + } + + if (userRepository.findByLogin(user.getLogin()) != null) { + throw new UserAlreadyRegisteredException("Пользователь с логином " + user.getLogin() + " уже зарегистрирован"); + } + String regex = "\\d+"; + Pattern pattern = Pattern.compile(regex); + Matcher matcher = pattern.matcher(user.getPassword()); + if (matcher.find()) { + throw new SimplePasswordException("Пароль не соответствует требованиям безопасности"); + } // Если все проверки успешно пройдены, сохраняем пользователя в базу return userRepository.save(user); } @@ -58,14 +77,15 @@ public User register(User user) { * * @param login */ - public void delete(String login) { + public void delete(String login) throws NotAccessException { // Здесь необходимо сделать доработку метод - + try { userRepository.deleteByLogin(login); - + } catch (UnsupportedOperationException e) { + throw new NotAccessException("Недостаточно прав для выполнения операции"); + } // Здесь необходимо сделать доработку метода - } } diff --git a/src/test/java/com/epam/izh/rd/online/UserServiceTest.java b/src/test/java/com/epam/izh/rd/online/UserServiceTest.java index 8756e39..e19c640 100644 --- a/src/test/java/com/epam/izh/rd/online/UserServiceTest.java +++ b/src/test/java/com/epam/izh/rd/online/UserServiceTest.java @@ -1,6 +1,8 @@ package com.epam.izh.rd.online; import com.epam.izh.rd.online.entity.User; +import com.epam.izh.rd.online.exception.SimplePasswordException; +import com.epam.izh.rd.online.exception.UserAlreadyRegisteredException; import com.epam.izh.rd.online.repository.IUserRepository; import com.epam.izh.rd.online.repository.UserRepository; import com.epam.izh.rd.online.service.CurrentUserManager; @@ -39,7 +41,7 @@ void testRegisterCase1(User user) { @Test @DisplayName("Тест метода IUserService.register(User user) кейс 2") - void testRegisterCase2() throws Exception { + void testRegisterCase2() throws Exception, SimplePasswordException, UserAlreadyRegisteredException { User user = Providers.getUser(); userService.register(user);