Finished work

java-exceptions-template.iml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.5.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+  </component>
+</module>

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 Exception {
+    public NotAccessException() {
+    }
+
+    public NotAccessException(String message) {
+        super(message);
+    }
+
+    public NotAccessException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public NotAccessException(Throwable cause) {
+        super(cause);
+    }
+}

src/main/java/com/epam/izh/rd/online/exception/NotCorrectPasswordException.java

@@ -0,0 +1,18 @@
+package com.epam.izh.rd.online.exception;
+
+public class NotCorrectPasswordException extends Exception {
+    public NotCorrectPasswordException() {
+    }
+
+    public NotCorrectPasswordException(String message) {
+        super(message);
+    }
+
+    public NotCorrectPasswordException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public NotCorrectPasswordException(Throwable cause) {
+        super(cause);
+    }
+}

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 Exception {
+    public SimplePasswordException() {
+    }
+
+    public SimplePasswordException(String message) {
+        super(message);
+    }
+
+    public SimplePasswordException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public SimplePasswordException(Throwable cause) {
+        super(cause);
+    }
+}

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 Exception {
+    public UserAlreadyRegisteredException() {
+    }
+
+    public UserAlreadyRegisteredException(String message) {
+        super(message);
+    }
+
+    public UserAlreadyRegisteredException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public UserAlreadyRegisteredException(Throwable cause) {
+        super(cause);
+    }
+}

src/main/java/com/epam/izh/rd/online/exception/UserNotFoundException.java

@@ -0,0 +1,18 @@
+package com.epam.izh.rd.online.exception;
+
+public class UserNotFoundException extends Exception {
+    public UserNotFoundException() {
+    }
+
+    public UserNotFoundException(String message) {
+        super(message);
+    }
+
+    public UserNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public UserNotFoundException(Throwable cause) {
+        super(cause);
+    }
+}

src/main/java/com/epam/izh/rd/online/service/AuthenticationService.java

@@ -1,8 +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;
 import com.epam.izh.rd.online.repository.IUserRepository;
 
+
 public class AuthenticationService implements IAuthenticationService {
 
     private IUserRepository userRepository;
@@ -25,17 +28,16 @@ public AuthenticationService(IUserRepository userRepository) {
      * @param user - пользователь проходящий авторизацию
      */
     @Override
-    public User login(User user) {
-        // Находим пользователя в базе
+    public User login(User user) throws NotCorrectPasswordException, UserNotFoundException {
         User foundUser = userRepository.findByLogin(user.getLogin());
-
-        //
-        // Здесь необходимо реализовать перечисленные выше проверки
-        //
-
-        // Устанавливаем найденного пользователя, который прошел все проверки, как вошедшего в систему.
+        try {
+            if (!foundUser.getPassword().equals(user.getPassword())) {
+                throw new NotCorrectPasswordException("Пароль введен неверно!");
+            }
+        } catch (NullPointerException e) {
+            throw new UserNotFoundException("Пользователь с таким логином не найден");
+        }
         CurrentUserManager.setCurrentLoggedInUser(foundUser);
-
         return foundUser;
     }
 

src/main/java/com/epam/izh/rd/online/service/IAuthenticationService.java

@@ -1,9 +1,12 @@
 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 NotCorrectPasswordException, UserNotFoundException;
 
     void logout();
 }

src/main/java/com/epam/izh/rd/online/service/IUserService.java

@@ -1,10 +1,14 @@
 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, UserAlreadyRegisteredException, SimplePasswordException;
 
-    void delete(String login);
+    void delete(String login) throws NotAccessException;
 }

src/main/java/com/epam/izh/rd/online/service/UserService.java

@@ -1,8 +1,11 @@
 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.repository.IUserRepository;
 import com.epam.izh.rd.online.repository.UserRepository;
+import com.epam.izh.rd.online.exception.UserAlreadyRegisteredException;
 
 public class UserService implements IUserService {
 
@@ -30,13 +33,16 @@ public UserService(IUserRepository userRepository) {
      * @param user - даныне регистрирующегося пользователя
      */
     @Override
-    public User register(User user) {
-
-        //
-        // Здесь необходимо реализовать перечисленные выше проверки
-        //
-
-        // Если все проверки успешно пройдены, сохраняем пользователя в базу
+    public User register(User user) throws UserAlreadyRegisteredException, SimplePasswordException {
+        if (user.getPassword().isEmpty() || user.getLogin().isEmpty()) {
+            throw new IllegalArgumentException("Ошибка в заполнении полей");
+        }
+        if (userRepository.findByLogin(user.getLogin()) != null) {
+            throw new UserAlreadyRegisteredException("Пользователь с логином '" + user.getLogin() + "' уже зарегистрирован");
+        }
+        if (user.getPassword().matches("\\d+")) {
+            throw new SimplePasswordException("Пароль не соответствует требованиям безопасности");
+        }
         return userRepository.save(user);
     }
 
@@ -58,14 +64,11 @@ 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("Недостаточно прав для выполнения операции");
+        }
     }
-
 }

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() {
+    void testRegisterCase2() throws UserAlreadyRegisteredException, SimplePasswordException {
         User user = Providers.getUser();
 
         userService.register(user);