From 53307c6addc9bbc2696286d12b8dc52c3f0b5eb0 Mon Sep 17 00:00:00 2001
From: "Artem.Arefev" <a.arefyev@mediasoft.team>
Date: Fri, 31 May 2019 22:42:59 +0400
Subject: [PATCH 01/10] #95 init

---
 .../ru/ulstu/user/error/UserBlockedException.java    |  7 +++++++
 .../db/changelog-20190531_000002-schema.xml          | 12 ++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 src/main/java/ru/ulstu/user/error/UserBlockedException.java
 create mode 100644 src/main/resources/db/changelog-20190531_000002-schema.xml

diff --git a/src/main/java/ru/ulstu/user/error/UserBlockedException.java b/src/main/java/ru/ulstu/user/error/UserBlockedException.java
new file mode 100644
index 0000000..6de97e9
--- /dev/null
+++ b/src/main/java/ru/ulstu/user/error/UserBlockedException.java
@@ -0,0 +1,7 @@
+package ru.ulstu.user.error;
+
+public class UserBlockedException extends RuntimeException {
+    public UserBlockedException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/resources/db/changelog-20190531_000002-schema.xml b/src/main/resources/db/changelog-20190531_000002-schema.xml
new file mode 100644
index 0000000..9531c87
--- /dev/null
+++ b/src/main/resources/db/changelog-20190531_000002-schema.xml
@@ -0,0 +1,12 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="arefyev" id="20190528_000000-3">
+        <addColumn tableName="users">
+            <column name="blocker_id" type="integer"/>
+        </addColumn>
+        <addForeignKeyConstraint baseTableName="users" baseColumnNames="blocker_id" constraintName="fk_blocker"
+                                 referencedTableName="users" referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>

From 22abf6a27d64b851a40d76e51013e08d8a7b6f2b Mon Sep 17 00:00:00 2001
From: "Artem.Arefev" <a.arefyev@mediasoft.team>
Date: Mon, 3 Jun 2019 02:11:35 +0400
Subject: [PATCH 02/10] #95 blocking user

---
 .../configuration/SecurityConfiguration.java  |  8 +++++++-
 .../core/controller/AdviceController.java     |  1 +
 .../RestAuthenticationFailureHandler.java     | 20 +++++++++++++++++++
 .../ulstu/user/controller/UserController.java |  5 +++++
 .../user/error/UserBlockedException.java      |  4 +++-
 src/main/java/ru/ulstu/user/model/User.java   | 13 ++++++++++++
 .../ru/ulstu/user/service/UserService.java    | 14 ++++++++++++-
 src/main/resources/db/changelog-master.xml    |  1 +
 src/main/resources/public/js/users.js         | 14 +++++++++++++
 src/main/resources/templates/default.html     |  1 +
 .../fragments/userDashboardFragment.html      |  2 ++
 11 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/core/model/RestAuthenticationFailureHandler.java

diff --git a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java
index 894cf39..2feb8ba 100644
--- a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java
+++ b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java
@@ -13,8 +13,10 @@ import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
+import ru.ulstu.core.model.RestAuthenticationFailureHandler;
 import ru.ulstu.user.controller.UserController;
 import ru.ulstu.user.model.UserRoleConstants;
 import ru.ulstu.user.service.UserService;
@@ -35,17 +37,20 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
     private final AuthenticationSuccessHandler authenticationSuccessHandler;
     private final LogoutSuccessHandler logoutSuccessHandler;
     private final ApplicationProperties applicationProperties;
+    private final AuthenticationFailureHandler authenticationFailureHandler;
 
     public SecurityConfiguration(UserService userService,
                                  BCryptPasswordEncoder bCryptPasswordEncoder,
                                  AuthenticationSuccessHandler authenticationSuccessHandler,
                                  LogoutSuccessHandler logoutSuccessHandler,
-                                 ApplicationProperties applicationProperties) {
+                                 ApplicationProperties applicationProperties,
+                                 RestAuthenticationFailureHandler authenticationFailureHandler) {
         this.userService = userService;
         this.bCryptPasswordEncoder = bCryptPasswordEncoder;
         this.authenticationSuccessHandler = authenticationSuccessHandler;
         this.logoutSuccessHandler = logoutSuccessHandler;
         this.applicationProperties = applicationProperties;
+        this.authenticationFailureHandler = authenticationFailureHandler;
     }
 
     @Override
@@ -76,6 +81,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
                     .formLogin()
                     .loginPage("/login")
                     .successHandler(authenticationSuccessHandler)
+                    .failureHandler(authenticationFailureHandler)
                     .permitAll()
                     .and()
                     .logout()
diff --git a/src/main/java/ru/ulstu/core/controller/AdviceController.java b/src/main/java/ru/ulstu/core/controller/AdviceController.java
index f89001a..78a7771 100644
--- a/src/main/java/ru/ulstu/core/controller/AdviceController.java
+++ b/src/main/java/ru/ulstu/core/controller/AdviceController.java
@@ -12,6 +12,7 @@ import ru.ulstu.core.model.ErrorConstants;
 import ru.ulstu.core.model.response.Response;
 import ru.ulstu.core.model.response.ResponseExtended;
 import ru.ulstu.user.error.UserActivationError;
+import ru.ulstu.user.error.UserBlockedException;
 import ru.ulstu.user.error.UserEmailExistsException;
 import ru.ulstu.user.error.UserIdExistsException;
 import ru.ulstu.user.error.UserIsUndeadException;
diff --git a/src/main/java/ru/ulstu/core/model/RestAuthenticationFailureHandler.java b/src/main/java/ru/ulstu/core/model/RestAuthenticationFailureHandler.java
new file mode 100644
index 0000000..4e07d0d
--- /dev/null
+++ b/src/main/java/ru/ulstu/core/model/RestAuthenticationFailureHandler.java
@@ -0,0 +1,20 @@
+package ru.ulstu.core.model;
+
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.AuthenticationFailureHandler;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+public class RestAuthenticationFailureHandler implements AuthenticationFailureHandler {
+    @Override
+    public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
+                                        AuthenticationException ex) throws IOException, ServletException {
+
+        response.sendRedirect("/login.html?error=fail");
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/ru/ulstu/user/controller/UserController.java b/src/main/java/ru/ulstu/user/controller/UserController.java
index c40ed8f..8b63264 100644
--- a/src/main/java/ru/ulstu/user/controller/UserController.java
+++ b/src/main/java/ru/ulstu/user/controller/UserController.java
@@ -171,4 +171,9 @@ public class UserController extends OdinController<UserListDto, UserDto> {
     public void inviteUser(@RequestParam("email") String email) {
         userService.inviteUser(email);
     }
+
+    @PostMapping("/block")
+    public void blockUser(@RequestParam("userId") Integer userId) {
+        userService.blockUser(userId);
+    }
 }
diff --git a/src/main/java/ru/ulstu/user/error/UserBlockedException.java b/src/main/java/ru/ulstu/user/error/UserBlockedException.java
index 6de97e9..23b9b3a 100644
--- a/src/main/java/ru/ulstu/user/error/UserBlockedException.java
+++ b/src/main/java/ru/ulstu/user/error/UserBlockedException.java
@@ -1,6 +1,8 @@
 package ru.ulstu.user.error;
 
-public class UserBlockedException extends RuntimeException {
+import org.springframework.security.core.AuthenticationException;
+
+public class UserBlockedException extends AuthenticationException {
     public UserBlockedException(String message) {
         super(message);
     }
diff --git a/src/main/java/ru/ulstu/user/model/User.java b/src/main/java/ru/ulstu/user/model/User.java
index 520b439..bb76618 100644
--- a/src/main/java/ru/ulstu/user/model/User.java
+++ b/src/main/java/ru/ulstu/user/model/User.java
@@ -12,6 +12,7 @@ import javax.persistence.Enumerated;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -91,6 +92,10 @@ public class User extends BaseEntity {
     @Temporal(TemporalType.TIMESTAMP)
     private Date birthDate;
 
+    @ManyToOne()
+    @JoinColumn(name = "blocker_id")
+    private User blocker;
+
     public enum UserDegree {
         CANDIDATE("Кандидат технических наук"),
         DOCTOR("Доктор технических наук");
@@ -229,6 +234,14 @@ public class User extends BaseEntity {
         this.degree = degree;
     }
 
+    public User getBlocker() {
+        return blocker;
+    }
+
+    public void setBlocker(User blocker) {
+        this.blocker = blocker;
+    }
+
     public String getUserAbbreviate() {
         return String.format(USER_ABBREVIATE_TEMPLATE,
                 lastName == null ? "" : lastName,
diff --git a/src/main/java/ru/ulstu/user/service/UserService.java b/src/main/java/ru/ulstu/user/service/UserService.java
index 217215b..a58b6db 100644
--- a/src/main/java/ru/ulstu/user/service/UserService.java
+++ b/src/main/java/ru/ulstu/user/service/UserService.java
@@ -14,13 +14,16 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.ExceptionHandler;
 import ru.ulstu.conference.service.ConferenceService;
 import ru.ulstu.configuration.ApplicationProperties;
 import ru.ulstu.core.error.EntityIdIsNullException;
 import ru.ulstu.core.jpa.OffsetablePageRequest;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.core.model.response.PageableItems;
+import ru.ulstu.core.model.response.Response;
 import ru.ulstu.user.error.UserActivationError;
+import ru.ulstu.user.error.UserBlockedException;
 import ru.ulstu.user.error.UserEmailExistsException;
 import ru.ulstu.user.error.UserIdExistsException;
 import ru.ulstu.user.error.UserIsUndeadException;
@@ -252,7 +255,7 @@ public class UserService implements UserDetailsService {
         mailService.sendChangePasswordMail(user);
     }
 
-    public boolean requestUserPasswordReset(String email)  {
+    public boolean requestUserPasswordReset(String email) {
         User user = userRepository.findOneByEmailIgnoreCase(email);
         if (user == null) {
             throw new UserNotFoundException(email);
@@ -313,6 +316,9 @@ public class UserService implements UserDetailsService {
         if (!user.getActivated()) {
             throw new UserNotActivatedException();
         }
+        if (user.getBlocker() != null) {
+            throw new UserBlockedException(String.format("Вы заблокированы пользователем %s", user.getBlocker().getUserAbbreviate()));
+        }
         return new org.springframework.security.core.userdetails.User(user.getLogin(),
                 user.getPassword(),
                 Optional.ofNullable(user.getRoles()).orElse(Collections.emptySet()).stream()
@@ -389,4 +395,10 @@ public class UserService implements UserDetailsService {
         }
         return ImmutableMap.of("users", usersInfoNow, "error", err);
     }
+
+    public void blockUser(int userId) {
+        User userToBlock = findById(userId);
+        userToBlock.setBlocker(getCurrentUser());
+        userRepository.save(userToBlock);
+    }
 }
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index c8a6e63..3719ac5 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -49,4 +49,5 @@
     <include file="db/changelog-20190523_000000-schema.xml"/>
     <include file="db/changelog-20190528_000000-schema.xml"/>
     <include file="db/changelog-20190528_000002-schema.xml"/>
+    <include file="db/changelog-20190531_000002-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/public/js/users.js b/src/main/resources/public/js/users.js
index e31d3ad..68fbf55 100644
--- a/src/main/resources/public/js/users.js
+++ b/src/main/resources/public/js/users.js
@@ -120,6 +120,20 @@ function resetPassword() {
     })
 }
 
+function blockUser() {
+    userId = $('#userId').val();
+    $.ajax({
+        url:"/api/1.0/users/block?userId=" + userId,
+        contentType: "application/json; charset=utf-8",
+        method: "POST",
+        success: function() {
+            showFeedbackMessage("Пользователь заблокирован", MessageTypesEnum.SUCCESS)
+        },
+        error: function(errorData) {
+            showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING)
+        }
+    })
+}
 
 function isEmailValid(email) {
     re = /\S+@\S+\.\S+/;
diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html
index 32939e7..d3c49dd 100644
--- a/src/main/resources/templates/default.html
+++ b/src/main/resources/templates/default.html
@@ -109,6 +109,7 @@
 <script src="/js/core.js"></script>
 <script src="/js/config.js"></script>
 <script src="/js/odin.js"></script>
+<script src="/js/users.js"></script>
 <script th:inline="javascript">
 
     /*<![CDATA[*/
diff --git a/src/main/resources/templates/users/fragments/userDashboardFragment.html b/src/main/resources/templates/users/fragments/userDashboardFragment.html
index 267bbf8..b7d1d55 100644
--- a/src/main/resources/templates/users/fragments/userDashboardFragment.html
+++ b/src/main/resources/templates/users/fragments/userDashboardFragment.html
@@ -7,10 +7,12 @@
 <div th:fragment="userDashboard (user)" class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
     <div class="row">
         <div class="col col-10">
+            <input type="hidden" id="userId" th:value="${user.user.id}"/>
             <b><p th:text="${user.user.lastName} + ' ' + ${user.user.firstName} + ' ' + ${user.user.patronymic}"></p></b>
             <i><p th:if="${user.conference != null}" th:text="'Сейчас на конференции ' + ${user.conference.title}"></p></i>
             <i><p th:if="${user.lesson != null}" th:text="'Сейчас на паре ' + ${user.lesson.nameOfLesson} + ' в аудитории ' + ${user.lesson.room}"></p></i>
             <p th:if="${user.isOnline()}">Онлайн</p>
+            <button onclick="blockUser()">Заблокировать</button>
         </div>
     </div>
 </div>

From 96d166d03193884c0a87cb1129c58fd30e495851 Mon Sep 17 00:00:00 2001
From: "Artem.Arefev" <a.arefyev@mediasoft.team>
Date: Fri, 7 Jun 2019 12:23:03 +0400
Subject: [PATCH 03/10] #95 block user html

---
 .../configuration/SecurityConfiguration.java  |  5 +++--
 .../core/controller/AdviceController.java     |  1 -
 ...reHandler.java => AuthFailureHandler.java} | 11 +++++-----
 .../user/controller/UserMvcController.java    |  4 ++++
 ...l => changelog-20190607_000002-schema.xml} |  0
 src/main/resources/templates/users/block.html | 21 +++++++++++++++++++
 6 files changed, 34 insertions(+), 8 deletions(-)
 rename src/main/java/ru/ulstu/core/model/{RestAuthenticationFailureHandler.java => AuthFailureHandler.java} (66%)
 rename src/main/resources/db/{changelog-20190531_000002-schema.xml => changelog-20190607_000002-schema.xml} (100%)
 create mode 100644 src/main/resources/templates/users/block.html

diff --git a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java
index 2feb8ba..5eb7220 100644
--- a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java
+++ b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java
@@ -16,7 +16,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
-import ru.ulstu.core.model.RestAuthenticationFailureHandler;
+import ru.ulstu.core.model.AuthFailureHandler;
 import ru.ulstu.user.controller.UserController;
 import ru.ulstu.user.model.UserRoleConstants;
 import ru.ulstu.user.service.UserService;
@@ -44,7 +44,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
                                  AuthenticationSuccessHandler authenticationSuccessHandler,
                                  LogoutSuccessHandler logoutSuccessHandler,
                                  ApplicationProperties applicationProperties,
-                                 RestAuthenticationFailureHandler authenticationFailureHandler) {
+                                 AuthFailureHandler authenticationFailureHandler) {
         this.userService = userService;
         this.bCryptPasswordEncoder = bCryptPasswordEncoder;
         this.authenticationSuccessHandler = authenticationSuccessHandler;
@@ -71,6 +71,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
                     .antMatchers(UserController.ACTIVATE_URL).permitAll()
                     .antMatchers(Constants.PASSWORD_RESET_REQUEST_PAGE).permitAll()
                     .antMatchers(Constants.PASSWORD_RESET_PAGE).permitAll()
+                    .antMatchers("/users/block").permitAll()
                     .antMatchers(UserController.URL + UserController.REGISTER_URL).permitAll()
                     .antMatchers(UserController.URL + UserController.ACTIVATE_URL).permitAll()
                     .antMatchers(UserController.URL + UserController.PASSWORD_RESET_REQUEST_URL).permitAll()
diff --git a/src/main/java/ru/ulstu/core/controller/AdviceController.java b/src/main/java/ru/ulstu/core/controller/AdviceController.java
index 78a7771..f89001a 100644
--- a/src/main/java/ru/ulstu/core/controller/AdviceController.java
+++ b/src/main/java/ru/ulstu/core/controller/AdviceController.java
@@ -12,7 +12,6 @@ import ru.ulstu.core.model.ErrorConstants;
 import ru.ulstu.core.model.response.Response;
 import ru.ulstu.core.model.response.ResponseExtended;
 import ru.ulstu.user.error.UserActivationError;
-import ru.ulstu.user.error.UserBlockedException;
 import ru.ulstu.user.error.UserEmailExistsException;
 import ru.ulstu.user.error.UserIdExistsException;
 import ru.ulstu.user.error.UserIsUndeadException;
diff --git a/src/main/java/ru/ulstu/core/model/RestAuthenticationFailureHandler.java b/src/main/java/ru/ulstu/core/model/AuthFailureHandler.java
similarity index 66%
rename from src/main/java/ru/ulstu/core/model/RestAuthenticationFailureHandler.java
rename to src/main/java/ru/ulstu/core/model/AuthFailureHandler.java
index 4e07d0d..8b6bd9d 100644
--- a/src/main/java/ru/ulstu/core/model/RestAuthenticationFailureHandler.java
+++ b/src/main/java/ru/ulstu/core/model/AuthFailureHandler.java
@@ -3,18 +3,19 @@ package ru.ulstu.core.model;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.stereotype.Component;
+import ru.ulstu.user.error.UserBlockedException;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @Component
-public class RestAuthenticationFailureHandler implements AuthenticationFailureHandler {
+public class AuthFailureHandler implements AuthenticationFailureHandler {
     @Override
     public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
-                                        AuthenticationException ex) throws IOException, ServletException {
-
-        response.sendRedirect("/login.html?error=fail");
+                                        AuthenticationException ex) throws IOException {
+        if (ex.getClass() == UserBlockedException.class) {
+            response.sendRedirect("/users/block");
+        }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/ru/ulstu/user/controller/UserMvcController.java b/src/main/java/ru/ulstu/user/controller/UserMvcController.java
index f0a28d8..bf84176 100644
--- a/src/main/java/ru/ulstu/user/controller/UserMvcController.java
+++ b/src/main/java/ru/ulstu/user/controller/UserMvcController.java
@@ -74,4 +74,8 @@ public class UserMvcController extends OdinController<UserListDto, UserDto> {
     @GetMapping("/pings")
     public void getPings() {
     }
+
+    @GetMapping("/block")
+    public void getBlock() {
+    }
 }
diff --git a/src/main/resources/db/changelog-20190531_000002-schema.xml b/src/main/resources/db/changelog-20190607_000002-schema.xml
similarity index 100%
rename from src/main/resources/db/changelog-20190531_000002-schema.xml
rename to src/main/resources/db/changelog-20190607_000002-schema.xml
diff --git a/src/main/resources/templates/users/block.html b/src/main/resources/templates/users/block.html
new file mode 100644
index 0000000..3b27494
--- /dev/null
+++ b/src/main/resources/templates/users/block.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorator="default">
+<head>
+</head>
+<body>
+<div class="container" layout:fragment="content">
+    <section id="services">
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-12 text-center">
+                    <h2 class="section-heading text-uppercase">Ваш аккаунт заблокирован</h2>
+                    <a href="/"><h3>Вернуться на страницу авторизации</h3></a>
+                </div>
+            </div>
+        </div>
+    </section>
+</div>
+</body>
+</html>
\ No newline at end of file

From 615c70d12a9738723db6ab777e79cb8fb947d0ae Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 7 Jun 2019 15:35:15 +0400
Subject: [PATCH 04/10] sout driver path

---
 src/main/java/ru/ulstu/grant/service/KiasService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/ru/ulstu/grant/service/KiasService.java b/src/main/java/ru/ulstu/grant/service/KiasService.java
index dbeacf5..184a147 100644
--- a/src/main/java/ru/ulstu/grant/service/KiasService.java
+++ b/src/main/java/ru/ulstu/grant/service/KiasService.java
@@ -79,6 +79,7 @@ public class KiasService {
 
     private WebDriver getDriver() {
         System.setProperty(DRIVER_TYPE, getDriverExecutablePath());
+        System.out.println("drive search path: " + getDriverExecutablePath());
         final ChromeOptions chromeOptions = new ChromeOptions();
         chromeOptions.addArguments("--headless");
         return new ChromeDriver(chromeOptions);

From 18bb0b85acf3bf3779dcec9cd562ab26313c5c7e Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 7 Jun 2019 15:53:09 +0400
Subject: [PATCH 05/10] sout driver path

---
 src/main/java/ru/ulstu/grant/service/KiasService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/ru/ulstu/grant/service/KiasService.java b/src/main/java/ru/ulstu/grant/service/KiasService.java
index 184a147..c3a55dc 100644
--- a/src/main/java/ru/ulstu/grant/service/KiasService.java
+++ b/src/main/java/ru/ulstu/grant/service/KiasService.java
@@ -81,6 +81,7 @@ public class KiasService {
         System.setProperty(DRIVER_TYPE, getDriverExecutablePath());
         System.out.println("drive search path: " + getDriverExecutablePath());
         final ChromeOptions chromeOptions = new ChromeOptions();
+        chromeOptions.setBinary("/usr/bin/google-chrome");
         chromeOptions.addArguments("--headless");
         return new ChromeDriver(chromeOptions);
     }

From 51ed732ae85aba74d0e8dd2be1198eb4ceae365c Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Fri, 7 Jun 2019 20:54:38 +0400
Subject: [PATCH 06/10] #104 fix web element in integration test

---
 src/test/java/grant/GrantPage.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/grant/GrantPage.java b/src/test/java/grant/GrantPage.java
index fe13956..75fbf8a 100644
--- a/src/test/java/grant/GrantPage.java
+++ b/src/test/java/grant/GrantPage.java
@@ -14,7 +14,7 @@ public class GrantPage extends PageObject {
     }
 
     public String getId() {
-        return driver.findElement(By.id("id")).getAttribute("value");
+        return driver.findElement(By.id("grantId")).getAttribute("value");
     }
 
     public void setTitle(String name) {

From 888fecf687ef69f8c81657abe1deb1108f457ed5 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Fri, 7 Jun 2019 20:55:59 +0400
Subject: [PATCH 07/10] #104 add unit tests

---
 .../grant/controller/GrantController.java     |   2 +-
 .../ru/ulstu/grant/service/GrantService.java  |  92 ++++----
 .../ulstu/grant/service/GrantServiceTest.java | 215 ++++++++++++++++++
 3 files changed, 269 insertions(+), 40 deletions(-)
 create mode 100644 src/test/java/ru/ulstu/grant/service/GrantServiceTest.java

diff --git a/src/main/java/ru/ulstu/grant/controller/GrantController.java b/src/main/java/ru/ulstu/grant/controller/GrantController.java
index 1e28a33..48dee8e 100644
--- a/src/main/java/ru/ulstu/grant/controller/GrantController.java
+++ b/src/main/java/ru/ulstu/grant/controller/GrantController.java
@@ -50,7 +50,7 @@ public class GrantController {
     @GetMapping("/grant")
     public void getGrant(ModelMap modelMap, @RequestParam(value = "id") Integer id) {
         if (id != null && id > 0) {
-            GrantDto grantDto = grantService.findOneDto(id);
+            GrantDto grantDto = grantService.getExistGrantById(id);
             attachPaper(grantDto);
             modelMap.put("grantDto", grantDto);
         } else {
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index 03ae07f..ea5491c 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -1,11 +1,11 @@
 package ru.ulstu.grant.service;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.Errors;
-import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.file.model.FileDataDto;
 import ru.ulstu.file.service.FileService;
@@ -17,7 +17,6 @@ import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.paper.service.PaperService;
 import ru.ulstu.ping.service.PingService;
-import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.project.service.ProjectService;
 import ru.ulstu.timeline.service.EventService;
@@ -77,6 +76,13 @@ public class GrantService extends BaseService {
         this.pingService = pingService;
     }
 
+    //++
+    public GrantDto getExistGrantById(Integer id) {
+        GrantDto grantDto = new GrantDto(findById(id));
+        return grantDto;
+    }
+
+    //++
     public List<Grant> findAll() {
         return grantRepository.findAll();
     }
@@ -85,17 +91,14 @@ public class GrantService extends BaseService {
         return convert(findAll(), GrantDto::new);
     }
 
-    public GrantDto findOneDto(Integer id) {
-        return new GrantDto(grantRepository.findOne(id));
-    }
-
+    //++
     @Transactional
-    public Integer create(GrantDto grantDto) throws IOException {
+    public Grant create(GrantDto grantDto) throws IOException {
         Grant newGrant = copyFromDto(new Grant(), grantDto);
         newGrant = grantRepository.save(newGrant);
         eventService.createFromObject(newGrant, Collections.emptyList(), false, "гранта");
         grantNotificationService.sendCreateNotification(newGrant);
-        return newGrant.getId();
+        return newGrant;
     }
 
     private Grant copyFromDto(Grant grant, GrantDto grantDto) throws IOException {
@@ -106,9 +109,11 @@ public class GrantService extends BaseService {
             grant.setProject(projectService.findById(grantDto.getProject().getId()));
         }
         grant.setDeadlines(deadlineService.saveOrCreate(grantDto.getDeadlines()));
-        grant.setFiles(fileService.saveOrCreate(grantDto.getFiles().stream()
-                .filter(f -> !f.isDeleted())
-                .collect(toList())));
+        if (!grant.getFiles().isEmpty()) {
+            grant.setFiles(fileService.saveOrCreate(grantDto.getFiles().stream()
+                    .filter(f -> !f.isDeleted())
+                    .collect(toList())));
+        }
         grant.getAuthors().clear();
         if (grantDto.getAuthorIds() != null && !grantDto.getAuthorIds().isEmpty()) {
             grantDto.getAuthorIds().forEach(authorIds -> grant.getAuthors().add(userService.findById(authorIds)));
@@ -123,6 +128,7 @@ public class GrantService extends BaseService {
         return grant;
     }
 
+
     public void createProject(GrantDto grantDto) throws IOException {
         grantDto.setProject(
                 new ProjectDto(projectService.save(new ProjectDto(grantDto.getTitle()))));
@@ -130,7 +136,7 @@ public class GrantService extends BaseService {
 
     @Transactional
     public Integer update(GrantDto grantDto) throws IOException {
-        Grant grant = grantRepository.findOne(grantDto.getId());
+        Grant grant = findById(grantDto.getId());
         Set<User> oldAuthors = new HashSet<>(grant.getAuthors());
         User oldLeader = grant.getLeader();
         for (FileDataDto file : grantDto.getFiles().stream()
@@ -158,34 +164,40 @@ public class GrantService extends BaseService {
         return grant.getId();
     }
 
+    //++
     @Transactional
-    public void delete(Integer grantId) throws IOException {
-        Grant grant = grantRepository.findOne(grantId);
-        grantRepository.delete(grant);
+    public boolean delete(Integer grantId) throws IOException {
+        Grant grant = findById(grantId);
+        if (grant != null) {
+            grantRepository.delete(grant);
+            return true;
+        }
+        return false;
     }
 
+    //++
     public List<Grant.GrantStatus> getGrantStatuses() {
         return Arrays.asList(Grant.GrantStatus.values());
     }
 
-    @Transactional
-    public Grant create(String title, Project projectId, Date deadlineDate, User user, Paper paper) {
-        Grant grant = new Grant();
-        grant.setTitle(title);
-        grant.setComment("Комментарий к гранту 1");
-        grant.setProject(projectId);
-        grant.setStatus(APPLICATION);
-        grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
-        grant.getAuthors().add(user);
-        grant.setLeader(user);
-        grant.getPapers().add(paper);
-        grant = grantRepository.save(grant);
-
-        eventService.createFromObject(grant, Collections.emptyList(), false, "гранта");
-        grantNotificationService.sendCreateNotification(grant);
-
-        return grant;
-    }
+//    @Transactional
+//    public Grant create(String title, Project projectId, Date deadlineDate, User user, Paper paper) {
+//        Grant grant = new Grant();
+//        grant.setTitle(title);
+//        grant.setComment("Комментарий к гранту 1");
+//        grant.setProject(projectId);
+//        grant.setStatus(APPLICATION);
+//        grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
+//        grant.getAuthors().add(user);
+//        grant.setLeader(user);
+//        grant.getPapers().add(paper);
+//        grant = grantRepository.save(grant);
+//
+//        eventService.createFromGrant(grant);
+//        grantNotificationService.sendCreateNotification(grant);
+//
+//        return grant;
+//    }
 
     public boolean save(GrantDto grantDto, Errors errors) throws IOException {
         grantDto.setName(grantDto.getTitle());
@@ -266,10 +278,12 @@ public class GrantService extends BaseService {
                 .collect(toList());
     }
 
+    //++
     public List<PaperDto> getGrantPapers(List<Integer> paperIds) {
         return paperService.findAllSelect(paperIds);
     }
 
+    //++
     public List<PaperDto> getAllUncompletedPapers() {
         return paperService.findAllNotCompleted();
     }
@@ -283,11 +297,13 @@ public class GrantService extends BaseService {
         }
     }
 
-    public void removeDeadline(GrantDto grantDto, Integer deadlineId) {
+    //++
+    public GrantDto removeDeadline(GrantDto grantDto, Integer deadlineId) {
         if (grantDto.getDeadlines().get(deadlineId).getId() != null) {
             grantDto.getRemovedDeadlineIds().add(grantDto.getDeadlines().get(deadlineId).getId());
         }
         grantDto.getDeadlines().remove((int) deadlineId);
+        return grantDto;
     }
 
     private List<User> getCompletedPapersAuthors(Paper.PaperType type) {
@@ -315,7 +331,7 @@ public class GrantService extends BaseService {
 
     public void filterEmptyDeadlines(GrantDto grantDto) {
         grantDto.setDeadlines(grantDto.getDeadlines().stream()
-                .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription()))
+                .filter(dto -> dto.getDate() != null || !StringUtils.isEmpty(dto.getDescription()))
                 .collect(Collectors.toList()));
     }
 
@@ -338,16 +354,14 @@ public class GrantService extends BaseService {
         return grantRepository.findAllActive();
     }
 
+    //+
     public Grant findById(Integer id) {
         return grantRepository.findOne(id);
     }
 
+    //+
     @Transactional
     public void ping(int grantId) throws IOException {
         pingService.addPing(findById(grantId));
     }
-
-    public Grant findGrantById(Integer grantId) {
-        return grantRepository.findOne(grantId);
-    }
 }
diff --git a/src/test/java/ru/ulstu/grant/service/GrantServiceTest.java b/src/test/java/ru/ulstu/grant/service/GrantServiceTest.java
new file mode 100644
index 0000000..6e0ea10
--- /dev/null
+++ b/src/test/java/ru/ulstu/grant/service/GrantServiceTest.java
@@ -0,0 +1,215 @@
+package ru.ulstu.grant.service;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.deadline.service.DeadlineService;
+import ru.ulstu.grant.model.Grant;
+import ru.ulstu.grant.model.GrantDto;
+import ru.ulstu.grant.repository.GrantRepository;
+import ru.ulstu.paper.model.Paper;
+import ru.ulstu.paper.model.PaperDto;
+import ru.ulstu.paper.service.PaperService;
+import ru.ulstu.timeline.service.EventService;
+import ru.ulstu.user.model.User;
+import ru.ulstu.user.service.UserService;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class GrantServiceTest {
+
+    @Mock
+    GrantRepository grantRepository;
+
+    @Mock
+    DeadlineService deadlineService;
+
+    @Mock
+    PaperService paperService;
+
+    @Mock
+    UserService userService;
+
+    @Mock
+    EventService eventService;
+
+    @Mock
+    GrantNotificationService grantNotificationService;
+
+    @InjectMocks
+    GrantService grantService;
+
+    private final static Integer ID = 1;
+    private final static Integer INDEX = 0;
+    private final static String TITLE = "Title";
+    private final static String COMMENT = "Comment";
+    private final static boolean TRUE = true;
+    private final static Integer YEAR = 2019;
+    private final static Integer MAX_DISPLAY_SIZE = 50;
+
+    private List<Grant> grants;
+    private List<GrantDto> grantDtos;
+    private List<Deadline> deadlines;
+    private List<Paper> papers;
+    private PaperDto paperDto;
+    private List<PaperDto> paperDtos;
+    private Set<User> authors;
+    private GrantDto grantDto;
+    private Deadline deadline;
+    private User leader;
+    private User author;
+
+    private Grant grantWithId;
+    private Paper paperWithId;
+
+
+    @Before
+    public void setUp() throws Exception {
+        grants = new ArrayList<>();
+        grantDtos = new ArrayList<>();
+        paperDtos = new ArrayList<>();
+        grantWithId = new Grant();
+
+        deadlines = new ArrayList<>();
+        deadline = new Deadline(new Date(), COMMENT);
+        deadline.setId(ID);
+        deadlines.add(deadline);
+
+        leader = Mockito.mock(User.class);
+
+        papers = new ArrayList<>();
+        paperWithId = new Paper();
+        paperWithId.setId(ID);
+        paperWithId.setTitle(TITLE);
+        papers.add(paperWithId);
+        paperDto = new PaperDto(paperWithId);
+        paperDtos.add(paperDto);
+
+
+        authors = new HashSet<>();
+        author = leader;
+        authors.add(author);
+
+        grantWithId.setId(ID);
+        grantWithId.setTitle(TITLE);
+        grantWithId.setComment(COMMENT);
+        grantWithId.setDeadlines(deadlines);
+        grantWithId.setLeader(leader);
+        grantWithId.setPapers(papers);
+        grantWithId.setAuthors(authors);
+
+        grants.add(grantWithId);
+        grantDto = new GrantDto(grantWithId);
+        grantDtos.add(grantDto);
+    }
+
+    @Test
+    public void getExistGrantById() {
+        when(grantRepository.findOne(ID)).thenReturn(grantWithId);
+
+        GrantDto newGrantDto = new GrantDto(grantWithId);
+        GrantDto result = grantService.getExistGrantById(ID);
+
+        assertEquals(newGrantDto.getId(), result.getId());
+    }
+
+    @Test
+    public void findAll() {
+        when(grantRepository.findAll()).thenReturn(grants);
+
+        assertEquals(Collections.singletonList(grantWithId), grantService.findAll());
+    }
+
+    @Test
+    public void create() throws IOException {
+        when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines);
+        when(userService.getUserByLogin("admin")).thenReturn(leader);
+        when(grantRepository.save(new Grant())).thenReturn(grantWithId);
+
+        Grant newGrant = new Grant();
+        newGrant.setId(ID);
+        newGrant.setTitle(TITLE);
+        newGrant.setComment(COMMENT);
+        newGrant.setDeadlines(deadlines);
+        newGrant.setLeader(leader);
+
+        assertEquals(newGrant, grantService.create(grantDto));
+    }
+
+    @Test
+    public void getGrantStatuses() {
+        assertEquals(Arrays.asList(Grant.GrantStatus.values()), grantService.getGrantStatuses());
+    }
+
+    @Test
+    public void getGrantPapers() {
+        when(paperService.findAllSelect(Collections.singletonList(ID))).thenReturn(paperDtos);
+
+        assertEquals(paperDtos, grantService.getGrantPapers(Collections.singletonList(ID)));
+    }
+
+    @Test
+    public void getAllUncompletedPapers() {
+        when(paperService.findAllNotCompleted()).thenReturn(paperDtos);
+        paperDtos.stream()
+                .forEach(paperDto -> {
+                    paperDto.setTitle(StringUtils.abbreviate(paperDto.getTitle(), MAX_DISPLAY_SIZE));
+                });
+
+        assertEquals(paperDtos, grantService.getAllUncompletedPapers());
+    }
+
+    @Test
+    public void delete() throws IOException {
+        when(grantRepository.findOne(ID)).thenReturn(grantWithId);
+        assertTrue(grantService.delete(grantWithId.getId()));
+    }
+
+    @Test
+    public void removeDeadline() throws IOException {
+        GrantDto newGrantDto = new GrantDto();
+        newGrantDto.getRemovedDeadlineIds().add(ID);
+        grantDto.getDeadlines().add(deadline);
+        GrantDto result = grantService.removeDeadline(grantDto, INDEX);
+
+        assertEquals(newGrantDto.getRemovedDeadlineIds(), result.getRemovedDeadlineIds());
+    }
+
+
+//    @Test
+//    public void findAllDto() {
+//        when(grantRepository.findAll()).thenReturn(grants);
+//        List<Grant> list = convert(grants, GrantDto::new);
+//        grantDtos.clear();
+//        //List<GrantDto> listDto = new ArrayList<>();
+//        list.forEach(grant -> {
+//            GrantDto grantDto = new GrantDto(grant);
+//            grantDtos.add(grantDto);
+//        });
+//
+//
+//        //grantDtos.forEach(grantDto -> grantDto.setTitle(StringUtils.abbreviate(grantDto.getTitle(), MAX_DISPLAY_SIZE)));
+//        //List<GrantDto> result = ;
+//        assertEquals(grantDtos, grantService.findAllDto());
+//    }
+
+
+}
\ No newline at end of file

From e4f5bede2aa1cab56c82c4ac24081250b70f9902 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Fri, 7 Jun 2019 22:39:20 +0400
Subject: [PATCH 08/10] #104 add 3 more tests

---
 .../ru/ulstu/grant/service/GrantService.java  | 36 ++-----------
 .../ulstu/grant/service/GrantServiceTest.java | 52 ++++++++++++-------
 2 files changed, 39 insertions(+), 49 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index ea5491c..99387c7 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.Errors;
+import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.file.model.FileDataDto;
 import ru.ulstu.file.service.FileService;
@@ -76,13 +77,11 @@ public class GrantService extends BaseService {
         this.pingService = pingService;
     }
 
-    //++
     public GrantDto getExistGrantById(Integer id) {
         GrantDto grantDto = new GrantDto(findById(id));
         return grantDto;
     }
 
-    //++
     public List<Grant> findAll() {
         return grantRepository.findAll();
     }
@@ -91,7 +90,6 @@ public class GrantService extends BaseService {
         return convert(findAll(), GrantDto::new);
     }
 
-    //++
     @Transactional
     public Grant create(GrantDto grantDto) throws IOException {
         Grant newGrant = copyFromDto(new Grant(), grantDto);
@@ -164,7 +162,6 @@ public class GrantService extends BaseService {
         return grant.getId();
     }
 
-    //++
     @Transactional
     public boolean delete(Integer grantId) throws IOException {
         Grant grant = findById(grantId);
@@ -175,30 +172,10 @@ public class GrantService extends BaseService {
         return false;
     }
 
-    //++
     public List<Grant.GrantStatus> getGrantStatuses() {
         return Arrays.asList(Grant.GrantStatus.values());
     }
 
-//    @Transactional
-//    public Grant create(String title, Project projectId, Date deadlineDate, User user, Paper paper) {
-//        Grant grant = new Grant();
-//        grant.setTitle(title);
-//        grant.setComment("Комментарий к гранту 1");
-//        grant.setProject(projectId);
-//        grant.setStatus(APPLICATION);
-//        grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
-//        grant.getAuthors().add(user);
-//        grant.setLeader(user);
-//        grant.getPapers().add(paper);
-//        grant = grantRepository.save(grant);
-//
-//        eventService.createFromGrant(grant);
-//        grantNotificationService.sendCreateNotification(grant);
-//
-//        return grant;
-//    }
-
     public boolean save(GrantDto grantDto, Errors errors) throws IOException {
         grantDto.setName(grantDto.getTitle());
         filterEmptyDeadlines(grantDto);
@@ -278,26 +255,24 @@ public class GrantService extends BaseService {
                 .collect(toList());
     }
 
-    //++
     public List<PaperDto> getGrantPapers(List<Integer> paperIds) {
         return paperService.findAllSelect(paperIds);
     }
 
-    //++
     public List<PaperDto> getAllUncompletedPapers() {
         return paperService.findAllNotCompleted();
     }
 
-    public void attachPaper(GrantDto grantDto) {
+    public List<PaperDto> attachPaper(GrantDto grantDto) {
         if (!grantDto.getPaperIds().isEmpty()) {
             grantDto.getPapers().clear();
             grantDto.setPapers(getGrantPapers(grantDto.getPaperIds()));
         } else {
             grantDto.getPapers().clear();
         }
+        return grantDto.getPapers();
     }
 
-    //++
     public GrantDto removeDeadline(GrantDto grantDto, Integer deadlineId) {
         if (grantDto.getDeadlines().get(deadlineId).getId() != null) {
             grantDto.getRemovedDeadlineIds().add(grantDto.getDeadlines().get(deadlineId).getId());
@@ -329,10 +304,11 @@ public class GrantService extends BaseService {
                 .collect(toList());
     }
 
-    public void filterEmptyDeadlines(GrantDto grantDto) {
+    public List<Deadline> filterEmptyDeadlines(GrantDto grantDto) {
         grantDto.setDeadlines(grantDto.getDeadlines().stream()
                 .filter(dto -> dto.getDate() != null || !StringUtils.isEmpty(dto.getDescription()))
                 .collect(Collectors.toList()));
+        return grantDto.getDeadlines();
     }
 
     @Transactional
@@ -354,12 +330,10 @@ public class GrantService extends BaseService {
         return grantRepository.findAllActive();
     }
 
-    //+
     public Grant findById(Integer id) {
         return grantRepository.findOne(id);
     }
 
-    //+
     @Transactional
     public void ping(int grantId) throws IOException {
         pingService.addPing(findById(grantId));
diff --git a/src/test/java/ru/ulstu/grant/service/GrantServiceTest.java b/src/test/java/ru/ulstu/grant/service/GrantServiceTest.java
index 6e0ea10..99d7ef6 100644
--- a/src/test/java/ru/ulstu/grant/service/GrantServiceTest.java
+++ b/src/test/java/ru/ulstu/grant/service/GrantServiceTest.java
@@ -28,6 +28,7 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -103,7 +104,6 @@ public class GrantServiceTest {
         paperDto = new PaperDto(paperWithId);
         paperDtos.add(paperDto);
 
-
         authors = new HashSet<>();
         author = leader;
         authors.add(author);
@@ -184,7 +184,7 @@ public class GrantServiceTest {
     }
 
     @Test
-    public void removeDeadline() throws IOException {
+    public void removeDeadline() {
         GrantDto newGrantDto = new GrantDto();
         newGrantDto.getRemovedDeadlineIds().add(ID);
         grantDto.getDeadlines().add(deadline);
@@ -193,23 +193,39 @@ public class GrantServiceTest {
         assertEquals(newGrantDto.getRemovedDeadlineIds(), result.getRemovedDeadlineIds());
     }
 
+    @Test
+    public void findById() {
+        when(grantRepository.findOne(ID)).thenReturn(grantWithId);
+        Grant findGrant = grantService.findById(ID);
 
-//    @Test
-//    public void findAllDto() {
-//        when(grantRepository.findAll()).thenReturn(grants);
-//        List<Grant> list = convert(grants, GrantDto::new);
-//        grantDtos.clear();
-//        //List<GrantDto> listDto = new ArrayList<>();
-//        list.forEach(grant -> {
-//            GrantDto grantDto = new GrantDto(grant);
-//            grantDtos.add(grantDto);
-//        });
-//
-//
-//        //grantDtos.forEach(grantDto -> grantDto.setTitle(StringUtils.abbreviate(grantDto.getTitle(), MAX_DISPLAY_SIZE)));
-//        //List<GrantDto> result = ;
-//        assertEquals(grantDtos, grantService.findAllDto());
-//    }
+        assertEquals(grantWithId.getId(), findGrant.getId());
+    }
 
+    @Test
+    public void attachPaper() {
+        when(grantRepository.findOne(ID)).thenReturn(grantWithId);
+        when(paperService.findAllSelect(Collections.singletonList(ID))).thenReturn(paperDtos);
+        GrantDto newGrantDto = new GrantDto(grantWithId);
 
+        if (!newGrantDto.getPaperIds().isEmpty()) {
+            newGrantDto.getPapers().clear();
+            newGrantDto.setPapers(paperDtos);
+        } else {
+            newGrantDto.getPapers().clear();
+        }
+
+        assertEquals(newGrantDto.getPapers(), grantService.attachPaper(grantDto));
+    }
+
+    @Test
+    public void filterEmptyDeadlines() {
+        when(grantRepository.findOne(ID)).thenReturn(grantWithId);
+        GrantDto newGrantDto = new GrantDto(grantWithId);
+
+        newGrantDto.setDeadlines(newGrantDto.getDeadlines().stream()
+                .filter(dto -> dto.getDate() != null || !StringUtils.isEmpty(dto.getDescription()))
+                .collect(Collectors.toList()));
+
+        assertEquals(newGrantDto.getDeadlines(), grantService.filterEmptyDeadlines(grantDto));
+    }
 }
\ No newline at end of file

From d84b1fcbdca5bcb447d9c147b18f61341b9fddec Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Sat, 8 Jun 2019 14:36:12 +0400
Subject: [PATCH 09/10] use HtmlUnit instead of selenium webdriver for grants
 loading

---
 build.gradle                                  |  2 +-
 .../java/ru/ulstu/grant/page/KiasPage.java    | 42 ++++++-----
 .../ru/ulstu/grant/service/KiasService.java   | 70 ++++++-------------
 src/main/resources/application.properties     |  3 +
 .../db/changelog-20190605_000000-schema.xml   | 18 +++++
 5 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/build.gradle b/build.gradle
index e57e620..6f67f77 100644
--- a/build.gradle
+++ b/build.gradle
@@ -124,9 +124,9 @@ dependencies {
 
     compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.6.0'
     compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.6.0'
+    compile group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.35.0'
 
     testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test'
-    compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1'
     testCompile group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '3.3.1'
     testCompile group: 'com.google.guava', name: 'guava', version: '21.0'
 
diff --git a/src/main/java/ru/ulstu/grant/page/KiasPage.java b/src/main/java/ru/ulstu/grant/page/KiasPage.java
index 631f5db..0a83b43 100644
--- a/src/main/java/ru/ulstu/grant/page/KiasPage.java
+++ b/src/main/java/ru/ulstu/grant/page/KiasPage.java
@@ -1,8 +1,13 @@
 package ru.ulstu.grant.page;
 
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
+import com.gargoylesoftware.htmlunit.html.DomElement;
+import com.gargoylesoftware.htmlunit.html.DomNode;
+import com.gargoylesoftware.htmlunit.html.DomNodeList;
+import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlTableDataCell;
+import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -11,16 +16,17 @@ import java.util.List;
 
 public class KiasPage {
     private final static String KIAS_GRANT_DATE_FORMAT = "dd.MM.yyyy HH:mm";
-    private WebDriver driver;
+    private final HtmlPage page;
 
-    public KiasPage(WebDriver webDriver) {
-        this.driver = webDriver;
+    public KiasPage(HtmlPage page) {
+        this.page = page;
     }
 
     public boolean goToNextPage() {
         try {
-            if (driver.findElements(By.id("js-ctrlNext")).size() > 0) {
-                driver.findElement(By.id("js-ctrlNext")).click();
+            HtmlElement nextPageLink = page.getHtmlElementById("js-ctrlNext");
+            if (nextPageLink.isDisplayed()) {
+                nextPageLink.click();
                 return true;
             }
         } finally {
@@ -28,23 +34,25 @@ public class KiasPage {
         }
     }
 
-    public List<WebElement> getPageOfGrants() {
-        WebElement listContest = driver.findElement(By.tagName("tBody"));
-        List<WebElement> grants = listContest.findElements(By.cssSelector("tr.tr"));
-        return grants;
+    public List<DomNode> getPageOfGrants() {
+        return page.getByXPath("/html/body/div[2]/div/div[2]/main/div[1]/table/tbody/tr");
     }
 
-    public String getGrantTitle(WebElement grant) {
-        return grant.findElement(By.cssSelector("td.tertiary")).findElement(By.tagName("a")).getText();
+    public String getGrantTitle(DomNode grant) {
+        return ((DomNode)grant.getFirstByXPath("td[@class='tertiary']/a")).getTextContent();
     }
 
-    public Date parseDeadLineDate(WebElement grantElement) throws ParseException {
+    public Date parseDeadLineDate(DomNode grantElement) throws ParseException {
         String deadlineDate = getFirstDeadline(grantElement); //10.06.2019 23:59
         SimpleDateFormat formatter = new SimpleDateFormat(KIAS_GRANT_DATE_FORMAT);
         return formatter.parse(deadlineDate);
     }
 
-    private String getFirstDeadline(WebElement grantElement) {
-        return grantElement.findElement(By.xpath("./td[5]")).getText();
+    private String getFirstDeadline(DomNode grantElement) {
+        return ((DomNode)grantElement.getFirstByXPath("td[5]")).getTextContent();
+    }
+
+    public boolean isTrGrantLine(DomNode grantElement) {
+        return !((HtmlTableRow)grantElement).getAttribute("class").contains("pagerSavedHeightSpacer");
     }
 }
diff --git a/src/main/java/ru/ulstu/grant/service/KiasService.java b/src/main/java/ru/ulstu/grant/service/KiasService.java
index c3a55dc..56474fa 100644
--- a/src/main/java/ru/ulstu/grant/service/KiasService.java
+++ b/src/main/java/ru/ulstu/grant/service/KiasService.java
@@ -1,35 +1,29 @@
 package ru.ulstu.grant.service;
 
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.chrome.ChromeDriver;
-import org.openqa.selenium.chrome.ChromeOptions;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.DomElement;
+import com.gargoylesoftware.htmlunit.html.DomNode;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import org.springframework.stereotype.Service;
 import ru.ulstu.configuration.ApplicationProperties;
 import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.page.KiasPage;
 import ru.ulstu.user.service.UserService;
 
-import java.nio.file.Paths;
+import java.io.IOException;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 
-import static org.apache.commons.lang3.StringUtils.isEmpty;
-
 @Service
 public class KiasService {
     private final static String BASE_URL = "https://www.rfbr.ru/rffi/ru/contest_search?CONTEST_STATUS_ID=%s&CONTEST_TYPE=%s&CONTEST_YEAR=%s";
     private final static String CONTEST_STATUS_ID = "1";
     private final static String CONTEST_TYPE = "-1";
 
-    private final static String DRIVER_LOCATION = "drivers/%s";
-    private final static String WINDOWS_DRIVER = "chromedriver.exe";
-    private final static String LINUX_DRIVER = "chromedriver";
-    private final static String DRIVER_TYPE = "webdriver.chrome.driver";
-
     private final UserService userService;
     private final ApplicationProperties applicationProperties;
 
@@ -39,22 +33,22 @@ public class KiasService {
         this.applicationProperties = applicationProperties;
     }
 
-    public List<GrantDto> getNewGrantsDto() throws ParseException {
-        WebDriver webDriver = getDriver();
+    public List<GrantDto> getNewGrantsDto() throws ParseException, IOException {
         Integer leaderId = userService.findOneByLoginIgnoreCase("admin").getId();
         List<GrantDto> grants = new ArrayList<>();
-        for (Integer year : generateGrantYears()) {
-            webDriver.get(String.format(BASE_URL, CONTEST_STATUS_ID, CONTEST_TYPE, year));
-            grants.addAll(getKiasGrants(webDriver));
+        try (final WebClient webClient = new WebClient()) {
+            for (Integer year : generateGrantYears()) {
+                final HtmlPage page = webClient.getPage(String.format(BASE_URL, CONTEST_STATUS_ID, CONTEST_TYPE, year));
+                grants.addAll(getKiasGrants(page));
+            }
         }
         grants.forEach(grantDto -> grantDto.setLeaderId(leaderId));
-        webDriver.quit();
         return grants;
     }
 
-    public List<GrantDto> getKiasGrants(WebDriver webDriver) throws ParseException {
+    public List<GrantDto> getKiasGrants(HtmlPage page) throws ParseException {
         List<GrantDto> newGrants = new ArrayList<>();
-        KiasPage kiasPage = new KiasPage(webDriver);
+        KiasPage kiasPage = new KiasPage(page);
         do {
             newGrants.addAll(getGrantsFromPage(kiasPage));
         } while (kiasPage.goToNextPage()); //проверка существования следующей страницы с грантами
@@ -63,11 +57,13 @@ public class KiasService {
 
     private List<GrantDto> getGrantsFromPage(KiasPage kiasPage) throws ParseException {
         List<GrantDto> grants = new ArrayList<>();
-        for (WebElement grantElement : kiasPage.getPageOfGrants()) {
-            GrantDto grantDto = new GrantDto(
-                    kiasPage.getGrantTitle(grantElement),
-                    kiasPage.parseDeadLineDate(grantElement));
-            grants.add(grantDto);
+        for (DomNode grantElement : kiasPage.getPageOfGrants()) {
+            if (kiasPage.isTrGrantLine(grantElement)) {
+                GrantDto grantDto = new GrantDto(
+                        kiasPage.getGrantTitle(grantElement),
+                        kiasPage.parseDeadLineDate(grantElement));
+                grants.add(grantDto);
+            }
         }
         return grants;
     }
@@ -76,28 +72,4 @@ public class KiasService {
         return Arrays.asList(Calendar.getInstance().get(Calendar.YEAR),
                 Calendar.getInstance().get(Calendar.YEAR) + 1);
     }
-
-    private WebDriver getDriver() {
-        System.setProperty(DRIVER_TYPE, getDriverExecutablePath());
-        System.out.println("drive search path: " + getDriverExecutablePath());
-        final ChromeOptions chromeOptions = new ChromeOptions();
-        chromeOptions.setBinary("/usr/bin/google-chrome");
-        chromeOptions.addArguments("--headless");
-        return new ChromeDriver(chromeOptions);
-    }
-
-    private String getDriverExecutablePath() {
-        return isEmpty(applicationProperties.getDriverPath())
-                ? KiasService.class.getClassLoader()
-                .getResource(String.format(DRIVER_LOCATION, getDriverExecutable(isWindows()))).getFile()
-                : Paths.get(applicationProperties.getDriverPath(), getDriverExecutable(isWindows())).toString();
-    }
-
-    private String getDriverExecutable(boolean isWindows) {
-        return isWindows ? WINDOWS_DRIVER : LINUX_DRIVER;
-    }
-
-    private boolean isWindows() {
-        return System.getProperty("os.name").toLowerCase().contains("windows");
-    }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index f4d9c36..7b30ec0 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -13,6 +13,8 @@ server.ssl.key-store-password=secret
 server.ssl.key-password=password
 # Log settings (TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF)
 logging.level.ru.ulstu=DEBUG
+#HtmlUnit
+logging.level.com.gargoylesoftware.htmlunit=ERROR
 # Mail Settings
 spring.mail.host=smtp.yandex.ru
 spring.mail.port=465
@@ -31,6 +33,7 @@ spring.jpa.hibernate.ddl-auto=validate
 liquibase.drop-first=false
 liquibase.enabled=true
 liquibase.change-log=classpath:db/changelog-master.xml
+
 # Application Settings
 ng-tracker.base-url=http://127.0.0.1:8080
 ng-tracker.undead-user-login=admin
diff --git a/src/main/resources/db/changelog-20190605_000000-schema.xml b/src/main/resources/db/changelog-20190605_000000-schema.xml
index c035b35..2783660 100644
--- a/src/main/resources/db/changelog-20190605_000000-schema.xml
+++ b/src/main/resources/db/changelog-20190605_000000-schema.xml
@@ -8,4 +8,22 @@
             <column name="activity_id" type="integer"/>
         </addColumn>
     </changeSet>
+    <changeSet author="orion" id="20190525_000000-2">
+        <modifyDataType tableName="grants"
+                        columnName="title"
+                        newDataType="text"
+                        schemaName="public"/>
+    </changeSet>
+    <changeSet author="orion" id="20190525_000000-3">
+        <modifyDataType tableName="event"
+                        columnName="title"
+                        newDataType="text"
+                        schemaName="public"/>
+    </changeSet>
+    <changeSet author="orion" id="20190525_000000-4">
+        <modifyDataType tableName="event"
+                        columnName="description"
+                        newDataType="text"
+                        schemaName="public"/>
+    </changeSet>
 </databaseChangeLog>

From 9ba4476f8034f862140d7d23e4840fd340d9af20 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Sat, 8 Jun 2019 14:43:08 +0400
Subject: [PATCH 10/10] restore dependencies

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 6f67f77..4a07d96 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,6 +127,7 @@ dependencies {
     compile group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.35.0'
 
     testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test'
+    compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1'
     testCompile group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '3.3.1'
     testCompile group: 'com.google.guava', name: 'guava', version: '21.0'