From 8fbce550286d4dcd6ba02dce5104690653f8cdfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Wed, 17 Apr 2019 11:04:35 +0300
Subject: [PATCH 01/74] #86 projects main page

---
 .../project/controller/ProjectController.java | 39 +++++++++++++++++++
 .../ulstu/project/service/ProjectService.java |  9 +++++
 src/main/resources/templates/index.html       |  2 +-
 .../templates/projects/dashboard.html         | 24 ++++++++++++
 .../fragments/projectNavigationFragment.html  | 26 +++++++++++++
 .../templates/projects/projects.html          | 33 ++++++++++++++++
 6 files changed, 132 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/ru/ulstu/project/controller/ProjectController.java
 create mode 100644 src/main/resources/templates/projects/dashboard.html
 create mode 100644 src/main/resources/templates/projects/fragments/projectNavigationFragment.html
 create mode 100644 src/main/resources/templates/projects/projects.html

diff --git a/src/main/java/ru/ulstu/project/controller/ProjectController.java b/src/main/java/ru/ulstu/project/controller/ProjectController.java
new file mode 100644
index 0000000..5b5eb4a
--- /dev/null
+++ b/src/main/java/ru/ulstu/project/controller/ProjectController.java
@@ -0,0 +1,39 @@
+package ru.ulstu.project.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.Errors;
+import org.springframework.web.bind.annotation.*;
+import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.project.model.Project;
+import ru.ulstu.project.model.ProjectDto;
+import ru.ulstu.project.service.ProjectService;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static liquibase.util.StringUtils.isEmpty;
+
+@Controller()
+@RequestMapping(value = "/projects")
+@ApiIgnore
+public class ProjectController {
+    private final ProjectService projectService;
+
+    public ProjectController(ProjectService projectService) {
+        this.projectService = projectService;
+    }
+
+    @GetMapping("/dashboard")
+    public void getDashboard(ModelMap modelMap) {
+        modelMap.put("projects", projectService.findAllDto());
+    }
+
+    @GetMapping("/projects")
+    public void getProjects(ModelMap modelMap) {
+        modelMap.put("projects", projectService.findAllDto());
+    }
+}
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index b54a60a..78a9d3c 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -2,6 +2,7 @@ package ru.ulstu.project.service;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
@@ -10,9 +11,11 @@ import ru.ulstu.project.repository.ProjectRepository;
 import java.util.List;
 
 import static org.springframework.util.ObjectUtils.isEmpty;
+import static ru.ulstu.core.util.StreamApiUtils.convert;
 
 @Service
 public class ProjectService {
+    private final static int MAX_DISPLAY_SIZE = 40;
 
     private final ProjectRepository projectRepository;
     private final DeadlineService deadlineService;
@@ -27,6 +30,12 @@ public class ProjectService {
         return projectRepository.findAll();
     }
 
+    public List<ProjectDto> findAllDto() {
+        List<ProjectDto> projects = convert(findAll(), ProjectDto::new);
+        projects.forEach(projectDto -> projectDto.setTitle(StringUtils.abbreviate(projectDto.getTitle(), MAX_DISPLAY_SIZE)));
+        return projects;
+    }
+
     @Transactional
     public Project create(ProjectDto projectDto) {
         Project newProject = copyFromDto(new Project(), projectDto);
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 2d86945..6ca1c12 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -46,7 +46,7 @@
                 </div>
             </div>
             <div class="col-md-4 col-sm-6 portfolio-item">
-                <a class="portfolio-link" data-toggle="modal" href="/projects">
+                <a class="portfolio-link" href="./projects/dashboard">
                     <div class="portfolio-hover">
                         <div class="portfolio-hover-content">
                             <i class="fa fa-arrow-right fa-3x"></i>
diff --git a/src/main/resources/templates/projects/dashboard.html b/src/main/resources/templates/projects/dashboard.html
new file mode 100644
index 0000000..882c202
--- /dev/null
+++ b/src/main/resources/templates/projects/dashboard.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml">
+<head>
+</head>
+<body>
+<div class="container" layout:fragment="content">
+    <section id="services">
+        <div class="container">
+            <div class="col-lg-12 text-center">
+                <h2 class="section-heading text-uppercase">Проекты</h2>
+                <div th:replace="projects/fragments/projectNavigationFragment"/>
+            </div>
+            <div class="row justify-content-center" id="dashboard">
+                <th:block>
+                    <div/>
+                </th:block>
+            </div>
+        </div>
+    </section>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/fragments/projectNavigationFragment.html b/src/main/resources/templates/projects/fragments/projectNavigationFragment.html
new file mode 100644
index 0000000..c26d8b8
--- /dev/null
+++ b/src/main/resources/templates/projects/fragments/projectNavigationFragment.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:fragment="headerfiles">
+    <meta charset="UTF-8"/>
+</head>
+<body>
+<div class="row justify-content-center">
+    <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
+        <a href="./projects" class="btn btn-light toolbar-button"><i class="fa fa-list-alt"></i>
+            Список</a>
+    </div>
+    <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
+        <a href="./dashboard" class="btn btn-light toolbar-button"><i class="fa fa-newspaper-o"
+                                                                      aria-hidden="true"></i> Панель
+            управления</a>
+    </div>
+
+    <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
+        <a href="javascript:void(0)" class="btn btn-light toolbar-button"><i class="fa fa-plus-circle"
+                                                                       aria-hidden="true"></i>
+            Добавить проект</a>
+
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/projects.html b/src/main/resources/templates/projects/projects.html
new file mode 100644
index 0000000..0336770
--- /dev/null
+++ b/src/main/resources/templates/projects/projects.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorator="default" xmlns:th="">
+<head>
+</head>
+<body>
+<div class="container" layout:fragment="content">
+    <form id="projects-form" method="post" th:action="@{'/projects/projects'}">
+        <input th:type="hidden" name="projectDeleteId" id="projectDeleteId"/>
+        <section id="projects">
+            <div class="container">
+                <div class="row" id="project-list">
+                    <div class="col-lg-12 text-center">
+                        <h2 class="section-heading text-uppercase">Проекты</h2>
+                        <div th:replace="projects/fragments/projectNavigationFragment"/>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-md-9 col-sm-12">
+                        <th:block>
+                            <div/>
+                        </th:block>
+                    </div>
+                    <div class="col-md-3 col-sm-12">
+                    </div>
+                </div>
+            </div>
+        </section>
+    </form>
+</div>
+</body>
+</html>

From ee55e08feee4ea20dfa52403996f0659cd42f1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 6 May 2019 17:43:20 +0300
Subject: [PATCH 02/74] #98 project tasks deadline edited

---
 .../conference/service/ConferenceService.java |  3 +-
 .../ru/ulstu/deadline/model/Deadline.java     | 35 ++++++++++++++++---
 .../ru/ulstu/grant/service/GrantService.java  |  2 +-
 .../ru/ulstu/paper/service/PaperService.java  |  2 +-
 .../project/controller/ProjectController.java |  7 ++++
 .../ru/ulstu/project/model/ProjectDto.java    |  9 +++++
 .../ulstu/project/service/ProjectService.java |  7 ++++
 .../db/changelog-20190506_000000-schema.xml   | 13 +++++++
 src/main/resources/db/changelog-master.xml    |  1 +
 .../resources/templates/projects/project.html |  8 +++--
 10 files changed, 78 insertions(+), 9 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20190506_000000-schema.xml

diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 38de435..b42f981 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -267,7 +267,8 @@ public class ConferenceService {
     }
 
     public Deadline copyDeadline(Deadline oldDeadline) {
-        Deadline newDeadline = new Deadline(oldDeadline.getDate(), oldDeadline.getDescription());
+        Deadline newDeadline = new Deadline(oldDeadline.getDate(), oldDeadline.getDescription(),
+                oldDeadline.getExecutor(), oldDeadline.getDone());
         newDeadline.setId(oldDeadline.getId());
         return newDeadline;
     }
diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 148697c..9ab9acd 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -20,21 +20,30 @@ public class Deadline extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
+    private String executor;
+    private Boolean done;
+
     public Deadline() {
     }
 
-    public Deadline(Date deadlineDate, String description) {
+    public Deadline(Date deadlineDate, String description, String executor, Boolean done) {
         this.date = deadlineDate;
         this.description = description;
+        this.executor = executor;
+        this.done = done;
     }
 
     @JsonCreator
     public Deadline(@JsonProperty("id") Integer id,
                     @JsonProperty("description") String description,
-                    @JsonProperty("date") Date date) {
+                    @JsonProperty("date") Date date,
+                    @JsonProperty("executor") String executor,
+                    @JsonProperty("done") Boolean done) {
         this.setId(id);
         this.description = description;
         this.date = date;
+        this.executor = executor;
+        this.done = done;
     }
 
     public String getDescription() {
@@ -53,6 +62,22 @@ public class Deadline extends BaseEntity {
         this.date = date;
     }
 
+    public String getExecutor() {
+        return executor;
+    }
+
+    public void setExecutor(String executor) {
+        this.executor = executor;
+    }
+
+    public Boolean getDone() {
+        return done;
+    }
+
+    public void setDone(Boolean done) {
+        this.done = done;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -67,11 +92,13 @@ public class Deadline extends BaseEntity {
         Deadline deadline = (Deadline) o;
         return getId().equals(deadline.getId()) &&
                 description.equals(deadline.description) &&
-                date.equals(deadline.date);
+                date.equals(deadline.date) &&
+                executor.equals(deadline.executor) &&
+                done.equals(deadline.done);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), description, date);
+        return Objects.hash(super.hashCode(), description, date, executor, done);
     }
 }
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index 9cff4b6..0837b49 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -141,7 +141,7 @@ public class GrantService {
         grant.setComment("Комментарий к гранту 1");
         grant.setProject(projectId);
         grant.setStatus(APPLICATION);
-        grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
+        grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн", "", false));
         grant.getAuthors().add(user);
         grant.setLeader(user);
         grant.getPapers().add(paper);
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index f98997d..1188c28 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -173,7 +173,7 @@ public class PaperService {
         Paper paper = new Paper();
         paper.setTitle(title);
         paper.getAuthors().add(user);
-        paper.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
+        paper.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн", "", false));
         paper.setCreateDate(new Date());
         paper.setUpdateDate(new Date());
         paper.setStatus(DRAFT);
diff --git a/src/main/java/ru/ulstu/project/controller/ProjectController.java b/src/main/java/ru/ulstu/project/controller/ProjectController.java
index ae09658..14b8736 100644
--- a/src/main/java/ru/ulstu/project/controller/ProjectController.java
+++ b/src/main/java/ru/ulstu/project/controller/ProjectController.java
@@ -79,6 +79,13 @@ public class ProjectController {
         return "/projects/project";
     }
 
+    @PostMapping(value = "/project", params = "removeDeadline")
+    public String removeDeadline(ProjectDto projectDto,
+                                 @RequestParam(value = "removeDeadline") Integer deadlineId) {
+        projectService.removeDeadline(projectDto, deadlineId);
+        return "/projects/project";
+    }
+
     @GetMapping("/delete/{project-id}")
     public String delete(@PathVariable("project-id") Integer projectId) throws IOException {
         projectService.delete(projectId);
diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index 4e03365..319609c 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -20,6 +20,7 @@ public class ProjectDto {
     private GrantDto grant;
     private String repository;
     private String applicationFileName;
+    private List<Integer> removedDeadlineIds = new ArrayList<>();
 
     public ProjectDto() {
     }
@@ -121,4 +122,12 @@ public class ProjectDto {
     public void setApplicationFileName(String applicationFileName) {
         this.applicationFileName = applicationFileName;
     }
+
+    public List<Integer> getRemovedDeadlineIds() {
+        return removedDeadlineIds;
+    }
+
+    public void setRemovedDeadlineIds(List<Integer> removedDeadlineIds) {
+        this.removedDeadlineIds = removedDeadlineIds;
+    }
 }
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index 247624d..4a79e6c 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -104,6 +104,13 @@ public class ProjectService {
         }
     }
 
+    public void removeDeadline(ProjectDto projectDto, Integer deadlineId) {
+        if (projectDto.getDeadlines().get(deadlineId).getId() != null) {
+            projectDto.getRemovedDeadlineIds().add(projectDto.getDeadlines().get(deadlineId).getId());
+        }
+        projectDto.getDeadlines().remove((int) deadlineId);
+    }
+
     public Project findById(Integer id) {
         return projectRepository.findOne(id);
     }
diff --git a/src/main/resources/db/changelog-20190506_000000-schema.xml b/src/main/resources/db/changelog-20190506_000000-schema.xml
new file mode 100644
index 0000000..cd5a59b
--- /dev/null
+++ b/src/main/resources/db/changelog-20190506_000000-schema.xml
@@ -0,0 +1,13 @@
+<?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="anton" id="20190506_000000-1">
+        <addColumn tableName="deadline">
+            <column name="executor" type="varchar(255)"/>
+        </addColumn>
+        <addColumn tableName="deadline">
+            <column name="done" type="boolean"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 83ff280..3b455a8 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -38,4 +38,5 @@
     <include file="db/changelog-20190428_000000-schema.xml"/>
     <include file="db/changelog-20190430_000000-schema.xml"/>
     <include file="db/changelog-20190505_000000-schema.xml"/>
+    <include file="db/changelog-20190506_000000-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/project.html b/src/main/resources/templates/projects/project.html
index dc3fa6d..cd49319 100644
--- a/src/main/resources/templates/projects/project.html
+++ b/src/main/resources/templates/projects/project.html
@@ -73,14 +73,18 @@
                                     <label>Дедлайны показателей:</label>
                                     <div class="row" th:each="deadline, rowStat : *{deadlines}">
                                         <input type="hidden" th:field="*{deadlines[__${rowStat.index}__].id}"/>
-                                        <div class="col-6 div-deadline-date">
+                                        <div class="col-3 div-deadline-date">
                                             <input type="date" class="form-control form-deadline-date" name="deadline"
                                                    th:field="*{deadlines[__${rowStat.index}__].date}"/>
                                         </div>
-                                        <div class="col-4 div-deadline-description">
+                                        <div class="col-3 div-deadline-description">
                                             <input class="form-control" type="text" placeholder="Описание"
                                                    th:field="*{deadlines[__${rowStat.index}__].description}"/>
                                         </div>
+                                        <div class="col-4 div-deadline-executor">
+                                            <input class="form-control" type="text" placeholder="Исполнитель"
+                                                   th:field="*{deadlines[__${rowStat.index}__].executor}"/>
+                                        </div>
                                         <div class="col-2">
                                             <a class="btn btn-danger float-right"
                                                th:onclick="|$('#deadlines${rowStat.index}\\.description').val('');

From 4bab980f624d8ac8ec24400aa544b2e5daeb48dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 6 May 2019 20:17:10 +0300
Subject: [PATCH 03/74] #98 deadline model and service edited

---
 .../ru/ulstu/deadline/model/Deadline.java     |  4 +---
 .../deadline/service/DeadlineService.java     |  4 ++++
 .../resources/templates/projects/project.html | 19 ++++++++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 9ab9acd..5a05ea1 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -66,9 +66,7 @@ public class Deadline extends BaseEntity {
         return executor;
     }
 
-    public void setExecutor(String executor) {
-        this.executor = executor;
-    }
+    public void setExecutor(String executor) { this.executor = executor; }
 
     public Boolean getDone() {
         return done;
diff --git a/src/main/java/ru/ulstu/deadline/service/DeadlineService.java b/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
index 0ef8a4f..6002c86 100644
--- a/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
+++ b/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
@@ -29,6 +29,8 @@ public class DeadlineService {
         Deadline updateDeadline = deadlineRepository.findOne(deadline.getId());
         updateDeadline.setDate(deadline.getDate());
         updateDeadline.setDescription(deadline.getDescription());
+        updateDeadline.setExecutor(deadline.getExecutor());
+        updateDeadline.setDone(deadline.getDone());
         deadlineRepository.save(updateDeadline);
         return updateDeadline;
     }
@@ -38,6 +40,8 @@ public class DeadlineService {
         Deadline newDeadline = new Deadline();
         newDeadline.setDate(deadline.getDate());
         newDeadline.setDescription(deadline.getDescription());
+        newDeadline.setExecutor(deadline.getExecutor());
+        newDeadline.setDone(deadline.getDone());
         newDeadline = deadlineRepository.save(newDeadline);
         return newDeadline;
     }
diff --git a/src/main/resources/templates/projects/project.html b/src/main/resources/templates/projects/project.html
index cd49319..2a0b7cf 100644
--- a/src/main/resources/templates/projects/project.html
+++ b/src/main/resources/templates/projects/project.html
@@ -71,20 +71,17 @@
 
                                 <div class="form-group">
                                     <label>Дедлайны показателей:</label>
-                                    <div class="row" th:each="deadline, rowStat : *{deadlines}">
+                                    <div class="row" th:each="deadline, rowStat : *{deadlines}"
+                                         style="margin-bottom: 15px;">
                                         <input type="hidden" th:field="*{deadlines[__${rowStat.index}__].id}"/>
-                                        <div class="col-3 div-deadline-date">
+                                        <div class="col-6 div-deadline-date">
                                             <input type="date" class="form-control form-deadline-date" name="deadline"
                                                    th:field="*{deadlines[__${rowStat.index}__].date}"/>
                                         </div>
-                                        <div class="col-3 div-deadline-description">
+                                        <div class="col-4 div-deadline-description">
                                             <input class="form-control" type="text" placeholder="Описание"
                                                    th:field="*{deadlines[__${rowStat.index}__].description}"/>
                                         </div>
-                                        <div class="col-4 div-deadline-executor">
-                                            <input class="form-control" type="text" placeholder="Исполнитель"
-                                                   th:field="*{deadlines[__${rowStat.index}__].executor}"/>
-                                        </div>
                                         <div class="col-2">
                                             <a class="btn btn-danger float-right"
                                                th:onclick="|$('#deadlines${rowStat.index}\\.description').val('');
@@ -97,6 +94,14 @@
                                     <p th:if="${#fields.hasErrors('deadlines')}" th:errors="*{deadlines}"
                                        class="alert alert-danger">Incorrect title</p>
                                 </div>
+                                <div class="form-group">
+                                    <div class="row" th:each="deadline, rowStat : *{deadlines}">
+                                        <div class="col-10 div-deadline-executor">
+                                            <input class="form-control" type="text" placeholder="Исполнитель"
+                                                   th:field="*{deadlines[__${rowStat.index}__].executor}"/>
+                                        </div>
+                                    </div>
+                                </div>
                                 <div class="form-group">
                                     <input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"
                                            value="Добавить дедлайн"/>

From 4025aa67ca1720d75cdda18dcf4221868470f162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 6 May 2019 21:51:58 +0300
Subject: [PATCH 04/74] #98 project completion added

---
 .../java/ru/ulstu/project/model/Project.java  | 16 ++++++++
 .../ru/ulstu/project/model/ProjectDto.java    | 41 ++++++++++++++++++-
 .../db/changelog-20190506_000001-schema.xml   | 17 ++++++++
 src/main/resources/db/changelog-master.xml    |  1 +
 src/main/resources/public/css/project.css     |  5 +++
 .../resources/templates/projects/project.html | 15 +++----
 6 files changed, 87 insertions(+), 8 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20190506_000001-schema.xml
 create mode 100644 src/main/resources/public/css/project.css

diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java
index c971c4b..acf0d0f 100644
--- a/src/main/java/ru/ulstu/project/model/Project.java
+++ b/src/main/java/ru/ulstu/project/model/Project.java
@@ -5,17 +5,22 @@ import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
 import ru.ulstu.grant.model.Grant;
+import ru.ulstu.user.model.User;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
+import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 @Entity
 public class Project extends BaseEntity {
@@ -62,6 +67,9 @@ public class Project extends BaseEntity {
     @JoinColumn(name = "file_id")
     private FileData application;
 
+    @ManyToMany(fetch = FetchType.EAGER)
+    private Set<User> executors = new HashSet<>();
+
     public String getTitle() {
         return title;
     }
@@ -117,4 +125,12 @@ public class Project extends BaseEntity {
     public void setApplication(FileData application) {
         this.application = application;
     }
+
+    public Set<User> getExecutors() {
+        return executors;
+    }
+
+    public void setExecutors(Set<User> executors) {
+        this.executors = executors;
+    }
 }
diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index 319609c..0f86e1a 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -3,11 +3,17 @@ package ru.ulstu.project.model;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.hibernate.validator.constraints.NotEmpty;
+import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.grant.model.GrantDto;
+import ru.ulstu.user.model.UserDto;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static ru.ulstu.core.util.StreamApiUtils.convert;
 
 public class ProjectDto {
     private Integer id;
@@ -21,6 +27,10 @@ public class ProjectDto {
     private String repository;
     private String applicationFileName;
     private List<Integer> removedDeadlineIds = new ArrayList<>();
+    private Set<Integer> executorIds;
+    private Set<UserDto> executors;
+
+    private final static int MAX_EXECUTORS_LENGTH = 40;
 
     public ProjectDto() {
     }
@@ -36,7 +46,9 @@ public class ProjectDto {
                       @JsonProperty("description") String description,
                       @JsonProperty("grant") GrantDto grant,
                       @JsonProperty("repository") String repository,
-                      @JsonProperty("deadlines") List<Deadline> deadlines) {
+                      @JsonProperty("deadlines") List<Deadline> deadlines,
+                      @JsonProperty("executorIds") Set<Integer> executorIds,
+                      @JsonProperty("executors") Set<UserDto> executors) {
         this.id = id;
         this.title = title;
         this.status = status;
@@ -45,6 +57,8 @@ public class ProjectDto {
         this.repository = repository;
         this.deadlines = deadlines;
         this.applicationFileName = null;
+        this.executorIds = executorIds;
+        this.executors = executors;
     }
 
 
@@ -57,6 +71,8 @@ public class ProjectDto {
         this.grant = project.getGrant() == null ? null : new GrantDto(project.getGrant());
         this.repository = project.getRepository();
         this.deadlines = project.getDeadlines();
+        this.executorIds = convert(project.getExecutors(), user -> user.getId());
+        this.executors = convert(project.getExecutors(), UserDto::new);
     }
 
     public Integer getId() {
@@ -130,4 +146,27 @@ public class ProjectDto {
     public void setRemovedDeadlineIds(List<Integer> removedDeadlineIds) {
         this.removedDeadlineIds = removedDeadlineIds;
     }
+
+    public Set<Integer> getExecutorIds() {
+        return executorIds;
+    }
+
+    public void setExecutorIds(Set<Integer> executorIds) {
+        this.executorIds = executorIds;
+    }
+
+    public Set<UserDto> getExecutors() {
+        return executors;
+    }
+
+    public void setExecutors(Set<UserDto> executors) {
+        this.executors = executors;
+    }
+
+    public String getExecutorsString() {
+        return StringUtils.abbreviate(executors
+                .stream()
+                .map(executor -> executor.getLastName())
+                .collect(Collectors.joining(", ")), MAX_EXECUTORS_LENGTH);
+    }
 }
diff --git a/src/main/resources/db/changelog-20190506_000001-schema.xml b/src/main/resources/db/changelog-20190506_000001-schema.xml
new file mode 100644
index 0000000..e28d009
--- /dev/null
+++ b/src/main/resources/db/changelog-20190506_000001-schema.xml
@@ -0,0 +1,17 @@
+<?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="anton" id="20190506_000000-2">
+        <createTable tableName="project_executors">
+            <column name="project_id" type="integer"/>
+            <column name="executors_id" type="integer"/>
+        </createTable>
+        <addForeignKeyConstraint baseTableName="project_executors" baseColumnNames="project_id"
+                                 constraintName="fk_project_project_executors" referencedTableName="project"
+                                 referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="project_executors" baseColumnNames="executors_id"
+                                 constraintName="fk_user_project_executors" referencedTableName="users"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 3b455a8..051c953 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -39,4 +39,5 @@
     <include file="db/changelog-20190430_000000-schema.xml"/>
     <include file="db/changelog-20190505_000000-schema.xml"/>
     <include file="db/changelog-20190506_000000-schema.xml"/>
+    <include file="db/changelog-20190506_000001-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/public/css/project.css b/src/main/resources/public/css/project.css
new file mode 100644
index 0000000..24e12ea
--- /dev/null
+++ b/src/main/resources/public/css/project.css
@@ -0,0 +1,5 @@
+.div-deadline-done {
+    width: 60%;
+    height: 100%;
+    float: right;
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/project.html b/src/main/resources/templates/projects/project.html
index 2a0b7cf..8385694 100644
--- a/src/main/resources/templates/projects/project.html
+++ b/src/main/resources/templates/projects/project.html
@@ -3,7 +3,7 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
 <head>
-
+    <link rel="stylesheet" href="../css/project.css"/>
 </head>
 <body>
 
@@ -90,17 +90,18 @@
                                                     aria-hidden="true"><i class="fa fa-times"/></span>
                                             </a>
                                         </div>
-                                    </div>
-                                    <p th:if="${#fields.hasErrors('deadlines')}" th:errors="*{deadlines}"
-                                       class="alert alert-danger">Incorrect title</p>
-                                </div>
-                                <div class="form-group">
-                                    <div class="row" th:each="deadline, rowStat : *{deadlines}">
+                                        <div class="col-12" style="margin-bottom: 15px;"></div>
                                         <div class="col-10 div-deadline-executor">
                                             <input class="form-control" type="text" placeholder="Исполнитель"
                                                    th:field="*{deadlines[__${rowStat.index}__].executor}"/>
                                         </div>
+                                        <div class="col-2">
+                                            <input class="form-control div-deadline-done" type="checkbox"
+                                                   th:field="*{deadlines[__${rowStat.index}__].done}"/>
+                                        </div>
                                     </div>
+                                    <p th:if="${#fields.hasErrors('deadlines')}" th:errors="*{deadlines}"
+                                       class="alert alert-danger">Incorrect title</p>
                                 </div>
                                 <div class="form-group">
                                     <input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"

From 241c489b21a5fb5f1624aaccfbdd78eaa883b982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 6 May 2019 22:10:40 +0300
Subject: [PATCH 05/74] #98 deadline edited

---
 src/main/java/ru/ulstu/deadline/model/Deadline.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 5a05ea1..9ab9acd 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -66,7 +66,9 @@ public class Deadline extends BaseEntity {
         return executor;
     }
 
-    public void setExecutor(String executor) { this.executor = executor; }
+    public void setExecutor(String executor) {
+        this.executor = executor;
+    }
 
     public Boolean getDone() {
         return done;

From b1e101c94036eb56b7d6c9d67667179433ae0c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Tue, 7 May 2019 13:34:00 +0300
Subject: [PATCH 06/74] #101 db event edited

---
 .../db/changelog-20190507_000000-schema.xml        | 14 ++++++++++++++
 src/main/resources/db/changelog-master.xml         |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 src/main/resources/db/changelog-20190507_000000-schema.xml

diff --git a/src/main/resources/db/changelog-20190507_000000-schema.xml b/src/main/resources/db/changelog-20190507_000000-schema.xml
new file mode 100644
index 0000000..6962e7d
--- /dev/null
+++ b/src/main/resources/db/changelog-20190507_000000-schema.xml
@@ -0,0 +1,14 @@
+<?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="anton" id="20190507_000000-1">
+        <addColumn tableName="event">
+            <column name="project_id" type="integer"/>
+        </addColumn>
+        <addForeignKeyConstraint baseTableName="event" baseColumnNames="project_id"
+                                 constraintName="fk_event_project_id" referencedTableName="project"
+                                 referencedColumnNames="id"/>
+
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 83ff280..65a07c2 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -38,4 +38,5 @@
     <include file="db/changelog-20190428_000000-schema.xml"/>
     <include file="db/changelog-20190430_000000-schema.xml"/>
     <include file="db/changelog-20190505_000000-schema.xml"/>
+    <include file="db/changelog-20190507_000000-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file

From 279cc0e18a876ee6bf70fc06087680162cbd45ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Tue, 7 May 2019 14:00:24 +0300
Subject: [PATCH 07/74] #101 project model edited

---
 src/main/java/ru/ulstu/project/model/Project.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java
index c971c4b..a596b76 100644
--- a/src/main/java/ru/ulstu/project/model/Project.java
+++ b/src/main/java/ru/ulstu/project/model/Project.java
@@ -5,11 +5,13 @@ import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
 import ru.ulstu.grant.model.Grant;
+import ru.ulstu.timeline.model.Event;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
@@ -62,6 +64,10 @@ public class Project extends BaseEntity {
     @JoinColumn(name = "file_id")
     private FileData application;
 
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @JoinColumn(name = "project_id")
+    private List<Event> events = new ArrayList<>();
+
     public String getTitle() {
         return title;
     }
@@ -117,4 +123,12 @@ public class Project extends BaseEntity {
     public void setApplication(FileData application) {
         this.application = application;
     }
+
+    public List<Event> getEvents() {
+        return events;
+    }
+
+    public void setEvents(List<Event> events) {
+        this.events = events;
+    }
 }

From f960d4de1b78cd9a8cd01ea43bdd6304fcc7d844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Fri, 17 May 2019 11:30:26 +0300
Subject: [PATCH 08/74] #98 deadline model edited

---
 src/main/java/ru/ulstu/deadline/model/Deadline.java    | 5 +++++
 src/main/java/ru/ulstu/grant/service/GrantService.java | 2 +-
 src/main/java/ru/ulstu/paper/service/PaperService.java | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 9ab9acd..5ab9f47 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -26,6 +26,11 @@ public class Deadline extends BaseEntity {
     public Deadline() {
     }
 
+    public Deadline(Date deadlineDate, String description) {
+        this.date = deadlineDate;
+        this.description = description;
+    }
+
     public Deadline(Date deadlineDate, String description, String executor, Boolean done) {
         this.date = deadlineDate;
         this.description = description;
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index c06a71c..45f9b2f 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -164,7 +164,7 @@ public class GrantService {
         grant.setComment("Комментарий к гранту 1");
         grant.setProject(projectId);
         grant.setStatus(APPLICATION);
-        grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн", "", false));
+        grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
         grant.getAuthors().add(user);
         grant.setLeader(user);
         grant.getPapers().add(paper);
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index 0a60c92..db810f5 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -173,7 +173,7 @@ public class PaperService {
         Paper paper = new Paper();
         paper.setTitle(title);
         paper.getAuthors().add(user);
-        paper.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн", "", false));
+        paper.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
         paper.setCreateDate(new Date());
         paper.setUpdateDate(new Date());
         paper.setStatus(DRAFT);

From 90799356abb70d879df883f4000c9b876b29e44a Mon Sep 17 00:00:00 2001
From: "Artem.Arefev" <a.arefyev@mediasoft.team>
Date: Sun, 19 May 2019 00:42:24 +0400
Subject: [PATCH 09/74] 89 password reset

---
 .../ru/ulstu/configuration/Constants.java     |   1 +
 .../configuration/SecurityConfiguration.java  |   3 +-
 .../core/controller/AdviceController.java     |  10 +-
 .../ru/ulstu/core/model/ErrorConstants.java   |   4 +-
 .../ulstu/user/controller/UserController.java |  11 +--
 .../user/model/UserResetPasswordDto.java      |   8 ++
 .../ru/ulstu/user/service/MailService.java    |   4 +-
 .../ru/ulstu/user/service/UserService.java    |  19 ++--
 .../mail_templates/passwordResetEmail.html    |  12 +--
 src/main/resources/public/css/base.css        |   3 +
 .../resources/public/img/main/ajax-loader.gif | Bin 0 -> 673 bytes
 src/main/resources/public/js/users.js         |  78 +++++++++++++++-
 .../resources/templates/resetRequest.html     |  86 +++++++++---------
 13 files changed, 162 insertions(+), 77 deletions(-)
 create mode 100644 src/main/resources/public/css/base.css
 create mode 100644 src/main/resources/public/img/main/ajax-loader.gif

diff --git a/src/main/java/ru/ulstu/configuration/Constants.java b/src/main/java/ru/ulstu/configuration/Constants.java
index f910108..77a9a4d 100644
--- a/src/main/java/ru/ulstu/configuration/Constants.java
+++ b/src/main/java/ru/ulstu/configuration/Constants.java
@@ -21,4 +21,5 @@ public class Constants {
     public static final String PASSWORD_RESET_REQUEST_PAGE = "/resetRequest";
     public static final String PASSWORD_RESET_PAGE = "/reset";
 
+    public static final int RESET_KEY_LENGTH = 6;
 }
\ No newline at end of file
diff --git a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java
index 591fa0c..894cf39 100644
--- a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java
+++ b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java
@@ -104,7 +104,8 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
                 .antMatchers("/css/**")
                 .antMatchers("/js/**")
                 .antMatchers("/templates/**")
-                .antMatchers("/webjars/**");
+                .antMatchers("/webjars/**")
+                .antMatchers("/img/**");
     }
 
     @Autowired
diff --git a/src/main/java/ru/ulstu/core/controller/AdviceController.java b/src/main/java/ru/ulstu/core/controller/AdviceController.java
index 27c9d5b..37078b9 100644
--- a/src/main/java/ru/ulstu/core/controller/AdviceController.java
+++ b/src/main/java/ru/ulstu/core/controller/AdviceController.java
@@ -34,11 +34,11 @@ public class AdviceController {
     public AdviceController(UserService userService) {
         this.userService = userService;
     }
-
-    @ModelAttribute("currentUser")
-    public String getCurrentUser() {
-        return userService.getCurrentUser().getUserAbbreviate();
-    }
+//
+//    @ModelAttribute("currentUser")
+//    public String getCurrentUser() {
+//        return userService.getCurrentUser().getUserAbbreviate();
+//    }
 
     @ModelAttribute("flashMessage")
     public String getFlashMessage() {
diff --git a/src/main/java/ru/ulstu/core/model/ErrorConstants.java b/src/main/java/ru/ulstu/core/model/ErrorConstants.java
index 55832f3..017725a 100644
--- a/src/main/java/ru/ulstu/core/model/ErrorConstants.java
+++ b/src/main/java/ru/ulstu/core/model/ErrorConstants.java
@@ -9,9 +9,9 @@ public enum ErrorConstants {
     USER_EMAIL_EXISTS(102, "Пользователь с таким почтовым ящиком уже существует"),
     USER_LOGIN_EXISTS(103, "Пользователь с таким логином уже существует"),
     USER_PASSWORDS_NOT_VALID_OR_NOT_MATCH(104, "Пароли введены неверно"),
-    USER_NOT_FOUND(105, "User is not found"),
+    USER_NOT_FOUND(105, "Аккаунт не найден"),
     USER_NOT_ACTIVATED(106, "User is not activated"),
-    USER_RESET_ERROR(107, "Invalid reset key"),
+    USER_RESET_ERROR(107, "Некорректный ключ подтверждения"),
     USER_UNDEAD_ERROR(108, "Can't edit/delete that user"),
     FILE_UPLOAD_ERROR(110, "File upload error"),
     USER_SENDING_MAIL_EXCEPTION(111, "Во время отправки приглашения пользователю произошла ошибка");
diff --git a/src/main/java/ru/ulstu/user/controller/UserController.java b/src/main/java/ru/ulstu/user/controller/UserController.java
index 59e023b..c40ed8f 100644
--- a/src/main/java/ru/ulstu/user/controller/UserController.java
+++ b/src/main/java/ru/ulstu/user/controller/UserController.java
@@ -148,16 +148,15 @@ public class UserController extends OdinController<UserListDto, UserDto> {
     }
 
     @PostMapping(PASSWORD_RESET_REQUEST_URL)
-    public Response<Boolean> requestPasswordReset(@RequestParam("email") String email) {
+    public void requestPasswordReset(@RequestParam("email") String email) {
         log.debug("REST: UserController.requestPasswordReset( {} )", email);
-        return new Response<>(userService.requestUserPasswordReset(email));
+        userService.requestUserPasswordReset(email);
     }
 
     @PostMapping(PASSWORD_RESET_URL)
-    public Response<Boolean> finishPasswordReset(@RequestParam("key") String key,
-                                                 @RequestBody UserResetPasswordDto userResetPasswordDto) {
-        log.debug("REST: UserController.requestPasswordReset( {} )", key);
-        return new Response<>(userService.completeUserPasswordReset(key, userResetPasswordDto));
+    public Response<Boolean> finishPasswordReset(@RequestBody UserResetPasswordDto userResetPasswordDto) {
+        log.debug("REST: UserController.requestPasswordReset( {} )", userResetPasswordDto.getResetKey());
+        return new Response<>(userService.completeUserPasswordReset(userResetPasswordDto));
     }
 
     @PostMapping("/changePassword")
diff --git a/src/main/java/ru/ulstu/user/model/UserResetPasswordDto.java b/src/main/java/ru/ulstu/user/model/UserResetPasswordDto.java
index 33d84bc..58e7462 100644
--- a/src/main/java/ru/ulstu/user/model/UserResetPasswordDto.java
+++ b/src/main/java/ru/ulstu/user/model/UserResetPasswordDto.java
@@ -14,6 +14,10 @@ public class UserResetPasswordDto {
     @Size(min = Constants.MIN_PASSWORD_LENGTH, max = 50)
     private String passwordConfirm;
 
+    @NotEmpty
+    @Size(min = Constants.RESET_KEY_LENGTH)
+    private String resetKey;
+
     public String getPassword() {
         return password;
     }
@@ -25,4 +29,8 @@ public class UserResetPasswordDto {
     public boolean isPasswordsValid() {
         return Objects.equals(password, passwordConfirm);
     }
+
+    public String getResetKey() {
+        return resetKey;
+    }
 }
diff --git a/src/main/java/ru/ulstu/user/service/MailService.java b/src/main/java/ru/ulstu/user/service/MailService.java
index ec91739..864b749 100644
--- a/src/main/java/ru/ulstu/user/service/MailService.java
+++ b/src/main/java/ru/ulstu/user/service/MailService.java
@@ -106,8 +106,7 @@ public class MailService {
         sendEmailFromTemplate(user, "activationEmail", Constants.MAIL_ACTIVATE);
     }
 
-    @Async
-    public void sendPasswordResetMail(User user) {
+    public void sendPasswordResetMail(User user) throws MessagingException, MailException {
         sendEmailFromTemplate(user, "passwordResetEmail", Constants.MAIL_RESET);
     }
 
@@ -118,6 +117,5 @@ public class MailService {
     @Async
     public void sendChangePasswordMail(User user) {
         sendEmailFromTemplate(user, "passwordChangeEmail", Constants.MAIL_CHANGE_PASSWORD);
-
     }
 }
diff --git a/src/main/java/ru/ulstu/user/service/UserService.java b/src/main/java/ru/ulstu/user/service/UserService.java
index c889caa..8089a8e 100644
--- a/src/main/java/ru/ulstu/user/service/UserService.java
+++ b/src/main/java/ru/ulstu/user/service/UserService.java
@@ -236,7 +236,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);
@@ -247,23 +247,30 @@ public class UserService implements UserDetailsService {
         user.setResetKey(UserUtils.generateResetKey());
         user.setResetDate(new Date());
         user = userRepository.save(user);
-        mailService.sendPasswordResetMail(user);
+        try {
+            mailService.sendPasswordResetMail(user);
+        } catch (MessagingException | MailException e) {
+            throw new UserSendingMailException(email);
+        }
         log.debug("Created Reset Password Request for User: {}", user.getLogin());
         return true;
     }
 
-    public boolean completeUserPasswordReset(String key, UserResetPasswordDto userResetPasswordDto) {
+    public boolean completeUserPasswordReset(UserResetPasswordDto userResetPasswordDto) {
         if (!userResetPasswordDto.isPasswordsValid()) {
-            throw new UserPasswordsNotValidOrNotMatchException("");
+            throw new UserPasswordsNotValidOrNotMatchException("Пароли не совпадают");
         }
-        User user = userRepository.findOneByResetKey(key);
+        User user = userRepository.findOneByResetKey(userResetPasswordDto.getResetKey());
         if (user == null) {
-            throw new UserResetKeyError(key);
+            throw new UserResetKeyError(userResetPasswordDto.getResetKey());
         }
         user.setPassword(passwordEncoder.encode(userResetPasswordDto.getPassword()));
         user.setResetKey(null);
         user.setResetDate(null);
         user = userRepository.save(user);
+
+        mailService.sendChangePasswordMail(user);
+
         log.debug("Reset Password for User: {}", user.getLogin());
         return true;
     }
diff --git a/src/main/resources/mail_templates/passwordResetEmail.html b/src/main/resources/mail_templates/passwordResetEmail.html
index a1034d4..99e4f77 100644
--- a/src/main/resources/mail_templates/passwordResetEmail.html
+++ b/src/main/resources/mail_templates/passwordResetEmail.html
@@ -1,23 +1,19 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
-    <title>Password reset</title>
+    <title>Восстановление пароля</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="shortcut icon" th:href="@{|${baseUrl}/favicon.ico|}"/>
 </head>
 <body>
 <p>
-    Dear <span th:text="${user.firstName + ' ' + user.lastName}">Ivan Ivanov</span>
+    Дорогой <span th:text="${user.firstName + ' ' + user.lastName}">Ivan Ivanov</span>
 </p>
 <p>
-    For your account a password reset was requested, please click on the URL below to
+    Ваш ключ для восстановления пароля <span th:text="${user.resetKey}"></span>
 </p>
 <p>
-    <a th:href="@{|${baseUrl}/reset?key=${user.resetKey}|}"
-       th:text="@{|${baseUrl}/reset?key=${user.resetKey}|}">Reset Link</a>
-</p>
-<p>
-    Regards,
+    С уважением,
     <br/>
     <em>Balance Team.</em>
 </p>
diff --git a/src/main/resources/public/css/base.css b/src/main/resources/public/css/base.css
new file mode 100644
index 0000000..0c69e7c
--- /dev/null
+++ b/src/main/resources/public/css/base.css
@@ -0,0 +1,3 @@
+.loader {
+    padding-left:50%
+}
\ No newline at end of file
diff --git a/src/main/resources/public/img/main/ajax-loader.gif b/src/main/resources/public/img/main/ajax-loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f2a1bc0c6f545e20e631a96e8e92f9822e75d046
GIT binary patch
literal 673
zcmZ?wbhEHb6krfw_{6~Q|Nnmm28Kh24mmkF0U1e2Nli^nlO|14{3qpHl$uzQnxasi
zS(2fUn3Y(Olb@KPmzkHA&!G5|g@FsGT=74*pKD04vtxj(k)8oFBTz^Oh=E26FfcG1
zbL_hF&)}42ws10s6^G;;cE1^EoUR)U5A70}d2pLv!jVIT7j&Z~EblI3x0K*v_sV|m
z0W=b9G$XP(CLnYCdK49;TX=SFc-G}o=oA=|U?{1O;Nu!CwW3C5Yw7*Bi4yD$3fCnb
zwK+>}QdQ9sf*QnxY>*kpE+b{_Q;sJloS71)&(@kO!}mqf@1v(v;*8Y=G9S3kY~Cw#
zY=t&c<XiDSjLnDnjaH^e&EL-gHHsP8D4^exRJBhTwM~38CoI0Tdl_e|A`gq9OM9Y>
z;3~JK4HxB^lY(MD+sYeQ=t%XSSW;x^1M?dTvN=W^yNcAcy`HCte31C;)5xP%b~qs>
zDP&4(%TBqBNGHwnryK;B<zCvzA65gK6Eq2C3@frRK<6kNnqVpZxa9esTk{MgkIOtz
z)N|T4_f+_rMTR_V+#<z^yEmAApUT*1uz|C4_xxN<FPJ%O$mRf@bLZa&PQjaVLStt!
zzPnXeFg2m$ZsMG~CevCS-HsZFOh}l$jggn-kb}T%!-hlG&P{|F!;WDLFy>dMI$fEg
xd0mc!<FG>C@j^ZpLxYv4HmnPfI0THYuv<%+6iSmMn&w3dPGDfL1|=LY008wP(boU~

literal 0
HcmV?d00001

diff --git a/src/main/resources/public/js/users.js b/src/main/resources/public/js/users.js
index 76bd41d..a49bdc6 100644
--- a/src/main/resources/public/js/users.js
+++ b/src/main/resources/public/js/users.js
@@ -35,10 +35,7 @@ function changePassword() {
 
 function inviteUser() {
     email = document.getElementById("email").value;
-    re = /\S+@\S+\.\S+/;
-
-
-    if (!re.test(email)) {
+    if (!isEmailValid(email)) {
         showFeedbackMessage("Некорректный почтовый ящик", MessageTypesEnum.WARNING);
         return;
     }
@@ -55,4 +52,77 @@ function inviteUser() {
             showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING)
         }
     })
+}
+
+function requestResetPassword() {
+    email = document.getElementById("emailReset").value
+
+    if (!isEmailValid(email)) {
+        showFeedbackMessage("Некорректный почтовый ящик", MessageTypesEnum.WARNING);
+        return;
+    }
+    document.getElementById("dvloader").hidden = false;
+
+    $.ajax({
+        url:"/api/1.0/users/password-reset-request?email=" + email,
+        contentType: "application/json; charset=utf-8",
+        method: "POST",
+        success: function() {
+            showFeedbackMessage("Проверочный код был отправлен на указанный почтовый ящик", MessageTypesEnum.SUCCESS)
+            document.getElementById("passwordNew").hidden = false
+            document.getElementById("passwordConfirm").hidden = false
+            document.getElementById("btnReset").hidden = false
+            document.getElementById("resetKey").hidden = false
+            document.getElementById("emailReset").hidden = true
+            document.getElementById("btnSend").hidden = true
+            document.getElementById("dvloader").hidden = true;
+
+        },
+        error: function(errorData) {
+            showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING)
+            document.getElementById("dvloader").hidden = true;
+
+        }
+    })
+
+}
+
+function resetPassword() {
+    passwordNew = document.getElementById("passwordNew").value;
+    passwordConfirm = document.getElementById("passwordConfirm").value;
+    resetKey = document.getElementById("resetKey").value;
+
+    if ([passwordNew, passwordConfirm, resetKey].includes("")) {
+        showFeedbackMessage("Заполните все поля", MessageTypesEnum.WARNING);
+        return;
+    }
+
+    if (passwordNew != passwordConfirm) {
+        showFeedbackMessage("Пароли не совпадают", MessageTypesEnum.WARNING);
+        return;
+    }
+
+    $.ajax({
+        url:"/api/1.0/users/password-reset",
+        contentType: "application/json; charset=utf-8",
+        method: "POST",
+        data: JSON.stringify({
+            "password": passwordNew,
+            "passwordConfirm": passwordConfirm,
+            "resetKey": resetKey,
+        }),
+        success: function() {
+            showFeedbackMessage("Пользователь был успешно приглашен", MessageTypesEnum.SUCCESS)
+            window.location.href = "/login"
+        },
+        error: function(errorData) {
+            showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING)
+        }
+    })
+}
+
+
+function isEmailValid(email) {
+    re = /\S+@\S+\.\S+/;
+    return re.test(email)
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/resetRequest.html b/src/main/resources/templates/resetRequest.html
index 2adab37..73bff76 100644
--- a/src/main/resources/templates/resetRequest.html
+++ b/src/main/resources/templates/resetRequest.html
@@ -1,9 +1,10 @@
 <!DOCTYPE html>
 <html lang="en"
-      xmlns:th="http://www.thymeleaf.org"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorator="default">
+      layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml">
 <head>
+    <script src="/js/users.js"></script>
+    <link rel="stylesheet" href="../css/base.css"/>
 </head>
 <body>
 <nav layout:fragment="navbar">
@@ -12,46 +13,47 @@
                 class="fa fa-plane fa-4" aria-hidden="true"></i> Balance</span></a>
     </div>
 </nav>
-<div class="container" layout:fragment="content">
-    <form id="reset-form" method="post" class="margined-top-10">
-        <fieldset>
-            <div class="form-group">
-                <input type="email" name="email" id="email" class="form-control"
-                       placeholder="E-Mail" required="true" autofocus="autofocus"/>
-            </div>
-            <button type="submit" class="btn btn-success btn-block">Сбросить пароль</button>
-            <div class="form-group">
-                <small class="form-text text-muted">
-                    <a href="/login">Вернуться к странице входа</a>
-                </small>
-            </div>
-        </fieldset>
-    </form>
-</div>
-<th:block layout:fragment="data-scripts">
-    <script type="text/javascript">
-        /*<![CDATA[*/
-        $(document).ready(function () {
-            $("#reset-form").submit(function () {
-                var email = $("#email").val();
-                if (isEmpty(email)) {
-                    showFeedbackMessage("Адрес электронной почты не задан", MessageTypesEnum.DANGER);
-                    return false;
-                }
-                postToRest(urlUsersPasswordResetRequest + "?email=" + email, null,
-                    function () {
-                        showFeedbackMessage("Запрос на смену пароля отправлен");
-                    },
-                    function () {
-                        $("#email").val("");
-                    }
-                );
-                return false;
-            });
-        });
-        /*]]>*/
+<div layout:fragment="content">
+    <section class="bg-light" id="portfolio">
 
-    </script>
-</th:block>
+        <div class="container">
+            <div class="row justify-content-md-center">
+                <div class="col-lg-6">
+                    <div class="form-group">
+                        <input type="text" name="email" id="emailReset" class="form-control"
+                               placeholder="E-Mail"/>
+                    </div>
+                    <div class="form-group">
+                        <input type="password" name="email" id="passwordNew" class="form-control"
+                               placeholder="Новый пароль" hidden="true"/>
+                    </div>
+                    <div class="form-group">
+                        <input type="password" name="email" id="passwordConfirm" class="form-control"
+                               placeholder="Подтвердите пароль" hidden="true"/>
+                    </div>
+                    <div class="form-group">
+                        <input type="text" name="email" id="resetKey" class="form-control"
+                               placeholder="Код подтверждения" hidden="true"/>
+                    </div>
+                    <div id="dvloader" class="loader" hidden="true"><img src="../img/main/ajax-loader.gif" /></div>
+                    <button id="btnSend" type="button" onclick="requestResetPassword()"
+                            class="btn btn-success btn-block">
+                        Отправить код подтверждения
+                    </button>
+                    <button id="btnReset" hidden="true" type="button" onclick="resetPassword()"
+                            class="btn btn-success btn-block">
+                        Сбросить
+                        пароль
+                    </button>
+                    <div class="form-group">
+                        <small class="form-text text-muted">
+                            <a href="/login">Вернуться к странице входа</a>
+                        </small>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+</div>
 </body>
 </html>
\ No newline at end of file

From e468646cd6c5b2b214b15ba25855de5c824dfb90 Mon Sep 17 00:00:00 2001
From: "Artem.Arefev" <a.arefyev@mediasoft.team>
Date: Sun, 19 May 2019 00:47:49 +0400
Subject: [PATCH 10/74] 89 removed getCurrentUser

---
 src/main/java/ru/ulstu/core/controller/AdviceController.java | 5 -----
 src/main/resources/public/js/users.js                        | 1 -
 2 files changed, 6 deletions(-)

diff --git a/src/main/java/ru/ulstu/core/controller/AdviceController.java b/src/main/java/ru/ulstu/core/controller/AdviceController.java
index 37078b9..f89001a 100644
--- a/src/main/java/ru/ulstu/core/controller/AdviceController.java
+++ b/src/main/java/ru/ulstu/core/controller/AdviceController.java
@@ -34,11 +34,6 @@ public class AdviceController {
     public AdviceController(UserService userService) {
         this.userService = userService;
     }
-//
-//    @ModelAttribute("currentUser")
-//    public String getCurrentUser() {
-//        return userService.getCurrentUser().getUserAbbreviate();
-//    }
 
     @ModelAttribute("flashMessage")
     public String getFlashMessage() {
diff --git a/src/main/resources/public/js/users.js b/src/main/resources/public/js/users.js
index a49bdc6..1ea26e3 100644
--- a/src/main/resources/public/js/users.js
+++ b/src/main/resources/public/js/users.js
@@ -81,7 +81,6 @@ function requestResetPassword() {
         error: function(errorData) {
             showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING)
             document.getElementById("dvloader").hidden = true;
-
         }
     })
 

From 1823c1ba50c959dde3197fbfa64a516e9ffa1b3c Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Mon, 20 May 2019 18:37:24 +0400
Subject: [PATCH 11/74] #120 create kias page

---
 src/test/java/grant/KiasPage.java | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/test/java/grant/KiasPage.java

diff --git a/src/test/java/grant/KiasPage.java b/src/test/java/grant/KiasPage.java
new file mode 100644
index 0000000..49b40d9
--- /dev/null
+++ b/src/test/java/grant/KiasPage.java
@@ -0,0 +1,28 @@
+package grant;
+
+import core.PageObject;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+
+public class KiasPage extends PageObject {
+    @Override
+    public String getSubTitle() {
+        return driver.findElement(By.tagName("h1")).getText();
+    }
+
+    public List<WebElement> getGrants() {
+        WebElement listContest = driver.findElement(By.tagName("tBody"));
+        return listContest.findElements(By.cssSelector("tr.tr"));
+
+    }
+
+    public String getGrantTitle(WebElement grant) {
+        return grant.findElement(By.cssSelector("td.tertiary")).findElement(By.tagName("a")).getText();
+    }
+
+    public String getFirstDeadline(WebElement grant) {
+        return grant.findElement(By.xpath("./td[5]")).getText();
+    }
+}

From c0e66e81a2e50d85a0859d1f779572a7e1065f1a Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Mon, 20 May 2019 20:47:10 +0400
Subject: [PATCH 12/74] #120 drop unnecessary table column

---
 .../resources/db/changelog-20190520_000000-schema.xml     | 8 ++++++++
 src/main/resources/db/changelog-master.xml                | 1 +
 2 files changed, 9 insertions(+)
 create mode 100644 src/main/resources/db/changelog-20190520_000000-schema.xml

diff --git a/src/main/resources/db/changelog-20190520_000000-schema.xml b/src/main/resources/db/changelog-20190520_000000-schema.xml
new file mode 100644
index 0000000..69cdad0
--- /dev/null
+++ b/src/main/resources/db/changelog-20190520_000000-schema.xml
@@ -0,0 +1,8 @@
+<?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="tanya" id="20190520_000000-1">
+        <dropColumn columnName="applicationFileName" tableName="grants"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 18bd645..d2ccbca 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -42,4 +42,5 @@
     <include file="db/changelog-20190507_000000-schema.xml"/>
     <include file="db/changelog-20190507_000001-schema.xml"/>
     <include file="db/changelog-20190511_000000-schema.xml"/>
+    <include file="db/changelog-20190520_000000-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file

From bb9f412480fc9948e41680a5a4c009a0c26f60b6 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Mon, 20 May 2019 20:49:03 +0400
Subject: [PATCH 13/74] #120 check unique grant name

---
 .../grant/controller/GrantController.java     | 20 +---------
 .../java/ru/ulstu/grant/model/GrantDto.java   |  3 +-
 .../grant/repository/GrantRepository.java     |  9 ++++-
 .../ru/ulstu/grant/service/GrantService.java  | 37 ++++++++++++++++++-
 4 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/controller/GrantController.java b/src/main/java/ru/ulstu/grant/controller/GrantController.java
index ad5e992..91b0f91 100644
--- a/src/main/java/ru/ulstu/grant/controller/GrantController.java
+++ b/src/main/java/ru/ulstu/grant/controller/GrantController.java
@@ -20,9 +20,7 @@ import springfox.documentation.annotations.ApiIgnore;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
-import java.util.stream.Collectors;
 
-import static org.springframework.util.StringUtils.isEmpty;
 import static ru.ulstu.core.controller.Navigation.GRANTS_PAGE;
 import static ru.ulstu.core.controller.Navigation.GRANT_PAGE;
 import static ru.ulstu.core.controller.Navigation.REDIRECT_TO;
@@ -62,17 +60,9 @@ public class GrantController {
     @PostMapping(value = "/grant", params = "save")
     public String save(@Valid GrantDto grantDto, Errors errors)
             throws IOException {
-        filterEmptyDeadlines(grantDto);
-        if (grantDto.getDeadlines().isEmpty()) {
-            errors.rejectValue("deadlines", "errorCode", "Не может быть пусто");
-        }
-        if (grantDto.getLeaderId().equals(-1)) {
-            errors.rejectValue("leaderId", "errorCode", "Укажите руководителя");
-        }
-        if (errors.hasErrors()) {
+        if (!grantService.save(grantDto, errors)) {
             return GRANT_PAGE;
         }
-        grantService.save(grantDto);
         return String.format(REDIRECT_TO, GRANTS_PAGE);
     }
 
@@ -89,7 +79,7 @@ public class GrantController {
 
     @PostMapping(value = "/grant", params = "addDeadline")
     public String addDeadline(@Valid GrantDto grantDto, Errors errors) {
-        filterEmptyDeadlines(grantDto);
+        grantService.filterEmptyDeadlines(grantDto);
         if (errors.hasErrors()) {
             return GRANT_PAGE;
         }
@@ -133,10 +123,4 @@ public class GrantController {
     public List<PaperDto> getAllPapers() {
         return grantService.getAllUncompletedPapers();
     }
-
-    private void filterEmptyDeadlines(GrantDto grantDto) {
-        grantDto.setDeadlines(grantDto.getDeadlines().stream()
-                .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
-                .collect(Collectors.toList()));
-    }
 }
diff --git a/src/main/java/ru/ulstu/grant/model/GrantDto.java b/src/main/java/ru/ulstu/grant/model/GrantDto.java
index 203d306..5a561b1 100644
--- a/src/main/java/ru/ulstu/grant/model/GrantDto.java
+++ b/src/main/java/ru/ulstu/grant/model/GrantDto.java
@@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.NotEmpty;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileDataDto;
+import ru.ulstu.name.NameContainer;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.user.model.UserDto;
@@ -17,7 +18,7 @@ import java.util.stream.Collectors;
 
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 
-public class GrantDto {
+public class GrantDto extends NameContainer {
     private final static int MAX_AUTHORS_LENGTH = 60;
 
     private Integer id;
diff --git a/src/main/java/ru/ulstu/grant/repository/GrantRepository.java b/src/main/java/ru/ulstu/grant/repository/GrantRepository.java
index 44c2cc0..26face4 100644
--- a/src/main/java/ru/ulstu/grant/repository/GrantRepository.java
+++ b/src/main/java/ru/ulstu/grant/repository/GrantRepository.java
@@ -1,11 +1,18 @@
 package ru.ulstu.grant.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import ru.ulstu.grant.model.Grant;
+import ru.ulstu.name.BaseRepository;
 
 import java.util.List;
 
-public interface GrantRepository extends JpaRepository<Grant, Integer> {
+public interface GrantRepository extends JpaRepository<Grant, Integer>, BaseRepository {
 
     List<Grant> findByStatus(Grant.GrantStatus status);
+
+    @Override
+    @Query("SELECT title FROM Grant g WHERE (g.title = :name) AND (:id IS NULL OR g.id != :id) ")
+    String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
 }
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index 45f9b2f..4972b6c 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -3,6 +3,7 @@ package ru.ulstu.grant.service;
 import org.apache.commons.lang3.StringUtils;
 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;
@@ -10,6 +11,7 @@ import ru.ulstu.file.service.FileService;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.repository.GrantRepository;
+import ru.ulstu.name.BaseService;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.paper.service.PaperService;
@@ -27,6 +29,7 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toList;
 import static org.springframework.util.ObjectUtils.isEmpty;
@@ -34,7 +37,7 @@ import static ru.ulstu.core.util.StreamApiUtils.convert;
 import static ru.ulstu.grant.model.Grant.GrantStatus.APPLICATION;
 
 @Service
-public class GrantService {
+public class GrantService extends BaseService {
     private final static int MAX_DISPLAY_SIZE = 50;
 
     private final GrantRepository grantRepository;
@@ -55,6 +58,7 @@ public class GrantService {
                         EventService eventService,
                         GrantNotificationService grantNotificationService) {
         this.grantRepository = grantRepository;
+        this.baseRepository = grantRepository;
         this.fileService = fileService;
         this.deadlineService = deadlineService;
         this.projectService = projectService;
@@ -176,12 +180,35 @@ public class GrantService {
         return grant;
     }
 
-    public void save(GrantDto grantDto) throws IOException {
+    public boolean save(GrantDto grantDto, Errors errors) throws IOException {
+        grantDto.setName(grantDto.getTitle());
+        filterEmptyDeadlines(grantDto);
+        checkEmptyDeadlines(grantDto, errors);
+        checkEmptyLeader(grantDto, errors);
+        checkUniqueName(grantDto, errors, grantDto.getId(), "title", "Грант с таким именем уже существует");
+        if (errors.hasErrors()) {
+            return false;
+        }
+
         if (isEmpty(grantDto.getId())) {
             create(grantDto);
         } else {
             update(grantDto);
         }
+
+        return true;
+    }
+
+    private void checkEmptyLeader(GrantDto grantDto, Errors errors) {
+        if (grantDto.getLeaderId().equals(-1)) {
+            errors.rejectValue("leaderId", "errorCode", "Укажите руководителя");
+        }
+    }
+
+    private void checkEmptyDeadlines(GrantDto grantDto, Errors errors) {
+        if (grantDto.getDeadlines().isEmpty()) {
+            errors.rejectValue("deadlines", "errorCode", "Не может быть пусто");
+        }
     }
 
     public List<User> getGrantAuthors(GrantDto grantDto) {
@@ -261,4 +288,10 @@ public class GrantService {
                 .filter(author -> Collections.frequency(authors, author) > 3)
                 .collect(toList());
     }
+
+    public void filterEmptyDeadlines(GrantDto grantDto) {
+        grantDto.setDeadlines(grantDto.getDeadlines().stream()
+                .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription()))
+                .collect(Collectors.toList()));
+    }
 }

From d7c4e6b22264bbd76b35fae997fb8fbfeb328d1c Mon Sep 17 00:00:00 2001
From: "Artem.Arefev" <a.arefyev@mediasoft.team>
Date: Tue, 21 May 2019 02:09:07 +0400
Subject: [PATCH 14/74] #91 base users dashboard

---
 .../repository/ConferenceRepository.java      |  4 +
 .../conference/service/ConferenceService.java |  4 +
 .../service/ConferenceUserService.java        |  2 -
 .../user/controller/UserMvcController.java    |  5 +
 .../java/ru/ulstu/user/model/UserInfoNow.java | 50 ++++++++++
 .../repository/UserSessionRepository.java     |  3 +
 .../ru/ulstu/user/service/UserService.java    | 37 ++++++-
 .../user/service/UserSessionService.java      |  6 ++
 .../utils/timetable/TimetableService.java     | 97 +++++++++++++++++++
 .../ru/ulstu/utils/timetable/model/Day.java   | 27 ++++++
 .../ulstu/utils/timetable/model/Lesson.java   | 27 ++++++
 .../ulstu/utils/timetable/model/Response.java | 16 +++
 .../timetable/model/TimetableResponse.java    | 22 +++++
 .../ru/ulstu/utils/timetable/model/Week.java  | 16 +++
 .../resources/templates/users/dashboard.html  | 24 +++++
 .../fragments/userDashboardFragment.html      | 18 ++++
 16 files changed, 355 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/user/model/UserInfoNow.java
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/TimetableService.java
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/model/Day.java
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/model/Lesson.java
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/model/Response.java
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/model/Week.java
 create mode 100644 src/main/resources/templates/users/dashboard.html
 create mode 100644 src/main/resources/templates/users/fragments/userDashboardFragment.html

diff --git a/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java b/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
index 2b0a428..8f9e05f 100644
--- a/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
+++ b/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
@@ -29,4 +29,8 @@ public interface ConferenceRepository extends JpaRepository<Conference, Integer>
     @Override
     @Query("SELECT title FROM Conference c WHERE (c.title = :name) AND (:id IS NULL OR c.id != :id) ")
     String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
+
+    @Query("SELECT c FROM Conference c LEFT JOIN c.users u WHERE (:user IS NULL OR u.user = :user) " +
+            "AND (u.participation = 'INTRAMURAL') AND (c.beginDate <= CURRENT_DATE) AND (c.endDate >= CURRENT_DATE)")
+    Conference findActiveByUser(@Param("user") User user);
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 38ce659..1a5db52 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -306,4 +306,8 @@ public class ConferenceService extends BaseService {
                 .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription()))
                 .collect(Collectors.toList()));
     }
+
+    public Conference getActiveConferenceByUser(User user) {
+        return conferenceRepository.findActiveByUser(user);
+    }
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java b/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java
index f771b2a..16842c1 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java
@@ -43,6 +43,4 @@ public class ConferenceUserService {
         newUser = conferenceUserRepository.save(newUser);
         return newUser;
     }
-
-
 }
diff --git a/src/main/java/ru/ulstu/user/controller/UserMvcController.java b/src/main/java/ru/ulstu/user/controller/UserMvcController.java
index 5bcbd13..d283a21 100644
--- a/src/main/java/ru/ulstu/user/controller/UserMvcController.java
+++ b/src/main/java/ru/ulstu/user/controller/UserMvcController.java
@@ -48,4 +48,9 @@ public class UserMvcController extends OdinController<UserListDto, UserDto> {
         User user = userSessionService.getUserBySessionId(sessionId);
         modelMap.addAttribute("userDto", userService.updateUserInformation(user, userDto));
     }
+
+    @GetMapping("/dashboard")
+    public void getUsersDashboard(ModelMap modelMap) {
+        modelMap.addAttribute("users", userService.getUsersInfo());
+    }
 }
diff --git a/src/main/java/ru/ulstu/user/model/UserInfoNow.java b/src/main/java/ru/ulstu/user/model/UserInfoNow.java
new file mode 100644
index 0000000..7d69c56
--- /dev/null
+++ b/src/main/java/ru/ulstu/user/model/UserInfoNow.java
@@ -0,0 +1,50 @@
+package ru.ulstu.user.model;
+
+import ru.ulstu.conference.model.Conference;
+import ru.ulstu.utils.timetable.model.Lesson;
+
+public class UserInfoNow {
+    private Lesson lesson;
+    private Conference conference;
+    private User user;
+    private boolean isOnline;
+
+    public UserInfoNow(Lesson lesson, Conference conference, User user, boolean isOnline) {
+        this.lesson = lesson;
+        this.conference = conference;
+        this.user = user;
+        this.isOnline = isOnline;
+    }
+
+    public Lesson getLesson() {
+        return lesson;
+    }
+
+    public void setLesson(Lesson lesson) {
+        this.lesson = lesson;
+    }
+
+    public Conference getConference() {
+        return conference;
+    }
+
+    public void setConference(Conference conference) {
+        this.conference = conference;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public boolean isOnline() {
+        return isOnline;
+    }
+
+    public void setOnline(boolean online) {
+        isOnline = online;
+    }
+}
diff --git a/src/main/java/ru/ulstu/user/repository/UserSessionRepository.java b/src/main/java/ru/ulstu/user/repository/UserSessionRepository.java
index b922e4f..5319245 100644
--- a/src/main/java/ru/ulstu/user/repository/UserSessionRepository.java
+++ b/src/main/java/ru/ulstu/user/repository/UserSessionRepository.java
@@ -1,6 +1,7 @@
 package ru.ulstu.user.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import ru.ulstu.user.model.User;
 import ru.ulstu.user.model.UserSession;
 
 import java.util.Date;
@@ -10,4 +11,6 @@ public interface UserSessionRepository extends JpaRepository<UserSession, Intege
     UserSession findOneBySessionId(String sessionId);
 
     List<UserSession> findAllByLogoutTimeIsNullAndLoginTimeBefore(Date date);
+
+    List<UserSession> findAllByUserAndLogoutTimeIsNullAndLoginTimeBefore(User user, Date date);
 }
diff --git a/src/main/java/ru/ulstu/user/service/UserService.java b/src/main/java/ru/ulstu/user/service/UserService.java
index c889caa..334fbf5 100644
--- a/src/main/java/ru/ulstu/user/service/UserService.java
+++ b/src/main/java/ru/ulstu/user/service/UserService.java
@@ -3,6 +3,7 @@ package ru.ulstu.user.service;
 import com.google.common.collect.ImmutableMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
 import org.springframework.mail.MailException;
@@ -13,6 +14,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
+import ru.ulstu.conference.service.ConferenceService;
 import ru.ulstu.configuration.ApplicationProperties;
 import ru.ulstu.core.error.EntityIdIsNullException;
 import ru.ulstu.core.jpa.OffsetablePageRequest;
@@ -30,6 +32,7 @@ import ru.ulstu.user.error.UserResetKeyError;
 import ru.ulstu.user.error.UserSendingMailException;
 import ru.ulstu.user.model.User;
 import ru.ulstu.user.model.UserDto;
+import ru.ulstu.user.model.UserInfoNow;
 import ru.ulstu.user.model.UserListDto;
 import ru.ulstu.user.model.UserResetPasswordDto;
 import ru.ulstu.user.model.UserRole;
@@ -38,8 +41,13 @@ import ru.ulstu.user.model.UserRoleDto;
 import ru.ulstu.user.repository.UserRepository;
 import ru.ulstu.user.repository.UserRoleRepository;
 import ru.ulstu.user.util.UserUtils;
+import ru.ulstu.utils.timetable.TimetableService;
+import ru.ulstu.utils.timetable.model.Lesson;
 
 import javax.mail.MessagingException;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -62,19 +70,27 @@ public class UserService implements UserDetailsService {
     private final UserMapper userMapper;
     private final MailService mailService;
     private final ApplicationProperties applicationProperties;
+    private final TimetableService timetableService;
+    private final ConferenceService conferenceService;
+    private final UserSessionService userSessionService;
 
     public UserService(UserRepository userRepository,
                        PasswordEncoder passwordEncoder,
                        UserRoleRepository userRoleRepository,
                        UserMapper userMapper,
                        MailService mailService,
-                       ApplicationProperties applicationProperties) {
+                       ApplicationProperties applicationProperties,
+                       @Lazy ConferenceService conferenceRepository,
+                       @Lazy UserSessionService userSessionService) throws ParseException {
         this.userRepository = userRepository;
         this.passwordEncoder = passwordEncoder;
         this.userRoleRepository = userRoleRepository;
         this.userMapper = userMapper;
         this.mailService = mailService;
         this.applicationProperties = applicationProperties;
+        this.conferenceService = conferenceRepository;
+        this.timetableService = new TimetableService();
+        this.userSessionService = userSessionService;
     }
 
     private User getUserByEmail(String email) {
@@ -341,4 +357,23 @@ public class UserService implements UserDetailsService {
             throw new UserSendingMailException(email);
         }
     }
+
+    public List<UserInfoNow> getUsersInfo() {
+        List<UserInfoNow> usersInfoNow = new ArrayList<>();
+        for (User user : userRepository.findAll()) {
+            Lesson lesson = null;
+            try {
+                lesson = timetableService.getCurrentLesson(user.getUserAbbreviate());
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            usersInfoNow.add(new UserInfoNow(
+                    lesson,
+                    conferenceService.getActiveConferenceByUser(user),
+                    user,
+                    userSessionService.isOnline(user))
+            );
+        }
+        return usersInfoNow;
+    }
 }
diff --git a/src/main/java/ru/ulstu/user/service/UserSessionService.java b/src/main/java/ru/ulstu/user/service/UserSessionService.java
index ae289d0..17a7f5b 100644
--- a/src/main/java/ru/ulstu/user/service/UserSessionService.java
+++ b/src/main/java/ru/ulstu/user/service/UserSessionService.java
@@ -14,6 +14,8 @@ import ru.ulstu.user.model.UserSession;
 import ru.ulstu.user.model.UserSessionListDto;
 import ru.ulstu.user.repository.UserSessionRepository;
 
+import java.util.Date;
+
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 
 @Service
@@ -58,4 +60,8 @@ public class UserSessionService {
     public User getUserBySessionId(String sessionId) {
         return userSessionRepository.findOneBySessionId(sessionId).getUser();
     }
+
+    public boolean isOnline(User user) {
+        return !userSessionRepository.findAllByUserAndLogoutTimeIsNullAndLoginTimeBefore(user, new Date()).isEmpty();
+    }
 }
diff --git a/src/main/java/ru/ulstu/utils/timetable/TimetableService.java b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
new file mode 100644
index 0000000..f17ea86
--- /dev/null
+++ b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
@@ -0,0 +1,97 @@
+package ru.ulstu.utils.timetable;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import ru.ulstu.utils.timetable.model.Lesson;
+import ru.ulstu.utils.timetable.model.TimetableResponse;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+public class TimetableService {
+    private static final String TIMETABLE_URL = "http://timetable.athene.tech";
+    private SimpleDateFormat lessonTimeFormat = new SimpleDateFormat("hh:mm");
+
+    private long[] lessonsStarts = new long[]{
+            lessonTimeFormat.parse("8:00:00").getTime(),
+            lessonTimeFormat.parse("9:40:00").getTime(),
+            lessonTimeFormat.parse("11:30:00").getTime(),
+            lessonTimeFormat.parse("13:10:00").getTime(),
+            lessonTimeFormat.parse("14:50:00").getTime(),
+            lessonTimeFormat.parse("16:30:00").getTime(),
+            lessonTimeFormat.parse("18:10:00").getTime(),
+    };
+
+    public TimetableService() throws ParseException { }
+
+    private int getCurrentDay() {
+        Calendar calendar = Calendar.getInstance();
+        int day = calendar.get(Calendar.DAY_OF_WEEK);
+        return (day + 5) % 7;
+    }
+
+    private int getCurrentLessonNumber() {
+        long lessonDuration = 90 * 60000;
+        Date now = new Date();
+        long timeNow = now.getTime() % (24 * 60 * 60 * 1000L);
+        for (int i = 0; i < lessonsStarts.length; i++) {
+            if (timeNow > lessonsStarts[i] && timeNow < lessonsStarts[i] + lessonDuration) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    private int getCurrentWeek() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        return (cal.get(Calendar.WEEK_OF_YEAR) + 1) % 2;
+    }
+
+    private TimetableResponse getTimetableForUser(String userFIO) throws IOException {
+        URL url = new URL(TIMETABLE_URL + "/api/1.0/timetable?filter=" + URLEncoder.encode(userFIO, "UTF-8"));
+        HttpURLConnection con = (HttpURLConnection) url.openConnection();
+        con.setRequestMethod("GET");
+
+        BufferedReader in = new BufferedReader(
+                new InputStreamReader(con.getInputStream()));
+        String inputLine;
+        StringBuilder content = new StringBuilder();
+        while ((inputLine = in.readLine()) != null) {
+            content.append(inputLine);
+        }
+        in.close();
+
+        return new ObjectMapper().readValue(content.toString(), TimetableResponse.class);
+    }
+
+    public Lesson getCurrentLesson(String userFio) throws IOException {
+        TimetableResponse response = getTimetableForUser(userFio);
+        int lessonNumber = getCurrentLessonNumber();
+        if (lessonNumber < 0) {
+            return null;
+        }
+
+        List<Object> lessons = response
+                .getResponse()
+                .getWeeks()
+                .get(getCurrentWeek())
+                .getDays()
+                .get(getCurrentDay())
+                .getLessons()
+                .get(lessonNumber);
+
+        if (lessons.size() == 0) {
+            return null;
+        }
+        return new ObjectMapper().convertValue(lessons.get(0), Lesson.class);
+    }
+}
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Day.java b/src/main/java/ru/ulstu/utils/timetable/model/Day.java
new file mode 100644
index 0000000..f548462
--- /dev/null
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Day.java
@@ -0,0 +1,27 @@
+package ru.ulstu.utils.timetable.model;
+
+import java.util.List;
+
+
+public class Day {
+
+    private Integer day;
+    private List<List<Object>> lessons = null;
+
+    public Integer getDay() {
+        return day;
+    }
+
+    public void setDay(Integer day) {
+        this.day = day;
+    }
+
+    public List<List<Object>> getLessons() {
+        return lessons;
+    }
+
+    public void setLessons(List<List<Object>> lessons) {
+        this.lessons = lessons;
+    }
+}
+
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java b/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java
new file mode 100644
index 0000000..e651e1a
--- /dev/null
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java
@@ -0,0 +1,27 @@
+package ru.ulstu.utils.timetable.model;
+
+public class Lesson {
+    private String group;
+    private String nameOfLesson;
+    private String teacher;
+    private String room;
+
+    public Lesson() {
+    }
+
+    public String getGroup() {
+        return group;
+    }
+
+    public String getNameOfLesson() {
+        return nameOfLesson;
+    }
+
+    public String getTeacher() {
+        return teacher;
+    }
+
+    public String getRoom() {
+        return room;
+    }
+}
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Response.java b/src/main/java/ru/ulstu/utils/timetable/model/Response.java
new file mode 100644
index 0000000..b5b9e97
--- /dev/null
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Response.java
@@ -0,0 +1,16 @@
+package ru.ulstu.utils.timetable.model;
+
+import java.util.List;
+
+public class Response {
+
+    private List<Week> weeks = null;
+
+    public List<Week> getWeeks() {
+        return weeks;
+    }
+
+    public void setWeeks(List<Week> weeks) {
+        this.weeks = weeks;
+    }
+}
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java b/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java
new file mode 100644
index 0000000..118c979
--- /dev/null
+++ b/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java
@@ -0,0 +1,22 @@
+package ru.ulstu.utils.timetable.model;
+
+public class TimetableResponse {
+    private Response response;
+    private String error;
+
+    public Response getResponse() {
+        return response;
+    }
+
+    public void setResponse(Response response) {
+        this.response = response;
+    }
+
+    public String getError() {
+        return error;
+    }
+
+    public void setError(String error) {
+        this.error = error;
+    }
+}
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Week.java b/src/main/java/ru/ulstu/utils/timetable/model/Week.java
new file mode 100644
index 0000000..19f3c50
--- /dev/null
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Week.java
@@ -0,0 +1,16 @@
+package ru.ulstu.utils.timetable.model;
+
+import java.util.List;
+
+public class Week {
+
+    private List<Day> days = null;
+
+    public List<Day> getDays() {
+        return days;
+    }
+
+    public void setDays(List<Day> days) {
+        this.days = days;
+    }
+}
diff --git a/src/main/resources/templates/users/dashboard.html b/src/main/resources/templates/users/dashboard.html
new file mode 100644
index 0000000..8236734
--- /dev/null
+++ b/src/main/resources/templates/users/dashboard.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml">
+<head>
+</head>
+<body>
+
+<div class="container" layout:fragment="content">
+    <section id="services">
+        <div class="container">
+            <div class="col-lg-12 text-center">
+                <h2 class="section-heading text-uppercase">Пользователи</h2>
+            </div>
+            <div class="row justify-content-center" id="dashboard">
+                <th:block th:each="user : ${users}">
+                    <div th:replace="users/fragments/userDashboardFragment :: userDashboard(user=${user})"/>
+                </th:block>
+            </div>
+        </div>
+    </section>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/users/fragments/userDashboardFragment.html b/src/main/resources/templates/users/fragments/userDashboardFragment.html
new file mode 100644
index 0000000..267bbf8
--- /dev/null
+++ b/src/main/resources/templates/users/fragments/userDashboardFragment.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:fragment="headerfiles">
+    <meta charset="UTF-8"/>
+</head>
+<body>
+<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">
+            <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>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file

From 8b52518c4a0411c760d7cac83153da69e4f2c628 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Tue, 21 May 2019 15:53:42 +0400
Subject: [PATCH 15/74] #125 check method

---
 .../conference/service/ConferenceService.java      |  7 +++++++
 .../templates/conferences/conference.html          | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 38ce659..4ee4198 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -92,6 +92,7 @@ public class ConferenceService extends BaseService {
         conferenceDto.setName(conferenceDto.getTitle());
         filterEmptyDeadlines(conferenceDto);
         checkEmptyFieldsOfDeadline(conferenceDto, errors);
+        checkEmptyFieldsOfDates(conferenceDto, errors);
         checkUniqueName(conferenceDto,
                 errors,
                 conferenceDto.getId(),
@@ -301,6 +302,12 @@ public class ConferenceService extends BaseService {
         }
     }
 
+    private void checkEmptyFieldsOfDates(ConferenceDto conferenceDto, Errors errors) {
+        if (conferenceDto.getBeginDate() == null || conferenceDto.getEndDate() == null) {
+            errors.rejectValue("beginDate", "errorCode", "Даты должны быть заполнены");
+        }
+    }
+
     public void filterEmptyDeadlines(ConferenceDto conferenceDto) {
         conferenceDto.setDeadlines(conferenceDto.getDeadlines().stream()
                 .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription()))
diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index d629d4e..201aa01 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -42,12 +42,20 @@
                                            placeholder="http://"/>
                                 </div>
 
+                                <p th:if="${#fields.hasErrors('url')}" th:errors="*{url}"
+                                   class="alert alert-danger">Incorrect description</p>
+                                <p class="help-block text-danger"></p>
+
                                 <div class="form-group">
                                     <label for="description">Описание:</label>
                                     <textarea class="form-control" rows="8" th:field="*{description}" id="description">
                                     </textarea>
                                 </div>
 
+                                <p th:if="${#fields.hasErrors('description')}" th:errors="*{description}"
+                                   class="alert alert-danger">Incorrect description</p>
+                                <p class="help-block text-danger"></p>
+
                                 <div class="form-group">
                                     <label for="deadlines">Дедлайны:</label>
                                     <div class="deadline-list form-control list-group" id="deadlines">
@@ -65,6 +73,7 @@
                                         </div>
                                     </div>
                                 </div>
+
                                 <p th:if="${#fields.hasErrors('deadlines')}" th:errors="*{deadlines}"
                                    class="alert alert-danger">Incorrect title</p>
                                 <p class="help-block text-danger"></p>
@@ -94,6 +103,10 @@
                                         </div>
                                     </div>
                                 </div>
+                                <p th:if="${#fields.hasErrors('beginDate') || #fields.hasErrors('endDate')}"
+                                   th:errors="*{beginDate}"
+                                   class="alert alert-danger">Incorrect date</p>
+                                <p class="help-block text-danger"></p>
 
                                 <div class="form-group">
                                     <label for="members">Участники:</label>
@@ -123,7 +136,6 @@
                                 </div>
 
                                 <div class="form-group d-flex justify-content-between flex-wrap">
-                                    <!--<input type="hidden" th:value="*{ping}" th:name="ping"/>-->
                                     <input id="ping-button" class="btn btn-primary"
                                            type="submit" name="pingConference" value="Ping участникам"
                                            th:disabled="*{id == null ? 'true' : 'false'}"/>

From bab621677eb65e10da2a75ba66e8c016da6389c9 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Wed, 22 May 2019 15:10:51 +0400
Subject: [PATCH 16/74] #120 add methods for checking unique title and date of
 grant

---
 .../ru/ulstu/deadline/repository/DeadlineRepository.java   | 7 +++++++
 .../java/ru/ulstu/deadline/service/DeadlineService.java    | 5 +++++
 .../java/ru/ulstu/grant/repository/GrantRepository.java    | 2 ++
 src/main/java/ru/ulstu/name/BaseService.java               | 7 +++++++
 4 files changed, 21 insertions(+)

diff --git a/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java b/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java
index f26c572..5b434b9 100644
--- a/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java
+++ b/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java
@@ -2,8 +2,15 @@ package ru.ulstu.deadline.repository;
 
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import ru.ulstu.deadline.model.Deadline;
 
+import java.util.Date;
+
 public interface DeadlineRepository extends JpaRepository<Deadline, Integer> {
 
+    @Query(
+            value = "SELECT date FROM Deadline d WHERE (d.grant_id = ?1) AND (d.date = ?2)",
+            nativeQuery = true)
+    Date findByGrantIdAndDate(Integer grant_id, Date date);
 }
diff --git a/src/main/java/ru/ulstu/deadline/service/DeadlineService.java b/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
index 0ef8a4f..e82211d 100644
--- a/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
+++ b/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
@@ -5,6 +5,7 @@ import org.springframework.transaction.annotation.Transactional;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.repository.DeadlineRepository;
 
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,4 +47,8 @@ public class DeadlineService {
     public void remove(Integer deadlineId) {
         deadlineRepository.delete(deadlineId);
     }
+
+    public Date findByGrantIdAndDate(Integer id, Date date) {
+        return deadlineRepository.findByGrantIdAndDate(id, date);
+    }
 }
diff --git a/src/main/java/ru/ulstu/grant/repository/GrantRepository.java b/src/main/java/ru/ulstu/grant/repository/GrantRepository.java
index 26face4..ae9fcc8 100644
--- a/src/main/java/ru/ulstu/grant/repository/GrantRepository.java
+++ b/src/main/java/ru/ulstu/grant/repository/GrantRepository.java
@@ -12,6 +12,8 @@ public interface GrantRepository extends JpaRepository<Grant, Integer>, BaseRepo
 
     List<Grant> findByStatus(Grant.GrantStatus status);
 
+    Grant findByTitle(String title);
+
     @Override
     @Query("SELECT title FROM Grant g WHERE (g.title = :name) AND (:id IS NULL OR g.id != :id) ")
     String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
diff --git a/src/main/java/ru/ulstu/name/BaseService.java b/src/main/java/ru/ulstu/name/BaseService.java
index 6619385..fd63cbf 100644
--- a/src/main/java/ru/ulstu/name/BaseService.java
+++ b/src/main/java/ru/ulstu/name/BaseService.java
@@ -13,4 +13,11 @@ public abstract class BaseService {
             errors.rejectValue(checkField, "errorCode", errorMessage);
         }
     }
+
+    public String checkUniqueName(NameContainer nameContainer, Integer id) {
+        if (nameContainer.getName().equals(baseRepository.findByNameAndNotId(nameContainer.getName(), id))) {
+            return baseRepository.findByNameAndNotId(nameContainer.getName(), id);
+        }
+        return null;
+    }
 }

From c21739bfc627b1aad3de8edbec7e4ad7d5d8a0dc Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Wed, 22 May 2019 15:12:45 +0400
Subject: [PATCH 17/74] #120 parse kias page

---
 src/test/java/IndexKiasTest.java  | 67 +++++++++++++++++++++++++++++++
 src/test/java/grant/KiasPage.java | 28 ++++++++++++-
 2 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/IndexKiasTest.java

diff --git a/src/test/java/IndexKiasTest.java b/src/test/java/IndexKiasTest.java
new file mode 100644
index 0000000..73dc646
--- /dev/null
+++ b/src/test/java/IndexKiasTest.java
@@ -0,0 +1,67 @@
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import core.PageObject;
+import core.TestTemplate;
+import grant.KiasPage;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.WebElement;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import ru.ulstu.NgTrackerApplication;
+import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.grant.model.Grant;
+import ru.ulstu.grant.model.GrantDto;
+import ru.ulstu.user.repository.UserRepository;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+public class IndexKiasTest extends TestTemplate {
+    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 CONTEST_YEAR = "2019";
+
+    private final Map<PageObject, List<String>> navigationHolder = ImmutableMap.of(
+            new KiasPage(), Arrays.asList("Поиск по конкурсам",
+                    String.format(BASE_URL, CONTEST_STATUS_ID, CONTEST_TYPE, CONTEST_YEAR))
+    );
+
+    @Autowired
+    UserRepository userRepository;
+
+    public List<GrantDto> getNewGrantsDto() throws ParseException {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(page.getValue().get(1));
+        KiasPage kiasPage = (KiasPage) getContext().initPage(page.getKey());
+        List<WebElement> kiasGrants = new ArrayList<>();
+        List<GrantDto> newGrants = new ArrayList<>();
+        do {
+            kiasGrants.addAll(kiasPage.getPageOfGrants());
+            for (WebElement grant : kiasGrants) {
+                GrantDto grantDto = new GrantDto();
+                grantDto.setTitle(kiasPage.getGrantTitle(grant));
+                String deadlineDate = kiasPage.getFirstDeadline(grant); //10.06.2019 23:59
+                SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+                Date date = formatter.parse(deadlineDate);
+                Deadline deadline = new Deadline(date, "Окончание приёма заявок");
+                grantDto.setDeadlines(Arrays.asList(deadline));
+                grantDto.setLeaderId(userRepository.findOneByLoginIgnoreCase("admin").getId());
+                grantDto.setStatus(Grant.GrantStatus.LOADED_FROM_KIAS);
+                newGrants.add(grantDto);
+            }
+            kiasGrants.clear();
+        }
+        while (kiasPage.checkPagination()); //проверка существования следующей страницы с грантами
+
+        return newGrants;
+    }
+}
diff --git a/src/test/java/grant/KiasPage.java b/src/test/java/grant/KiasPage.java
index 49b40d9..7723b01 100644
--- a/src/test/java/grant/KiasPage.java
+++ b/src/test/java/grant/KiasPage.java
@@ -4,7 +4,9 @@ import core.PageObject;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.NoSuchElementException;
 
 public class KiasPage extends PageObject {
     @Override
@@ -13,9 +15,31 @@ public class KiasPage extends PageObject {
     }
 
     public List<WebElement> getGrants() {
-        WebElement listContest = driver.findElement(By.tagName("tBody"));
-        return listContest.findElements(By.cssSelector("tr.tr"));
+        List<WebElement> grants = new ArrayList<>();
+        do {
+            grants.addAll(getPageOfGrants());
+        }
+        while (checkPagination());
 
+        return grants;
+    }
+
+    public List<WebElement> getPageOfGrants() {
+        WebElement listContest = driver.findElement(By.tagName("tBody"));
+        List<WebElement> grants = listContest.findElements(By.cssSelector("tr.tr"));
+        return grants;
+    }
+
+    public boolean checkPagination() {
+        try {
+            if (driver.findElements(By.id("js-ctrlNext")).size() > 0) {
+                driver.findElement(By.id("js-ctrlNext")).click();
+                return true;
+            }
+        } catch (NoSuchElementException e) {
+            return false;
+        }
+        return false;
     }
 
     public String getGrantTitle(WebElement grant) {

From 5f214620bff80e208fc4b382be55d5070057cdd6 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Wed, 22 May 2019 15:16:20 +0400
Subject: [PATCH 18/74] #120 use loading from kias

---
 .../ulstu/grant/service/GrantScheduler.java   | 22 +++++++++++++++
 .../ru/ulstu/grant/service/GrantService.java  | 27 +++++++++++++++++--
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/service/GrantScheduler.java b/src/main/java/ru/ulstu/grant/service/GrantScheduler.java
index 1c38c4a..efe1e41 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantScheduler.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantScheduler.java
@@ -27,4 +27,26 @@ public class GrantScheduler {
         grantNotificationService.sendDeadlineNotifications(grantService.findAll(), IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
         log.debug("GrantScheduler.checkDeadlineBeforeWeek finished");
     }
+
+    @Scheduled(cron = "0 0 8 1 * ?", zone = "Europe/Samara")
+    public void loadGrantsFromKias() {
+        log.debug("GrantScheduler.loadGrantsFromKias started");
+        //
+        // Метод для сохранения загруженных грантов
+        //
+
+//        List<GrantDto> grants = IndexKiasTest.getNewGrantsDto();
+//        grants.forEach(grantDto -> {
+//            try {
+//                if (grantService.saveFromKias(grantDto)) {
+//                    log.debug("GrantScheduler.loadGrantsFromKias new grant was loaded");
+//                } else {
+//                    log.debug("GrantScheduler.loadGrantsFromKias grant wasn't loaded, cause it's already exists");
+//                }
+//            } catch (IOException e) {
+//                e.printStackTrace();
+//            }
+//        });
+        log.debug("GrantScheduler.loadGrantsFromKias finished");
+    }
 }
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index 4972b6c..38c16c3 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -189,16 +189,31 @@ public class GrantService extends BaseService {
         if (errors.hasErrors()) {
             return false;
         }
-
         if (isEmpty(grantDto.getId())) {
             create(grantDto);
         } else {
             update(grantDto);
         }
-
         return true;
     }
 
+    public boolean saveFromKias(GrantDto grantDto) throws IOException {
+        grantDto.setName(grantDto.getTitle());
+        String title = checkUniqueName(grantDto, grantDto.getId()); //проверка уникальности имени
+        if (title != null) {
+            Grant grantFromDB = grantRepository.findByTitle(title); //грант с таким же названием из бд
+            if (checkSameDeadline(grantDto, grantFromDB.getId())) { //если дедайны тоже совпадают
+                return false;
+            } else { //иначе грант уже был в системе, но в другом году, поэтому надо создать
+                create(grantDto);
+                return true;
+            }
+        } else { //иначе такого гранта ещё нет, поэтому надо создать
+            create(grantDto);
+            return true;
+        }
+    }
+
     private void checkEmptyLeader(GrantDto grantDto, Errors errors) {
         if (grantDto.getLeaderId().equals(-1)) {
             errors.rejectValue("leaderId", "errorCode", "Укажите руководителя");
@@ -211,6 +226,14 @@ public class GrantService extends BaseService {
         }
     }
 
+    private boolean checkSameDeadline(GrantDto grantDto, Integer id) {
+        Date date = grantDto.getDeadlines().get(0).getDate(); //дата с сайта киас
+        if (deadlineService.findByGrantIdAndDate(id, date).compareTo(date) == 0) { //если есть такая строка с датой
+            return true;
+        }
+        return false;
+    }
+
     public List<User> getGrantAuthors(GrantDto grantDto) {
         List<User> filteredUsers = userService.filterByAgeAndDegree(grantDto.isHasAge(), grantDto.isHasDegree());
         if (grantDto.isWasLeader()) {

From 457f1da98525439184bddad051aafbce2a710325 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Wed, 22 May 2019 15:45:23 +0400
Subject: [PATCH 19/74] #120 fix checkRun and checkStyle

---
 .../java/ru/ulstu/deadline/repository/DeadlineRepository.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java b/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java
index 5b434b9..3f237e4 100644
--- a/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java
+++ b/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java
@@ -12,5 +12,5 @@ public interface DeadlineRepository extends JpaRepository<Deadline, Integer> {
     @Query(
             value = "SELECT date FROM Deadline d WHERE (d.grant_id = ?1) AND (d.date = ?2)",
             nativeQuery = true)
-    Date findByGrantIdAndDate(Integer grant_id, Date date);
+    Date findByGrantIdAndDate(Integer grantId, Date date);
 }

From bd24525315e5c9f21b1345fde5c92615f8668582 Mon Sep 17 00:00:00 2001
From: ASH <anastasiansh@gmail.com>
Date: Thu, 23 May 2019 00:15:03 +0400
Subject: [PATCH 20/74] #103 integration tests

---
 src/test/java/IndexTaskTest.java              | 214 ++++++++++++++++++
 src/test/java/students/TaskPage.java          |  81 +++++++
 .../java/students/TasksDashboardPage.java     |  10 +
 src/test/java/students/TasksPage.java         |  75 ++++++
 4 files changed, 380 insertions(+)
 create mode 100644 src/test/java/IndexTaskTest.java
 create mode 100644 src/test/java/students/TaskPage.java
 create mode 100644 src/test/java/students/TasksDashboardPage.java
 create mode 100644 src/test/java/students/TasksPage.java

diff --git a/src/test/java/IndexTaskTest.java b/src/test/java/IndexTaskTest.java
new file mode 100644
index 0000000..51b5e07
--- /dev/null
+++ b/src/test/java/IndexTaskTest.java
@@ -0,0 +1,214 @@
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import core.PageObject;
+import core.TestTemplate;
+import org.junit.Assert;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import ru.ulstu.NgTrackerApplication;
+import ru.ulstu.configuration.ApplicationProperties;
+import students.TaskPage;
+import students.TasksDashboardPage;
+import students.TasksPage;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(SpringRunner.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+public class IndexTaskTest extends TestTemplate {
+    private final Map<PageObject, List<String>> navigationHolder = ImmutableMap.of(
+            new TasksPage(), Arrays.asList("Список задач", "/students/tasks"),
+            new TasksDashboardPage(), Arrays.asList("Панель управления", "/students/dashboard"),
+            new TaskPage(), Arrays.asList("Создать задачу", "/students/task?id=0")
+    );
+
+    private final String TAG = "ATag";
+
+    @Autowired
+    private ApplicationProperties applicationProperties;
+
+
+    @Test
+    public void testACreateTask() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 2);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+
+        TaskPage taskPage = (TaskPage) getContext().initPage(page.getKey());
+        TasksPage tasksPage = (TasksPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 0).getKey());
+        String taskName = "Task " + (new Date()).getTime();
+
+        taskPage.setName(taskName);
+        taskPage.addDeadlineDate("01.01.2020", 0);
+        taskPage.addDeadlineDescription("Description", 0);
+        taskPage.save();
+
+        Assert.assertTrue(tasksPage.findTask(taskName));
+    }
+
+    @Test
+    public void testBEditTaskName() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        TasksPage tasksPage = (TasksPage) getContext().initPage(page.getKey());
+        TaskPage taskPage = (TaskPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 2).getKey());
+        String taskNewName = "Task " + (new Date()).getTime();
+
+        tasksPage.goToFirstTask();
+        taskPage.removeName();
+        taskPage.setName(taskNewName);
+        taskPage.save();
+
+        Assert.assertTrue(tasksPage.findTask(taskNewName));
+    }
+
+    @Test
+    public void testCDeleteTask() throws InterruptedException {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        TasksPage tasksPage = (TasksPage) getContext().initPage(page.getKey());
+
+        Integer size = tasksPage.getTasks().size();
+        tasksPage.deleteFirstTask();
+        Thread.sleep(3000);
+        tasksPage.submit();
+
+        Assert.assertEquals(size - 1, tasksPage.getTasks().size());
+    }
+
+    @Test
+    public void testDAddDeadline() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        TasksPage tasksPage = (TasksPage) getContext().initPage(page.getKey());
+        TaskPage taskPage = (TaskPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 2).getKey());
+
+        tasksPage.goToFirstTask();
+        String taskId = taskPage.getId();
+        Integer deadnum = taskPage.getDeadNum();
+
+        String descr = "Description";
+        String date = "06.06.2019";
+        String dateValue = "2019-06-06";
+
+        taskPage.clickAddDeadline();
+        taskPage.addDeadlineDescription(descr, deadnum);
+        taskPage.addDeadlineDate(date, deadnum);
+        taskPage.save();
+
+        getContext().goTo(applicationProperties.getBaseUrl() + String.format("/students/task?id=%s", taskId));
+
+        Assert.assertTrue(taskPage.hasDeadline(descr, dateValue));
+    }
+
+    @Test
+    public void testEEditDeadline() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        TasksPage tasksPage = (TasksPage) getContext().initPage(page.getKey());
+        TaskPage taskPage = (TaskPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 2).getKey());
+
+        tasksPage.goToFirstTask();
+        String taskId = taskPage.getId();
+
+        String descr = "DescriptionTwo";
+        String date = "12.12.2019";
+        String dateValue = "2019-12-12";
+
+        taskPage.clearDeadlineDate(0);
+        taskPage.clearDeadlineDescription(0);
+        taskPage.addDeadlineDescription(descr, 0);
+        taskPage.addDeadlineDate(date, 0);
+        taskPage.save();
+
+        getContext().goTo(applicationProperties.getBaseUrl() + String.format("/students/task?id=%s", taskId));
+
+        Assert.assertTrue(taskPage.hasDeadline(descr, dateValue));
+    }
+
+    @Test
+    public void testFDeleteDeadline() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        TasksPage tasksPage = (TasksPage) getContext().initPage(page.getKey());
+        TaskPage taskPage = (TaskPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 2).getKey());
+
+        tasksPage.goToFirstTask();
+        String taskId = taskPage.getId();
+        Integer deadNum = taskPage.getDeadNum();
+
+        taskPage.deleteDeadline();
+        taskPage.save();
+
+        getContext().goTo(applicationProperties.getBaseUrl() + String.format("/students/task?id=%s", taskId));
+
+        Assert.assertEquals(deadNum - 1, (int) taskPage.getDeadNum());
+    }
+
+    @Test
+    public void testGCreateTaskWithTag() throws InterruptedException {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 2);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+
+        TaskPage taskPage = (TaskPage) getContext().initPage(page.getKey());
+        TasksPage tasksPage = (TasksPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 0).getKey());
+        String taskName = "Task " + (new Date()).getTime();
+
+        taskPage.setName(taskName);
+        taskPage.setTag(TAG);
+        Thread.sleep(1000);
+        taskPage.addDeadlineDate("01.01.2020", 0);
+        taskPage.addDeadlineDescription("Description", 0);
+        taskPage.save();
+
+        Assert.assertTrue(tasksPage.findTaskByTag(taskName, TAG));
+    }
+
+    @Test
+    public void testHFindTagInFilter() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        TasksPage tasksPage = (TasksPage) getContext().initPage(page.getKey());
+
+
+        Assert.assertTrue(tasksPage.findTag(TAG));
+    }
+
+    @Test
+    public void testIFilterByTag() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        TasksPage tasksPage = (TasksPage) getContext().initPage(page.getKey());
+        tasksPage.selectTag(TAG);
+
+        Assert.assertTrue(tasksPage.findTasksByTag(TAG));
+    }
+
+    @Test
+    public void testJFilterByStatus() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        TasksPage tasksPage = (TasksPage) getContext().initPage(page.getKey());
+
+        tasksPage.selectStatus();
+        Assert.assertTrue(tasksPage.findAllStatus());
+    }
+
+
+}
diff --git a/src/test/java/students/TaskPage.java b/src/test/java/students/TaskPage.java
new file mode 100644
index 0000000..c0105b2
--- /dev/null
+++ b/src/test/java/students/TaskPage.java
@@ -0,0 +1,81 @@
+package students;
+
+import core.PageObject;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Keys;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+
+public class TaskPage extends PageObject {
+
+    @Override
+    public String getSubTitle() {
+        return driver.findElement(By.tagName("h3")).getText();
+    }
+
+    public void setName(String name) {
+        driver.findElement(By.id("title")).sendKeys(name);
+    }
+
+    public void save() {
+        driver.findElement(By.id("sendMessageButton")).click();
+    }
+
+    public void addDeadlineDate(String deadDate, Integer deadNum) {
+        driver.findElement(By.id(String.format("deadlines%d.date", deadNum))).sendKeys(deadDate);
+    }
+
+    public void addDeadlineDescription(String deadDescr, Integer deadNum) {
+        driver.findElement(By.id(String.format("deadlines%d.description", deadNum))).sendKeys(deadDescr);
+    }
+
+    public void removeName() {
+        driver.findElement(By.id("title")).clear();
+    }
+
+    public String getId() {
+        return driver.findElement(By.id("id")).getAttribute("value");
+    }
+
+    public Integer getDeadNum() {
+        return driver.findElements(By.cssSelector("#task-form .form-group:nth-of-type(5) .row")).size();
+    }
+
+    public void clickAddDeadline() {
+        driver.findElement(By.cssSelector("#addDeadline")).click();
+    }
+
+    public List<WebElement> getDeadlines() {
+        return driver.findElements(By.cssSelector(".form-group:nth-of-type(5) .row"));
+    }
+
+    public void deleteDeadline() {
+        driver.findElement(By.xpath("//*[@id=\"task-form\"]/div/div[1]/div[5]/div[1]/div[3]/a")).click();
+
+    }
+
+    public void clearDeadlineDate(Integer deadNum) {
+        driver.findElement(By.id(String.format("deadlines%d.date", deadNum))).sendKeys(Keys.DELETE);
+    }
+
+    public void clearDeadlineDescription(Integer deadNum) {
+        driver.findElement(By.id(String.format("deadlines%d.description", deadNum))).clear();
+    }
+
+    public boolean hasDeadline(String deadDescr, String deadValue) {
+        return getDeadlines()
+                .stream()
+                .anyMatch(webElement -> {
+                    return webElement.findElement(By.cssSelector("input[type=\"text\"]")).getAttribute("value").equals(deadDescr)
+                            && webElement.findElement(By.cssSelector("input[type=\"date\"]")).getAttribute("value").equals(deadValue);
+                });
+    }
+
+    public void setTag(String tag) {
+        driver.findElement(By.className("input-tag-name")).sendKeys(tag);
+        driver.findElement(By.className("input-tag-name")).sendKeys(Keys.ENTER);
+    }
+
+
+}
diff --git a/src/test/java/students/TasksDashboardPage.java b/src/test/java/students/TasksDashboardPage.java
new file mode 100644
index 0000000..8cc6eda
--- /dev/null
+++ b/src/test/java/students/TasksDashboardPage.java
@@ -0,0 +1,10 @@
+package students;
+
+import core.PageObject;
+
+public class TasksDashboardPage extends PageObject {
+    @Override
+    public String getSubTitle() {
+        return null;
+    }
+}
diff --git a/src/test/java/students/TasksPage.java b/src/test/java/students/TasksPage.java
new file mode 100644
index 0000000..5c5d42c
--- /dev/null
+++ b/src/test/java/students/TasksPage.java
@@ -0,0 +1,75 @@
+package students;
+
+import core.PageObject;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+
+public class TasksPage extends PageObject {
+
+    @Override
+    public String getSubTitle() {
+        return driver.findElement(By.tagName("h3")).getText();
+    }
+
+    public List<WebElement> getTasks() {
+        return driver.findElements(By.cssSelector("span.h6"));
+    }
+
+    public List<WebElement> getTaskRows() {
+        return driver.findElements(By.className("task-row"));
+    }
+
+    public void goToFirstTask() {
+        driver.findElement(By.xpath("//*[@id=\"tasks\"]/div/div[2]/div[1]/div/div/a[1]")).click();
+    }
+
+    public boolean findTask(String taskName) {
+        return getTasks().stream()
+                .anyMatch(webElement -> webElement.getText().equals(taskName));
+
+    }
+
+    public void deleteFirstTask() {
+        js.executeScript("$('a[data-confirm]').click();");
+    }
+
+    public void submit() {
+        driver.findElement(By.xpath("//*[@id=\"dataConfirmOK\"]")).click();
+    }
+
+    public boolean findTag(String tag) {
+        driver.findElements(By.className("bootstrap-select")).get(2).findElement(By.className("btn")).click();
+        driver.findElement(By.cssSelector(".bs-searchbox input")).sendKeys(tag);
+        return driver.findElement(By.xpath("//*[@id=\"tasks\"]/div/div[2]/div[2]/div[2]/div[2]/div/div[2]/ul")).findElement(By.className("text")).getText().equals(tag);
+    }
+
+    public boolean findTaskByTag(String name, String tag) {
+        return getTasks().stream()
+                .anyMatch(webElement -> webElement.getText().equals(name)
+                        && webElement.findElement(By.xpath("//*[@id=\"tasks\"]/div/div[2]/div[1]/div/div/a[1]/span[3]")).getText().equals(tag));
+    }
+
+    public boolean findTasksByTag(String tag) {
+        return getTaskRows().stream()
+                .allMatch(webElement -> webElement.findElement(By.cssSelector("span.text-muted")).getText().equals(tag));
+    }
+
+    public void selectTag(String tag) {
+        driver.findElements(By.className("bootstrap-select")).get(2).findElement(By.className("btn")).click();
+        driver.findElement(By.cssSelector(".bs-searchbox input")).sendKeys(tag);
+        driver.findElement(By.xpath("//*[@id=\"tasks\"]/div/div[2]/div[2]/div[2]/div[2]/div/div[2]/ul/li/a")).click();
+    }
+
+
+    public void selectStatus() {
+        driver.findElements(By.className("bootstrap-select")).get(1).findElement(By.className("btn")).click();
+        driver.findElement(By.xpath("//*[@id=\"tasks\"]/div/div[2]/div[2]/div[2]/div[1]/div/div/ul/li[2]/a")).click();
+    }
+
+    public boolean findAllStatus() {
+        return getTaskRows().stream()
+                .allMatch(webElement -> webElement.findElement(By.cssSelector("div i.text-primary")).isDisplayed());
+    }
+}

From 284a3f51e9539c27db16825145815006c1d510ab Mon Sep 17 00:00:00 2001
From: ASH <anastasiansh@gmail.com>
Date: Thu, 23 May 2019 12:07:34 +0400
Subject: [PATCH 21/74] #104 mod tests filter and create tasks

---
 .../java/ru/ulstu/students/model/TaskDto.java |  20 ++
 .../students/service/TaskServiceTest.java     | 181 ++++++++++++++++++
 2 files changed, 201 insertions(+)
 create mode 100644 src/test/java/ru/ulstu/students/service/TaskServiceTest.java

diff --git a/src/main/java/ru/ulstu/students/model/TaskDto.java b/src/main/java/ru/ulstu/students/model/TaskDto.java
index 8d52e01..1d0eac0 100644
--- a/src/main/java/ru/ulstu/students/model/TaskDto.java
+++ b/src/main/java/ru/ulstu/students/model/TaskDto.java
@@ -10,6 +10,7 @@ import ru.ulstu.tags.model.Tag;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -135,6 +136,25 @@ public class TaskDto {
         this.tags = tags;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        TaskDto taskDto = (TaskDto) o;
+        return Objects.equals(id, taskDto.id) &&
+                Objects.equals(title, taskDto.title) &&
+                Objects.equals(description, taskDto.description) &&
+                status == taskDto.status &&
+                Objects.equals(deadlines, taskDto.deadlines) &&
+                Objects.equals(tagIds, taskDto.tagIds) &&
+                Objects.equals(tags, taskDto.tags);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, title, description, status, deadlines, createDate, updateDate, tagIds, tags);
+    }
+
     public String getTagsString() {
         return StringUtils.abbreviate(tags
                 .stream()
diff --git a/src/test/java/ru/ulstu/students/service/TaskServiceTest.java b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
new file mode 100644
index 0000000..e00570c
--- /dev/null
+++ b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
@@ -0,0 +1,181 @@
+package ru.ulstu.students.service;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.data.domain.Sort;
+import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.deadline.service.DeadlineService;
+import ru.ulstu.students.model.Task;
+import ru.ulstu.students.model.TaskDto;
+import ru.ulstu.students.model.TaskFilterDto;
+import ru.ulstu.students.repository.TaskRepository;
+import ru.ulstu.tags.model.Tag;
+import ru.ulstu.tags.service.TagService;
+import ru.ulstu.timeline.service.EventService;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TaskServiceTest {
+
+    @Mock
+    TaskRepository taskRepository;
+
+    @Mock
+    private TagService tagService;
+
+    @Mock
+    DeadlineService deadlineService;
+
+    @Mock
+    EventService eventService;
+
+    @InjectMocks
+    TaskService taskService;
+
+    private final static Sort SORT = new Sort(Sort.Direction.DESC, "createDate");
+    private final static Integer ID = 1;
+    private final static Task.TaskStatus STATUS = Task.TaskStatus.IN_WORK;
+    private final static String TITLE = "title";
+    private final static String DESCR = "descr";
+    private final static String TAG = "tag";
+
+    private List<Task> tasks;
+    private List<Tag> tags;
+    private Task task;
+    private TaskFilterDto filterDto;
+    private TaskDto taskDto;
+    private List<TaskDto> tasksDto;
+    private Tag tag;
+    private Tag tagNull;
+    private Deadline deadline;
+    private List<Deadline> deadlines;
+
+
+    @Before
+    public void setUp() throws Exception {
+
+        tasks = new ArrayList<>();
+        task = new Task();
+
+        task.setId(ID);
+        task.setTitle(TITLE);
+        task.setDescription(DESCR);
+
+
+        tag = new Tag();
+        tag.setId(ID);
+        tag.setTagName(TAG);
+
+        deadlines = new ArrayList<>();
+        deadline = new Deadline(new Date(), DESCR);
+        deadline.setId(ID);
+        deadlines.add(deadline);
+
+        tags = new ArrayList<>();
+        tags.add(tag);
+
+        tasks.add(task);
+        taskDto = new TaskDto(task);
+
+    }
+
+    @Test
+    public void findAll() {
+
+        when(taskRepository.findAll(SORT)).thenReturn(tasks);
+        assertEquals(Collections.singletonList(task), taskService.findAll());
+    }
+
+    @Test
+    public void filter() {
+        when(tagService.findById(ID)).thenReturn(tag);
+        when(taskRepository.filterNew(STATUS, tag)).thenReturn(tasks);
+
+        TaskFilterDto taskFilterDto = new TaskFilterDto();
+        taskFilterDto.setTag(ID);
+        taskFilterDto.setOrder("new");
+        taskFilterDto.setStatus(STATUS);
+
+        assertEquals(Collections.singletonList(taskDto), taskService.filter(taskFilterDto));
+    }
+
+    @Test
+    public void create() throws IOException {
+        when(tagService.saveOrCreate(new ArrayList<>())).thenReturn(tags);
+        when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines);
+        when(taskRepository.save(new Task())).thenReturn(task);
+        eventService.createFromTask(new Task());
+
+        taskDto.setTags(tags);
+        taskDto.setDeadlines(deadlines);
+
+        Task newTask = new Task();
+        task.setId(ID);
+        task.setTitle(TITLE);
+        task.setDescription(DESCR);
+        task.setTags(tags);
+        task.setDeadlines(deadlines);
+
+        assertEquals(task.getId(), taskService.create(taskDto));
+    }
+
+    @Test
+    public void update() {
+    }
+
+    @Test
+    public void delete() {
+    }
+
+    @Test
+    public void save() {
+    }
+
+    @Test
+    public void copyMainPart() {
+    }
+
+    @Test
+    public void copyTaskWithNewDates() {
+    }
+
+    @Test
+    public void copyTaskWithNewYear() {
+    }
+
+    @Test
+    public void generateYearTasks() {
+    }
+
+    @Test
+    public void checkRepeatingTags() {
+    }
+
+    @Test
+    public void getTaskStatuses() {
+    }
+
+    @Test
+    public void getTags() {
+    }
+
+    @Test
+    public void findTasksByTag() {
+    }
+
+    @Test
+    public void createPeriodTask() {
+    }
+}
\ No newline at end of file

From 1c8359f900fef08760ad9dc30aaec1103fc867e3 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Thu, 23 May 2019 13:54:44 +0400
Subject: [PATCH 22/74] #103 modify files permissions

---
 src/main/resources/drivers/chromedriver | Bin
 src/main/resources/drivers/geckodriver  | Bin
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 src/main/resources/drivers/chromedriver
 mode change 100644 => 100755 src/main/resources/drivers/geckodriver

diff --git a/src/main/resources/drivers/chromedriver b/src/main/resources/drivers/chromedriver
old mode 100644
new mode 100755
diff --git a/src/main/resources/drivers/geckodriver b/src/main/resources/drivers/geckodriver
old mode 100644
new mode 100755

From ef521123dd157ea0381d2b6699be4ac9569e295e Mon Sep 17 00:00:00 2001
From: ASH <anastasiansh@gmail.com>
Date: Thu, 23 May 2019 14:31:34 +0400
Subject: [PATCH 23/74] #104 mod tests check repeatings

---
 .../java/ru/ulstu/students/model/TaskDto.java |  8 +++-
 .../ulstu/students/service/TaskService.java   | 10 ++--
 .../students/service/TaskServiceTest.java     | 46 +++++++++++--------
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/main/java/ru/ulstu/students/model/TaskDto.java b/src/main/java/ru/ulstu/students/model/TaskDto.java
index 1d0eac0..2df691f 100644
--- a/src/main/java/ru/ulstu/students/model/TaskDto.java
+++ b/src/main/java/ru/ulstu/students/model/TaskDto.java
@@ -138,8 +138,12 @@ public class TaskDto {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         TaskDto taskDto = (TaskDto) o;
         return Objects.equals(id, taskDto.id) &&
                 Objects.equals(title, taskDto.title) &&
diff --git a/src/main/java/ru/ulstu/students/service/TaskService.java b/src/main/java/ru/ulstu/students/service/TaskService.java
index 2be44cb..379314d 100644
--- a/src/main/java/ru/ulstu/students/service/TaskService.java
+++ b/src/main/java/ru/ulstu/students/service/TaskService.java
@@ -108,7 +108,7 @@ public class TaskService {
     }
 
     @Transactional
-    public void delete(Integer taskId) throws IOException {
+    public boolean delete(Integer taskId) throws IOException {
         if (taskRepository.exists(taskId)) {
             Task scheduleTask = taskRepository.findOne(taskId);
             Scheduler sch = schedulerRepository.findOneByTask(scheduleTask);
@@ -116,7 +116,9 @@ public class TaskService {
                 schedulerRepository.delete(sch.getId());
             }
             taskRepository.delete(taskId);
+            return true;
         }
+        return false;
 
     }
 
@@ -128,14 +130,14 @@ public class TaskService {
         }
     }
 
-    public void copyMainPart(Task newTask, Task task) {
+    private void copyMainPart(Task newTask, Task task) {
         newTask.setTitle(task.getTitle());
         newTask.setTags(tagService.saveOrCreate(task.getTags()));
         newTask.setCreateDate(new Date());
         newTask.setStatus(Task.TaskStatus.LOADED_FROM_KIAS);
     }
 
-    public Task copyTaskWithNewDates(Task task) {
+    private Task copyTaskWithNewDates(Task task) {
         Task newTask = new Task();
         copyMainPart(newTask, task);
         Calendar cal1 = DateUtils.getCalendar(newTask.getCreateDate());
@@ -157,7 +159,7 @@ public class TaskService {
                 }).collect(Collectors.toList());
     }
 
-    public Task copyTaskWithNewYear(Task task) {
+    private Task copyTaskWithNewYear(Task task) {
         Task newTask = new Task();
         copyMainPart(newTask, task);
         newTask.setDeadlines(newYearDeadlines(task.getDeadlines()));
diff --git a/src/test/java/ru/ulstu/students/service/TaskServiceTest.java b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
index e00570c..19eff12 100644
--- a/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
+++ b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
@@ -7,11 +7,13 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.data.domain.Sort;
+import ru.ulstu.core.util.DateUtils;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.students.model.Task;
 import ru.ulstu.students.model.TaskDto;
 import ru.ulstu.students.model.TaskFilterDto;
+import ru.ulstu.students.repository.SchedulerRepository;
 import ru.ulstu.students.repository.TaskRepository;
 import ru.ulstu.tags.model.Tag;
 import ru.ulstu.tags.service.TagService;
@@ -21,9 +23,12 @@ import java.io.IOException;
 import java.util.ArrayList;
 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)
@@ -32,6 +37,9 @@ public class TaskServiceTest {
     @Mock
     TaskRepository taskRepository;
 
+    @Mock
+    SchedulerRepository schedulerRepository;
+
     @Mock
     private TagService tagService;
 
@@ -50,6 +58,7 @@ public class TaskServiceTest {
     private final static String TITLE = "title";
     private final static String DESCR = "descr";
     private final static String TAG = "tag";
+    private final static Date YEAR = DateUtils.clearTime(DateUtils.addYears(new Date(), 0));
 
     private List<Task> tasks;
     private List<Tag> tags;
@@ -61,6 +70,7 @@ public class TaskServiceTest {
     private Tag tagNull;
     private Deadline deadline;
     private List<Deadline> deadlines;
+    private Set<Tag> repeatingTags;
 
 
     @Before
@@ -83,12 +93,17 @@ public class TaskServiceTest {
         deadline.setId(ID);
         deadlines.add(deadline);
 
+        task.setDeadlines(deadlines);
+
         tags = new ArrayList<>();
         tags.add(tag);
 
         tasks.add(task);
         taskDto = new TaskDto(task);
 
+        repeatingTags = new HashSet<>();
+        repeatingTags.add(tag);
+
     }
 
     @Test
@@ -132,35 +147,26 @@ public class TaskServiceTest {
     }
 
     @Test
-    public void update() {
-    }
+    public void delete() throws IOException {
+        when(taskRepository.exists(ID)).thenReturn(true);
+        when(taskRepository.findOne(ID)).thenReturn(task);
+        when(schedulerRepository.findOneByTask(task)).thenReturn(null);
 
-    @Test
-    public void delete() {
-    }
-
-    @Test
-    public void save() {
-    }
-
-    @Test
-    public void copyMainPart() {
-    }
-
-    @Test
-    public void copyTaskWithNewDates() {
-    }
-
-    @Test
-    public void copyTaskWithNewYear() {
+        assertTrue(taskService.delete(ID));
     }
 
     @Test
     public void generateYearTasks() {
+        when(taskService.checkRepeatingTags(false)).thenReturn(repeatingTags);
+
     }
 
     @Test
     public void checkRepeatingTags() {
+        when(tagService.findById(ID)).thenReturn(tag);
+        when(taskRepository.findAllYear(DateUtils.clearTime(DateUtils.addYears(new Date(), -1)))).thenReturn(tasks);
+
+        assertEquals(tag, taskService.checkRepeatingTags(false));
     }
 
     @Test

From 29cfadef02940976788796151f41132d557a5884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=20=D0=9C?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B8=D1=8F?= <semenovamasha98@mail.ru>
Date: Thu, 23 May 2019 15:02:55 +0400
Subject: [PATCH 24/74] #127 reference model, schema

---
 .../java/ru/ulstu/paper/model/Reference.java  | 90 +++++++++++++++++++
 .../db/changelog-20190523_000000-schema.xml   | 34 +++++++
 src/main/resources/db/changelog-master.xml    |  1 +
 3 files changed, 125 insertions(+)
 create mode 100644 src/main/java/ru/ulstu/paper/model/Reference.java
 create mode 100644 src/main/resources/db/changelog-20190523_000000-schema.xml

diff --git a/src/main/java/ru/ulstu/paper/model/Reference.java b/src/main/java/ru/ulstu/paper/model/Reference.java
new file mode 100644
index 0000000..1901f41
--- /dev/null
+++ b/src/main/java/ru/ulstu/paper/model/Reference.java
@@ -0,0 +1,90 @@
+package ru.ulstu.paper.model;
+
+import org.hibernate.validator.constraints.NotBlank;
+import ru.ulstu.core.model.BaseEntity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
+@Entity
+public class Reference extends BaseEntity {
+
+    @NotBlank
+    private String authors;
+
+    @Column(name = "publication_title")
+    private String publicationTitle;
+
+    @Column(name = "publication_year")
+    private Integer publicationYear;
+
+    private String publisher;
+
+    private String pages;
+
+    @Column(name = "journal_or_collection_title")
+    private String journalOrCollectionTitle;
+
+    @Enumerated(value = EnumType.STRING)
+    @Column(name = "reference_type")
+    private ReferenceDto.ReferenceType referenceType = ReferenceDto.ReferenceType.ARTICLE;
+
+    public String getAuthors() {
+        return authors;
+    }
+
+    public void setAuthors(String authors) {
+        this.authors = authors;
+    }
+
+    public String getPublicationTitle() {
+        return publicationTitle;
+    }
+
+    public void setPublicationTitle(String publicationTitle) {
+        this.publicationTitle = publicationTitle;
+    }
+
+    public Integer getPublicationYear() {
+        return publicationYear;
+    }
+
+    public void setPublicationYear(Integer publicationYear) {
+        this.publicationYear = publicationYear;
+    }
+
+    public String getPublisher() {
+        return publisher;
+    }
+
+    public void setPublisher(String publisher) {
+        this.publisher = publisher;
+    }
+
+    public String getPages() {
+        return pages;
+    }
+
+    public void setPages(String pages) {
+        this.pages = pages;
+    }
+
+    public String getJournalOrCollectionTitle() {
+        return journalOrCollectionTitle;
+    }
+
+    public void setJournalOrCollectionTitle(String journalOrCollectionTitle) {
+        this.journalOrCollectionTitle = journalOrCollectionTitle;
+    }
+
+    public ReferenceDto.ReferenceType getReferenceType() {
+        return referenceType;
+    }
+
+    public void setReferenceType(ReferenceDto.ReferenceType referenceType) {
+        this.referenceType = referenceType;
+    }
+
+}
diff --git a/src/main/resources/db/changelog-20190523_000000-schema.xml b/src/main/resources/db/changelog-20190523_000000-schema.xml
new file mode 100644
index 0000000..2bdc788
--- /dev/null
+++ b/src/main/resources/db/changelog-20190523_000000-schema.xml
@@ -0,0 +1,34 @@
+<?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="masha" id="20190523_000000-1">
+        <createTable tableName="reference">
+            <column name="id" type="integer">
+                <constraints nullable="false"/>
+            </column>
+            <column name="authors" type="varchar(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="publication_title" type="varchar(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="publication_year" type="integer">
+                <constraints nullable="false"/>
+            </column>
+            <column name="paper_id" type="integer"/>
+            <column name="publisher" type="varchar(255)"/>
+            <column name="pages" type="varchar(255)"/>
+            <column name="journal_or_collection_title" type="varchar(255)"/>
+
+            <column name="reference_type" type="varchar(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="version" type="integer"/>
+        </createTable>
+        <addPrimaryKey columnNames="id" constraintName="pk_reference" tableName="reference"/>
+        <addForeignKeyConstraint baseTableName="reference" baseColumnNames="paper_id"
+                                 constraintName="fk_reference_paper_id" referencedTableName="paper"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 18bd645..5011cc5 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -42,4 +42,5 @@
     <include file="db/changelog-20190507_000000-schema.xml"/>
     <include file="db/changelog-20190507_000001-schema.xml"/>
     <include file="db/changelog-20190511_000000-schema.xml"/>
+    <include file="db/changelog-20190523_000000-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file

From 7c1b124c9470821b47c82642a7c6b945724efd04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=20=D0=9C?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B8=D1=8F?= <semenovamasha98@mail.ru>
Date: Thu, 23 May 2019 15:48:46 +0400
Subject: [PATCH 25/74] #127 references tab, crud

---
 .../paper/controller/PaperController.java     | 20 ++++
 src/main/java/ru/ulstu/paper/model/Paper.java | 13 +++
 .../java/ru/ulstu/paper/model/PaperDto.java   | 25 ++++-
 .../java/ru/ulstu/paper/model/Reference.java  |  2 -
 .../ru/ulstu/paper/model/ReferenceDto.java    | 39 +++++++-
 .../paper/repository/ReferenceRepository.java |  8 ++
 .../ru/ulstu/paper/service/PaperService.java  | 57 +++++++++++
 .../db/changelog-20190523_000000-schema.xml   | 13 +--
 src/main/resources/public/css/paper.css       | 20 ++++
 .../resources/templates/papers/paper.html     | 97 ++++++++++++++++++-
 10 files changed, 279 insertions(+), 15 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/paper/repository/ReferenceRepository.java

diff --git a/src/main/java/ru/ulstu/paper/controller/PaperController.java b/src/main/java/ru/ulstu/paper/controller/PaperController.java
index 41d5586..beae772 100644
--- a/src/main/java/ru/ulstu/paper/controller/PaperController.java
+++ b/src/main/java/ru/ulstu/paper/controller/PaperController.java
@@ -16,6 +16,7 @@ import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.paper.model.PaperListDto;
+import ru.ulstu.paper.model.ReferenceDto;
 import ru.ulstu.paper.service.LatexService;
 import ru.ulstu.paper.service.PaperService;
 import ru.ulstu.user.model.User;
@@ -105,6 +106,15 @@ public class PaperController {
         return "/papers/paper";
     }
 
+    @PostMapping(value = "/paper", params = "addReference")
+    public String addReference(@Valid PaperDto paperDto, Errors errors) {
+        if (errors.hasErrors()) {
+            return "/papers/paper";
+        }
+        paperDto.getReferences().add(new ReferenceDto());
+        return "/papers/paper";
+    }
+
     @ModelAttribute("allStatuses")
     public List<Paper.PaperStatus> getPaperStatuses() {
         return paperService.getPaperStatuses();
@@ -129,6 +139,16 @@ public class PaperController {
         return years;
     }
 
+    @ModelAttribute("allFormatStandards")
+    public List<ReferenceDto.FormatStandard> getFormatStandards() {
+        return paperService.getFormatStandards();
+    }
+
+    @ModelAttribute("allReferenceTypes")
+    public List<ReferenceDto.ReferenceType> getReferenceTypes() {
+        return paperService.getReferenceTypes();
+    }
+
     @PostMapping("/generatePdf")
     public ResponseEntity<byte[]> getPdfFile(PaperDto paper) throws IOException, InterruptedException {
         HttpHeaders headers = new HttpHeaders();
diff --git a/src/main/java/ru/ulstu/paper/model/Paper.java b/src/main/java/ru/ulstu/paper/model/Paper.java
index 15ee4b4..413c5db 100644
--- a/src/main/java/ru/ulstu/paper/model/Paper.java
+++ b/src/main/java/ru/ulstu/paper/model/Paper.java
@@ -123,6 +123,11 @@ public class Paper extends BaseEntity implements UserContainer {
     @ManyToMany(mappedBy = "papers")
     private List<Grant> grants;
 
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @JoinColumn(name = "paper_id", unique = true)
+    @Fetch(FetchMode.SUBSELECT)
+    private List<Reference> references = new ArrayList<>();
+
     public PaperStatus getStatus() {
         return status;
     }
@@ -248,6 +253,14 @@ public class Paper extends BaseEntity implements UserContainer {
         return getAuthors();
     }
 
+    public List<Reference> getReferences() {
+        return references;
+    }
+
+    public void setReferences(List<Reference> references) {
+        this.references = references;
+    }
+
     public Optional<Deadline> getNextDeadline() {
         return deadlines
                 .stream()
diff --git a/src/main/java/ru/ulstu/paper/model/PaperDto.java b/src/main/java/ru/ulstu/paper/model/PaperDto.java
index 11d6dfc..8474a34 100644
--- a/src/main/java/ru/ulstu/paper/model/PaperDto.java
+++ b/src/main/java/ru/ulstu/paper/model/PaperDto.java
@@ -38,6 +38,8 @@ public class PaperDto {
     private Set<UserDto> authors;
     private Integer filterAuthorId;
     private String latexText;
+    private List<ReferenceDto> references = new ArrayList<>();
+    private ReferenceDto.FormatStandard formatStandard = ReferenceDto.FormatStandard.GOST;
 
     public PaperDto() {
         deadlines.add(new Deadline());
@@ -57,7 +59,9 @@ public class PaperDto {
                     @JsonProperty("locked") Boolean locked,
                     @JsonProperty("files") List<FileDataDto> files,
                     @JsonProperty("authorIds") Set<Integer> authorIds,
-                    @JsonProperty("authors") Set<UserDto> authors) {
+                    @JsonProperty("authors") Set<UserDto> authors,
+                    @JsonProperty("references") List<ReferenceDto> references,
+                    @JsonProperty("formatStandard") ReferenceDto.FormatStandard formatStandard) {
         this.id = id;
         this.title = title;
         this.status = status;
@@ -71,6 +75,8 @@ public class PaperDto {
         this.locked = locked;
         this.files = files;
         this.authors = authors;
+        this.references = references;
+        this.formatStandard = formatStandard;
     }
 
     public PaperDto(Paper paper) {
@@ -88,6 +94,7 @@ public class PaperDto {
         this.files = convert(paper.getFiles(), FileDataDto::new);
         this.authorIds = convert(paper.getAuthors(), user -> user.getId());
         this.authors = convert(paper.getAuthors(), UserDto::new);
+        this.references = convert(paper.getReferences(), ReferenceDto::new);
     }
 
     public Integer getId() {
@@ -216,4 +223,20 @@ public class PaperDto {
     public void setFilterAuthorId(Integer filterAuthorId) {
         this.filterAuthorId = filterAuthorId;
     }
+
+    public List<ReferenceDto> getReferences() {
+        return references;
+    }
+
+    public void setReferences(List<ReferenceDto> references) {
+        this.references = references;
+    }
+
+    public ReferenceDto.FormatStandard getFormatStandard() {
+        return formatStandard;
+    }
+
+    public void setFormatStandard(ReferenceDto.FormatStandard formatStandard) {
+        this.formatStandard = formatStandard;
+    }
 }
diff --git a/src/main/java/ru/ulstu/paper/model/Reference.java b/src/main/java/ru/ulstu/paper/model/Reference.java
index 1901f41..289cdc1 100644
--- a/src/main/java/ru/ulstu/paper/model/Reference.java
+++ b/src/main/java/ru/ulstu/paper/model/Reference.java
@@ -1,6 +1,5 @@
 package ru.ulstu.paper.model;
 
-import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.core.model.BaseEntity;
 
 import javax.persistence.Column;
@@ -11,7 +10,6 @@ import javax.persistence.Enumerated;
 @Entity
 public class Reference extends BaseEntity {
 
-    @NotBlank
     private String authors;
 
     @Column(name = "publication_title")
diff --git a/src/main/java/ru/ulstu/paper/model/ReferenceDto.java b/src/main/java/ru/ulstu/paper/model/ReferenceDto.java
index 8d71ae5..1705e08 100644
--- a/src/main/java/ru/ulstu/paper/model/ReferenceDto.java
+++ b/src/main/java/ru/ulstu/paper/model/ReferenceDto.java
@@ -34,6 +34,7 @@ public class ReferenceDto {
         }
     }
 
+    private Integer id;
     private String authors;
     private String publicationTitle;
     private Integer publicationYear;
@@ -42,9 +43,11 @@ public class ReferenceDto {
     private String journalOrCollectionTitle;
     private ReferenceType referenceType;
     private FormatStandard formatStandard;
+    private boolean deleted;
 
     @JsonCreator
     public ReferenceDto(
+            @JsonProperty("id") Integer id,
             @JsonProperty("authors") String authors,
             @JsonProperty("publicationTitle") String publicationTitle,
             @JsonProperty("publicationYear") Integer publicationYear,
@@ -52,7 +55,9 @@ public class ReferenceDto {
             @JsonProperty("pages") String pages,
             @JsonProperty("journalOrCollectionTitle") String journalOrCollectionTitle,
             @JsonProperty("referenceType") ReferenceType referenceType,
-            @JsonProperty("formatStandard") FormatStandard formatStandard) {
+            @JsonProperty("formatStandard") FormatStandard formatStandard,
+            @JsonProperty("isDeleted") boolean deleted) {
+        this.id = id;
         this.authors = authors;
         this.publicationTitle = publicationTitle;
         this.publicationYear = publicationYear;
@@ -61,6 +66,22 @@ public class ReferenceDto {
         this.journalOrCollectionTitle = journalOrCollectionTitle;
         this.referenceType = referenceType;
         this.formatStandard = formatStandard;
+        this.deleted = deleted;
+    }
+
+    public ReferenceDto(Reference reference) {
+        this.id = reference.getId();
+        this.authors = reference.getAuthors();
+        this.publicationTitle = reference.getPublicationTitle();
+        this.publicationYear = reference.getPublicationYear();
+        this.publisher = reference.getPublisher();
+        this.pages = reference.getPages();
+        this.journalOrCollectionTitle = reference.getJournalOrCollectionTitle();
+        this.referenceType = reference.getReferenceType();
+    }
+
+    public ReferenceDto() {
+        referenceType = ReferenceType.ARTICLE;
     }
 
     public String getAuthors() {
@@ -126,4 +147,20 @@ public class ReferenceDto {
     public void setFormatStandard(FormatStandard formatStandard) {
         this.formatStandard = formatStandard;
     }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public boolean getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
 }
diff --git a/src/main/java/ru/ulstu/paper/repository/ReferenceRepository.java b/src/main/java/ru/ulstu/paper/repository/ReferenceRepository.java
new file mode 100644
index 0000000..68e97d4
--- /dev/null
+++ b/src/main/java/ru/ulstu/paper/repository/ReferenceRepository.java
@@ -0,0 +1,8 @@
+package ru.ulstu.paper.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import ru.ulstu.paper.model.Reference;
+
+public interface ReferenceRepository extends JpaRepository<Reference, Integer> {
+    void deleteById(Integer id);
+}
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index db810f5..8658015 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -10,8 +10,10 @@ import ru.ulstu.file.service.FileService;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.paper.model.PaperListDto;
+import ru.ulstu.paper.model.Reference;
 import ru.ulstu.paper.model.ReferenceDto;
 import ru.ulstu.paper.repository.PaperRepository;
+import ru.ulstu.paper.repository.ReferenceRepository;
 import ru.ulstu.timeline.service.EventService;
 import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
@@ -39,6 +41,7 @@ import static ru.ulstu.paper.model.ReferenceDto.ReferenceType.ARTICLE;
 import static ru.ulstu.paper.model.ReferenceDto.ReferenceType.BOOK;
 
 @Service
+@Transactional
 public class PaperService {
     private final static int MAX_DISPLAY_SIZE = 40;
     private final static String PAPER_FORMATTED_TEMPLATE = "%s %s";
@@ -49,14 +52,17 @@ public class PaperService {
     private final DeadlineService deadlineService;
     private final FileService fileService;
     private final EventService eventService;
+    private final ReferenceRepository referenceRepository;
 
     public PaperService(PaperRepository paperRepository,
+                        ReferenceRepository referenceRepository,
                         FileService fileService,
                         PaperNotificationService paperNotificationService,
                         UserService userService,
                         DeadlineService deadlineService,
                         EventService eventService) {
         this.paperRepository = paperRepository;
+        this.referenceRepository = referenceRepository;
         this.fileService = fileService;
         this.paperNotificationService = paperNotificationService;
         this.userService = userService;
@@ -117,6 +123,7 @@ public class PaperService {
         paper.setTitle(paperDto.getTitle());
         paper.setUpdateDate(new Date());
         paper.setDeadlines(deadlineService.saveOrCreate(paperDto.getDeadlines()));
+        paper.setReferences(saveOrCreateReferences(paperDto.getReferences()));
         paper.setFiles(fileService.saveOrCreate(paperDto.getFiles().stream()
                 .filter(f -> !f.isDeleted())
                 .collect(toList())));
@@ -127,6 +134,43 @@ public class PaperService {
         return paper;
     }
 
+    public List<Reference> saveOrCreateReferences(List<ReferenceDto> references) {
+        return references
+                .stream()
+                .filter(reference -> !reference.getDeleted())
+                .map(reference -> reference.getId() != null ? updateReference(reference) : createReference(reference))
+                .collect(Collectors.toList());
+    }
+
+    @Transactional
+    public Reference updateReference(ReferenceDto referenceDto) {
+        Reference updateReference = referenceRepository.findOne(referenceDto.getId());
+        updateReference.setAuthors(referenceDto.getAuthors());
+        updateReference.setJournalOrCollectionTitle(referenceDto.getJournalOrCollectionTitle());
+        updateReference.setPages(referenceDto.getPages());
+        updateReference.setPublicationTitle(referenceDto.getPublicationTitle());
+        updateReference.setPublicationYear(referenceDto.getPublicationYear());
+        updateReference.setPublisher(referenceDto.getPublisher());
+        updateReference.setReferenceType(referenceDto.getReferenceType());
+        referenceRepository.save(updateReference);
+        return updateReference;
+    }
+
+    @Transactional
+    public Reference createReference(ReferenceDto referenceDto) {
+        Reference newReference = new Reference();
+        newReference.setAuthors(referenceDto.getAuthors());
+        newReference.setJournalOrCollectionTitle(referenceDto.getJournalOrCollectionTitle());
+        newReference.setPages(referenceDto.getPages());
+        newReference.setPublicationTitle(referenceDto.getPublicationTitle());
+        newReference.setPublicationYear(referenceDto.getPublicationYear());
+        newReference.setPublisher(referenceDto.getPublisher());
+        newReference.setReferenceType(referenceDto.getReferenceType());
+        newReference = referenceRepository.save(newReference);
+        return newReference;
+    }
+
+
     @Transactional
     public Integer update(PaperDto paperDto) throws IOException {
         Paper paper = paperRepository.findOne(paperDto.getId());
@@ -139,6 +183,11 @@ public class PaperService {
             fileService.delete(file.getId());
         }
         paperRepository.save(copyFromDto(paper, paperDto));
+        for (ReferenceDto referenceDto : paperDto.getReferences().stream()
+                .filter(f -> f.getDeleted() && f.getId() != null)
+                .collect(toList())) {
+            referenceRepository.deleteById(referenceDto.getId());
+        }
         eventService.updatePaperDeadlines(paper);
 
         paper.getAuthors().forEach(author -> {
@@ -168,6 +217,14 @@ public class PaperService {
         return Arrays.asList(Paper.PaperType.values());
     }
 
+    public List<ReferenceDto.FormatStandard> getFormatStandards() {
+        return Arrays.asList(ReferenceDto.FormatStandard.values());
+    }
+
+    public List<ReferenceDto.ReferenceType> getReferenceTypes() {
+        return Arrays.asList(ReferenceDto.ReferenceType.values());
+    }
+
     @Transactional
     public Paper create(String title, User user, Date deadlineDate) {
         Paper paper = new Paper();
diff --git a/src/main/resources/db/changelog-20190523_000000-schema.xml b/src/main/resources/db/changelog-20190523_000000-schema.xml
index 2bdc788..aca880f 100644
--- a/src/main/resources/db/changelog-20190523_000000-schema.xml
+++ b/src/main/resources/db/changelog-20190523_000000-schema.xml
@@ -7,20 +7,13 @@
             <column name="id" type="integer">
                 <constraints nullable="false"/>
             </column>
-            <column name="authors" type="varchar(255)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="publication_title" type="varchar(255)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="publication_year" type="integer">
-                <constraints nullable="false"/>
-            </column>
+            <column name="authors" type="varchar(255)"/>
+            <column name="publication_title" type="varchar(255)"/>
+            <column name="publication_year" type="integer"/>
             <column name="paper_id" type="integer"/>
             <column name="publisher" type="varchar(255)"/>
             <column name="pages" type="varchar(255)"/>
             <column name="journal_or_collection_title" type="varchar(255)"/>
-
             <column name="reference_type" type="varchar(255)">
                 <constraints nullable="false"/>
             </column>
diff --git a/src/main/resources/public/css/paper.css b/src/main/resources/public/css/paper.css
index 824209f..1be8c1f 100644
--- a/src/main/resources/public/css/paper.css
+++ b/src/main/resources/public/css/paper.css
@@ -6,4 +6,24 @@
 
 .nav-tabs {
     margin-bottom: 20px;
+}
+
+#nav-references label, #nav-references select, #nav-references input {
+    display: inline-block;
+    vertical-align: middle;
+}
+
+#nav-references .collapse-heading {
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    padding: 5px 15px;
+    background-color: #efefef;
+}
+
+#nav-references .collapse-heading a {
+    text-decoration: none;
+}
+
+#nav-references a:hover {
+    text-decoration: none;
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html
index d408913..ef4217d 100644
--- a/src/main/resources/templates/papers/paper.html
+++ b/src/main/resources/templates/papers/paper.html
@@ -31,6 +31,9 @@
                                            href="#nav-main" role="tab" aria-controls="nav-main" aria-selected="true">Статья</a>
                                         <a class="nav-item nav-link" id="nav-latex-tab" data-toggle="tab"
                                            href="#nav-latex" role="tab" aria-controls="nav-latex" aria-selected="false">Latex</a>
+                                        <a class="nav-item nav-link" id="nav-references-tab" data-toggle="tab"
+                                           href="#nav-references" role="tab" aria-controls="nav-references"
+                                           aria-selected="false">References</a>
                                     </div>
                                 </nav>
                                 <div class="tab-content" id="nav-tabContent">
@@ -167,6 +170,99 @@
                                             </button>
                                         </div>
                                     </div>
+                                    <div class="tab-pane fade" id="nav-references" role="tabpanel"
+                                         aria-labelledby="nav-profile-tab">
+                                        <div class="form-group">
+                                            <label>References:</label>
+                                            <th:block th:each="reference, rowStat : *{references}">
+                                                <div class="row" th:id="|reference${rowStat.index}|"
+                                                     th:style="${reference.deleted} ? 'display: none;' :''">
+
+                                                    <div class="form-group col-11">
+                                                        <a data-toggle="collapse"
+                                                           th:href="${'#collapseReference'+rowStat.index}"
+                                                           aria-expanded="false">
+                                                            <div class="collapse-heading"
+                                                                 th:text="${(reference.referenceType.toString() == 'ARTICLE'?'Статья':'Книга') +'. '
+                                                             +(reference.publicationTitle==null?'':reference.publicationTitle+'. ')+(reference.authors==null?'':reference.authors+'. ') }">
+
+                                                            </div>
+                                                        </a>
+                                                    </div>
+                                                    <div class="col-1">
+                                                        <a class="btn btn-danger float-right"
+                                                           th:onclick="|$('#references${rowStat.index}\\.deleted').val('true'); $('#reference${rowStat.index}').hide(); |"><span
+                                                                aria-hidden="true"><i class="fa fa-times"/></span>
+                                                        </a>
+                                                    </div>
+
+                                                    <div class="collapse" th:id="${'collapseReference'+rowStat.index}">
+                                                        <input type="hidden"
+                                                               th:field="*{references[__${rowStat.index}__].id}"/>
+                                                        <input type="hidden"
+                                                               th:field="*{references[__${rowStat.index}__].deleted}"/>
+
+                                                        <div class="form-group col-12">
+                                                            <label class="col-4">Вид публикации:</label>
+                                                            <select class="form-control col-7"
+                                                                    th:field="*{references[__${rowStat.index}__].referenceType}">
+                                                                <option th:each="type : ${allReferenceTypes}"
+                                                                        th:value="${type}"
+                                                                        th:text="${type.typeName}">Type
+                                                                </option>
+                                                            </select>
+                                                        </div>
+                                                        <div class="form-group col-12">
+                                                            <label class="col-4">Авторы:</label>
+                                                            <input type="text"
+                                                                   class="form-control col-7"
+                                                                   name="authors"
+                                                                   th:field="*{references[__${rowStat.index}__].authors}"/>
+                                                        </div>
+                                                        <div class="form-group col-12">
+                                                            <label class="col-4 ">Название публикации:</label>
+                                                            <input type="text"
+                                                                   class="form-control col-7"
+                                                                   name="publicationTitle"
+                                                                   th:field="*{references[__${rowStat.index}__].publicationTitle}"/>
+                                                        </div>
+                                                        <div class="form-group col-12">
+                                                            <label class="col-4">Год издания:</label>
+                                                            <input type="number" class="form-control col-7 "
+                                                                   name="publicationYear"
+                                                                   th:field="*{references[__${rowStat.index}__].publicationYear}"/>
+                                                        </div>
+                                                        <div class="form-group col-12">
+                                                            <label class="col-4">Издательство:</label>
+                                                            <input type="text"
+                                                                   class="form-control col-7"
+                                                                   name="publisher"
+                                                                   th:field="*{references[__${rowStat.index}__].publisher}"/>
+                                                        </div>
+                                                        <div class="form-group col-12">
+                                                            <label class="col-4">Страницы:</label>
+                                                            <input type="text" class="form-control col-7" name="pages"
+                                                                   th:field="*{references[__${rowStat.index}__].pages}"/>
+                                                        </div>
+                                                        <div class="form-group col-12">
+                                                            <label class="col-4">Название журнала или сборника статей
+                                                                конференции:</label>
+                                                            <input type="text"
+                                                                   class="form-control col-7"
+                                                                   name="journalOrCollectionTitle"
+                                                                   th:field="*{references[__${rowStat.index}__].journalOrCollectionTitle}"/>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </th:block>
+                                            <div class="form-group">
+                                                <input type="submit" id="addReference" name="addReference"
+                                                       class="btn btn-primary"
+                                                       value="Добавить источник"/>
+                                            </div>
+
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <div class="col-md-4 offset-md-1 col-sm-12 offset-sm-0">
@@ -378,7 +474,6 @@
                 $('#pdfBtn').prop('disabled', false);
             }
         }
-
     </script>
 </div>
 

From c303d65c8d8c02fc0d86c4ec332067e334cfe7ec Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Thu, 23 May 2019 16:02:44 +0400
Subject: [PATCH 26/74] #120 move to services

---
 build.gradle                                  |   2 +-
 .../java/ru/ulstu/grant/page/KiasPage.java    |  52 ++
 .../ulstu/grant/service/GrantScheduler.java   |  24 +-
 .../ru/ulstu/grant/service/GrantService.java  |  20 +-
 .../ru/ulstu/grant/service/KiasService.java   |  83 +++
 .../ru/ulstu/user/service/UserService.java    | 693 +++++++++---------
 src/main/resources/drivers/chromedriver       | Bin
 src/main/resources/drivers/geckodriver        | Bin
 8 files changed, 512 insertions(+), 362 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/grant/page/KiasPage.java
 create mode 100644 src/main/java/ru/ulstu/grant/service/KiasService.java
 mode change 100644 => 100755 src/main/resources/drivers/chromedriver
 mode change 100644 => 100755 src/main/resources/drivers/geckodriver

diff --git a/build.gradle b/build.gradle
index 38de2c7..71c9977 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,6 +126,6 @@ dependencies {
     compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.6.0'
 
     testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test'
-    testCompile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1'
+    compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1'
 
 }
\ No newline at end of file
diff --git a/src/main/java/ru/ulstu/grant/page/KiasPage.java b/src/main/java/ru/ulstu/grant/page/KiasPage.java
new file mode 100644
index 0000000..4353684
--- /dev/null
+++ b/src/main/java/ru/ulstu/grant/page/KiasPage.java
@@ -0,0 +1,52 @@
+package ru.ulstu.grant.page;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+public class KiasPage {
+    private WebDriver driver;
+    public KiasPage(WebDriver webDriver) {
+        this.driver = webDriver;
+    }
+
+    public List<WebElement> getGrants() {
+        List<WebElement> grants = new ArrayList<>();
+        do {
+            grants.addAll(getPageOfGrants());
+        }
+        while (checkPagination());
+
+        return grants;
+    }
+
+    public List<WebElement> getPageOfGrants() {
+        WebElement listContest = driver.findElement(By.tagName("tBody"));
+        List<WebElement> grants = listContest.findElements(By.cssSelector("tr.tr"));
+        return grants;
+    }
+
+    public boolean checkPagination() {
+        try {
+            if (driver.findElements(By.id("js-ctrlNext")).size() > 0) {
+                driver.findElement(By.id("js-ctrlNext")).click();
+                return true;
+            }
+        } catch (NoSuchElementException e) {
+            return false;
+        }
+        return false;
+    }
+
+    public String getGrantTitle(WebElement grant) {
+        return grant.findElement(By.cssSelector("td.tertiary")).findElement(By.tagName("a")).getText();
+    }
+
+    public String getFirstDeadline(WebElement grant) {
+        return grant.findElement(By.xpath("./td[5]")).getText();
+    }
+}
diff --git a/src/main/java/ru/ulstu/grant/service/GrantScheduler.java b/src/main/java/ru/ulstu/grant/service/GrantScheduler.java
index efe1e41..fb236af 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantScheduler.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantScheduler.java
@@ -5,6 +5,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+import java.text.ParseException;
+
 @Service
 public class GrantScheduler {
     private final static boolean IS_DEADLINE_NOTIFICATION_BEFORE_WEEK = true;
@@ -31,22 +34,11 @@ public class GrantScheduler {
     @Scheduled(cron = "0 0 8 1 * ?", zone = "Europe/Samara")
     public void loadGrantsFromKias() {
         log.debug("GrantScheduler.loadGrantsFromKias started");
-        //
-        // Метод для сохранения загруженных грантов
-        //
-
-//        List<GrantDto> grants = IndexKiasTest.getNewGrantsDto();
-//        grants.forEach(grantDto -> {
-//            try {
-//                if (grantService.saveFromKias(grantDto)) {
-//                    log.debug("GrantScheduler.loadGrantsFromKias new grant was loaded");
-//                } else {
-//                    log.debug("GrantScheduler.loadGrantsFromKias grant wasn't loaded, cause it's already exists");
-//                }
-//            } catch (IOException e) {
-//                e.printStackTrace();
-//            }
-//        });
+        try {
+            grantService.createFromKias();
+        } catch (ParseException | IOException e) {
+            e.printStackTrace();
+        }
         log.debug("GrantScheduler.loadGrantsFromKias finished");
     }
 }
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index 38c16c3..8d65da7 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -1,6 +1,8 @@
 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;
@@ -23,6 +25,7 @@ import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
+import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
@@ -39,6 +42,7 @@ import static ru.ulstu.grant.model.Grant.GrantStatus.APPLICATION;
 @Service
 public class GrantService extends BaseService {
     private final static int MAX_DISPLAY_SIZE = 50;
+    private final Logger log = LoggerFactory.getLogger(GrantService.class);
 
     private final GrantRepository grantRepository;
     private final ProjectService projectService;
@@ -48,6 +52,7 @@ public class GrantService extends BaseService {
     private final PaperService paperService;
     private final EventService eventService;
     private final GrantNotificationService grantNotificationService;
+    private final KiasService kiasService;
 
     public GrantService(GrantRepository grantRepository,
                         FileService fileService,
@@ -56,8 +61,10 @@ public class GrantService extends BaseService {
                         UserService userService,
                         PaperService paperService,
                         EventService eventService,
-                        GrantNotificationService grantNotificationService) {
+                        GrantNotificationService grantNotificationService,
+                        KiasService kiasService) {
         this.grantRepository = grantRepository;
+        this.kiasService = kiasService;
         this.baseRepository = grantRepository;
         this.fileService = fileService;
         this.deadlineService = deadlineService;
@@ -317,4 +324,15 @@ public class GrantService extends BaseService {
                 .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription()))
                 .collect(Collectors.toList()));
     }
+
+    @Transactional
+    public void createFromKias() throws IOException, ParseException {
+        for (GrantDto grantDto : kiasService.getNewGrantsDto()) {
+            if (saveFromKias(grantDto)) {
+                log.debug("GrantScheduler.loadGrantsFromKias new grant was loaded");
+            } else {
+                log.debug("GrantScheduler.loadGrantsFromKias grant wasn't loaded, cause it's already exists");
+            }
+        }
+    }
 }
diff --git a/src/main/java/ru/ulstu/grant/service/KiasService.java b/src/main/java/ru/ulstu/grant/service/KiasService.java
new file mode 100644
index 0000000..6ff0bd9
--- /dev/null
+++ b/src/main/java/ru/ulstu/grant/service/KiasService.java
@@ -0,0 +1,83 @@
+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 org.springframework.stereotype.Service;
+import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.grant.model.Grant;
+import ru.ulstu.grant.model.GrantDto;
+import ru.ulstu.grant.page.KiasPage;
+import ru.ulstu.user.service.UserService;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+@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 int CONTEST_YEAR = Calendar.getInstance().get(Calendar.YEAR);
+
+    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 WebDriver webDriver;
+
+    public KiasService(UserService userService) {
+        System.setProperty(DRIVER_TYPE, getDriverExecutablePath());
+        this.userService = userService;
+        final ChromeOptions chromeOptions = new ChromeOptions();
+        chromeOptions.addArguments("--headless");
+        webDriver = new ChromeDriver(chromeOptions);
+    }
+
+    public List<GrantDto> getNewGrantsDto() throws ParseException {
+        webDriver.get(String.format(BASE_URL, CONTEST_STATUS_ID, CONTEST_TYPE, CONTEST_YEAR));
+        KiasPage kiasPage = new KiasPage(webDriver);
+        List<WebElement> kiasGrants = new ArrayList<>();
+        List<GrantDto> newGrants = new ArrayList<>();
+        do {
+            kiasGrants.addAll(kiasPage.getPageOfGrants());
+            for (WebElement grant : kiasGrants) {
+                GrantDto grantDto = new GrantDto();
+                grantDto.setTitle(kiasPage.getGrantTitle(grant));
+                String deadlineDate = kiasPage.getFirstDeadline(grant); //10.06.2019 23:59
+                SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+                Date date = formatter.parse(deadlineDate);
+                Deadline deadline = new Deadline(date, "Окончание приёма заявок");
+                grantDto.setDeadlines(Arrays.asList(deadline));
+                grantDto.setLeaderId(userService.findOneByLoginIgnoreCase("admin").getId());
+                grantDto.setStatus(Grant.GrantStatus.LOADED_FROM_KIAS);
+                newGrants.add(grantDto);
+            }
+            kiasGrants.clear();
+        }
+        while (kiasPage.checkPagination()); //проверка существования следующей страницы с грантами
+
+        return newGrants;
+    }
+
+    private String getDriverExecutablePath() {
+        return KiasService.class.getClassLoader().getResource(
+                String.format(DRIVER_LOCATION, getDriverExecutable(isWindows()))).getFile();
+    }
+
+    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/java/ru/ulstu/user/service/UserService.java b/src/main/java/ru/ulstu/user/service/UserService.java
index c889caa..30eeb19 100644
--- a/src/main/java/ru/ulstu/user/service/UserService.java
+++ b/src/main/java/ru/ulstu/user/service/UserService.java
@@ -1,344 +1,349 @@
-package ru.ulstu.user.service;
-
-import com.google.common.collect.ImmutableMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort;
-import org.springframework.mail.MailException;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-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.user.error.UserActivationError;
-import ru.ulstu.user.error.UserEmailExistsException;
-import ru.ulstu.user.error.UserIdExistsException;
-import ru.ulstu.user.error.UserIsUndeadException;
-import ru.ulstu.user.error.UserLoginExistsException;
-import ru.ulstu.user.error.UserNotActivatedException;
-import ru.ulstu.user.error.UserNotFoundException;
-import ru.ulstu.user.error.UserPasswordsNotValidOrNotMatchException;
-import ru.ulstu.user.error.UserResetKeyError;
-import ru.ulstu.user.error.UserSendingMailException;
-import ru.ulstu.user.model.User;
-import ru.ulstu.user.model.UserDto;
-import ru.ulstu.user.model.UserListDto;
-import ru.ulstu.user.model.UserResetPasswordDto;
-import ru.ulstu.user.model.UserRole;
-import ru.ulstu.user.model.UserRoleConstants;
-import ru.ulstu.user.model.UserRoleDto;
-import ru.ulstu.user.repository.UserRepository;
-import ru.ulstu.user.repository.UserRoleRepository;
-import ru.ulstu.user.util.UserUtils;
-
-import javax.mail.MessagingException;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-@Service
-@Transactional
-public class UserService implements UserDetailsService {
-    private static final String INVITE_USER_EXCEPTION = "Во время отправки приглашения произошла ошибка";
-
-    private final Logger log = LoggerFactory.getLogger(UserService.class);
-    private final UserRepository userRepository;
-    private final PasswordEncoder passwordEncoder;
-    private final UserRoleRepository userRoleRepository;
-    private final UserMapper userMapper;
-    private final MailService mailService;
-    private final ApplicationProperties applicationProperties;
-
-    public UserService(UserRepository userRepository,
-                       PasswordEncoder passwordEncoder,
-                       UserRoleRepository userRoleRepository,
-                       UserMapper userMapper,
-                       MailService mailService,
-                       ApplicationProperties applicationProperties) {
-        this.userRepository = userRepository;
-        this.passwordEncoder = passwordEncoder;
-        this.userRoleRepository = userRoleRepository;
-        this.userMapper = userMapper;
-        this.mailService = mailService;
-        this.applicationProperties = applicationProperties;
-    }
-
-    private User getUserByEmail(String email) {
-        return userRepository.findOneByEmailIgnoreCase(email);
-    }
-
-    private User getUserByActivationKey(String activationKey) {
-        return userRepository.findOneByActivationKey(activationKey);
-    }
-
-    public User getUserByLogin(String login) {
-        return userRepository.findOneByLoginIgnoreCase(login);
-    }
-
-    @Transactional(readOnly = true)
-    public UserDto getUserWithRolesById(Integer userId) {
-        final User userEntity = userRepository.findOneWithRolesById(userId);
-        if (userEntity == null) {
-            throw new UserNotFoundException(userId.toString());
-        }
-        return userMapper.userEntityToUserDto(userEntity);
-    }
-
-    @Transactional(readOnly = true)
-    public PageableItems<UserListDto> getAllUsers(int offset, int count) {
-        final Page<User> page = userRepository.findAll(new OffsetablePageRequest(offset, count, new Sort("id")));
-        return new PageableItems<>(page.getTotalElements(), userMapper.userEntitiesToUserListDtos(page.getContent()));
-    }
-
-    // TODO: read only active users
-    public List<User> findAll() {
-        return userRepository.findAll();
-    }
-
-    @Transactional(readOnly = true)
-    public PageableItems<UserRoleDto> getUserRoles() {
-        final List<UserRoleDto> roles = userRoleRepository.findAll().stream()
-                .map(UserRoleDto::new)
-                .sorted(Comparator.comparing(UserRoleDto::getViewValue))
-                .collect(Collectors.toList());
-        return new PageableItems<>(roles.size(), roles);
-    }
-
-    public UserDto createUser(UserDto userDto) {
-        if (userDto.getId() != null) {
-            throw new UserIdExistsException();
-        }
-        if (getUserByLogin(userDto.getLogin()) != null) {
-            throw new UserLoginExistsException(userDto.getLogin());
-        }
-        if (getUserByEmail(userDto.getEmail()) != null) {
-            throw new UserEmailExistsException(userDto.getEmail());
-        }
-        if (!userDto.isPasswordsValid()) {
-            throw new UserPasswordsNotValidOrNotMatchException("");
-        }
-        User user = userMapper.userDtoToUserEntity(userDto);
-        user.setActivated(false);
-        user.setActivationKey(UserUtils.generateActivationKey());
-        user.setRoles(Collections.singleton(new UserRole(UserRoleConstants.USER)));
-        user.setPassword(passwordEncoder.encode(userDto.getPassword()));
-        user = userRepository.save(user);
-        mailService.sendActivationEmail(user);
-        log.debug("Created Information for User: {}", user.getLogin());
-        return userMapper.userEntityToUserDto(user);
-    }
-
-    public UserDto activateUser(String activationKey) {
-        final User user = getUserByActivationKey(activationKey);
-        if (user == null) {
-            throw new UserActivationError(activationKey);
-        }
-        user.setActivated(true);
-        user.setActivationKey(null);
-        user.setActivationDate(null);
-        log.debug("Activated user: {}", user.getLogin());
-        return userMapper.userEntityToUserDto(userRepository.save(user));
-    }
-
-    public UserDto updateUser(UserDto userDto) {
-        if (userDto.getId() == null) {
-            throw new EntityIdIsNullException();
-        }
-        if (!Objects.equals(
-                Optional.ofNullable(getUserByEmail(userDto.getEmail()))
-                        .map(BaseEntity::getId).orElse(userDto.getId()),
-                userDto.getId())) {
-            throw new UserEmailExistsException(userDto.getEmail());
-        }
-        if (!Objects.equals(
-                Optional.ofNullable(getUserByLogin(userDto.getLogin()))
-                        .map(BaseEntity::getId).orElse(userDto.getId()),
-                userDto.getId())) {
-            throw new UserLoginExistsException(userDto.getLogin());
-        }
-        User user = userRepository.findOne(userDto.getId());
-        if (user == null) {
-            throw new UserNotFoundException(userDto.getId().toString());
-        }
-        if (applicationProperties.getUndeadUserLogin().equalsIgnoreCase(user.getLogin())) {
-            userDto.setLogin(applicationProperties.getUndeadUserLogin());
-            userDto.setActivated(true);
-            userDto.setRoles(Collections.singletonList(new UserRoleDto(UserRoleConstants.ADMIN)));
-        }
-        user.setLogin(userDto.getLogin());
-        user.setFirstName(userDto.getFirstName());
-        user.setLastName(userDto.getLastName());
-        user.setEmail(userDto.getEmail());
-        if (userDto.isActivated() != user.getActivated()) {
-            if (userDto.isActivated()) {
-                user.setActivationKey(null);
-                user.setActivationDate(null);
-            } else {
-                user.setActivationKey(UserUtils.generateActivationKey());
-                user.setActivationDate(new Date());
-            }
-        }
-        user.setActivated(userDto.isActivated());
-        final Set<UserRole> roles = userMapper.rolesFromDto(userDto.getRoles());
-        user.setRoles(roles.isEmpty()
-                ? Collections.singleton(new UserRole(UserRoleConstants.USER))
-                : roles);
-        if (!StringUtils.isEmpty(userDto.getOldPassword())) {
-            if (!userDto.isPasswordsValid() || !userDto.isOldPasswordValid()) {
-                throw new UserPasswordsNotValidOrNotMatchException("");
-            }
-            if (!passwordEncoder.matches(userDto.getOldPassword(), user.getPassword())) {
-                throw new UserPasswordsNotValidOrNotMatchException("");
-            }
-            user.setPassword(passwordEncoder.encode(userDto.getPassword()));
-            log.debug("Changed password for User: {}", user.getLogin());
-        }
-        user = userRepository.save(user);
-        log.debug("Changed Information for User: {}", user.getLogin());
-        return userMapper.userEntityToUserDto(user);
-    }
-
-    public UserDto updateUserInformation(User user, UserDto updateUser) {
-        user.setFirstName(updateUser.getFirstName());
-        user.setLastName(updateUser.getLastName());
-        user.setEmail(updateUser.getEmail());
-        user.setLogin(updateUser.getLogin());
-        user = userRepository.save(user);
-        log.debug("Updated Information for User: {}", user.getLogin());
-        return userMapper.userEntityToUserDto(user);
-    }
-
-    public void changeUserPassword(User user, Map<String, String> payload) {
-        if (!payload.get("password").equals(payload.get("confirmPassword"))) {
-            throw new UserPasswordsNotValidOrNotMatchException("");
-        }
-        if (!passwordEncoder.matches(payload.get("oldPassword"), user.getPassword())) {
-            throw new UserPasswordsNotValidOrNotMatchException("Старый пароль введен неправильно");
-        }
-        user.setPassword(passwordEncoder.encode(payload.get("password")));
-        log.debug("Changed password for User: {}", user.getLogin());
-        userRepository.save(user);
-
-        mailService.sendChangePasswordMail(user);
-    }
-
-    public boolean requestUserPasswordReset(String email) {
-        User user = userRepository.findOneByEmailIgnoreCase(email);
-        if (user == null) {
-            throw new UserNotFoundException(email);
-        }
-        if (!user.getActivated()) {
-            throw new UserNotActivatedException();
-        }
-        user.setResetKey(UserUtils.generateResetKey());
-        user.setResetDate(new Date());
-        user = userRepository.save(user);
-        mailService.sendPasswordResetMail(user);
-        log.debug("Created Reset Password Request for User: {}", user.getLogin());
-        return true;
-    }
-
-    public boolean completeUserPasswordReset(String key, UserResetPasswordDto userResetPasswordDto) {
-        if (!userResetPasswordDto.isPasswordsValid()) {
-            throw new UserPasswordsNotValidOrNotMatchException("");
-        }
-        User user = userRepository.findOneByResetKey(key);
-        if (user == null) {
-            throw new UserResetKeyError(key);
-        }
-        user.setPassword(passwordEncoder.encode(userResetPasswordDto.getPassword()));
-        user.setResetKey(null);
-        user.setResetDate(null);
-        user = userRepository.save(user);
-        log.debug("Reset Password for User: {}", user.getLogin());
-        return true;
-    }
-
-    public UserDto deleteUser(Integer userId) {
-        final User user = userRepository.findOne(userId);
-        if (user == null) {
-            throw new UserNotFoundException(userId.toString());
-        }
-        if (applicationProperties.getUndeadUserLogin().equalsIgnoreCase(user.getLogin())) {
-            throw new UserIsUndeadException(user.getLogin());
-        }
-        userRepository.delete(user);
-        log.debug("Deleted User: {}", user.getLogin());
-        return userMapper.userEntityToUserDto(user);
-    }
-
-    @Override
-    public UserDetails loadUserByUsername(String username) {
-        final User user = userRepository.findOneByLoginIgnoreCase(username);
-        if (user == null) {
-            throw new UserNotFoundException(username);
-        }
-        if (!user.getActivated()) {
-            throw new UserNotActivatedException();
-        }
-        return new org.springframework.security.core.userdetails.User(user.getLogin(),
-                user.getPassword(),
-                Optional.ofNullable(user.getRoles()).orElse(Collections.emptySet()).stream()
-                        .map(role -> new SimpleGrantedAuthority(role.getName()))
-                        .collect(Collectors.toList()));
-    }
-
-    public List<User> findByIds(List<Integer> ids) {
-        return userRepository.findAll(ids);
-    }
-
-    public User findById(Integer id) {
-        return userRepository.findOne(id);
-    }
-
-    public User getCurrentUser() {
-        String login = UserUtils.getCurrentUserLogin();
-        User user = userRepository.findOneByLoginIgnoreCase(login);
-        if (user == null) {
-            throw new UserNotFoundException(login);
-        }
-        return user;
-    }
-
-    public List<User> filterByAgeAndDegree(boolean hasDegree, boolean hasAge) {
-        return userRepository.filterByAgeAndDegree(hasDegree, hasAge);
-    }
-
-    public void inviteUser(String email) throws UserSendingMailException {
-        if (userRepository.findOneByEmailIgnoreCase(email) != null) {
-            throw new UserEmailExistsException(email);
-        }
-
-        String password = UserUtils.generatePassword();
-
-        User user = new User();
-        user.setPassword(passwordEncoder.encode(password));
-        user.setLogin(email);
-        user.setEmail(email);
-        user.setFirstName("user");
-        user.setLastName("user");
-        user.setActivated(true);
-        userRepository.save(user);
-
-        Map<String, Object> variables = ImmutableMap.of("password", password, "email", email);
-        try {
-            mailService.sendInviteMail(variables, email);
-        } catch (MessagingException | MailException e) {
-            throw new UserSendingMailException(email);
-        }
-    }
-}
+package ru.ulstu.user.service;
+
+import com.google.common.collect.ImmutableMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort;
+import org.springframework.mail.MailException;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+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.grant.model.GrantDto;
+import ru.ulstu.user.error.UserActivationError;
+import ru.ulstu.user.error.UserEmailExistsException;
+import ru.ulstu.user.error.UserIdExistsException;
+import ru.ulstu.user.error.UserIsUndeadException;
+import ru.ulstu.user.error.UserLoginExistsException;
+import ru.ulstu.user.error.UserNotActivatedException;
+import ru.ulstu.user.error.UserNotFoundException;
+import ru.ulstu.user.error.UserPasswordsNotValidOrNotMatchException;
+import ru.ulstu.user.error.UserResetKeyError;
+import ru.ulstu.user.error.UserSendingMailException;
+import ru.ulstu.user.model.User;
+import ru.ulstu.user.model.UserDto;
+import ru.ulstu.user.model.UserListDto;
+import ru.ulstu.user.model.UserResetPasswordDto;
+import ru.ulstu.user.model.UserRole;
+import ru.ulstu.user.model.UserRoleConstants;
+import ru.ulstu.user.model.UserRoleDto;
+import ru.ulstu.user.repository.UserRepository;
+import ru.ulstu.user.repository.UserRoleRepository;
+import ru.ulstu.user.util.UserUtils;
+
+import javax.mail.MessagingException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional
+public class UserService implements UserDetailsService {
+    private static final String INVITE_USER_EXCEPTION = "Во время отправки приглашения произошла ошибка";
+
+    private final Logger log = LoggerFactory.getLogger(UserService.class);
+    private final UserRepository userRepository;
+    private final PasswordEncoder passwordEncoder;
+    private final UserRoleRepository userRoleRepository;
+    private final UserMapper userMapper;
+    private final MailService mailService;
+    private final ApplicationProperties applicationProperties;
+
+    public UserService(UserRepository userRepository,
+                       PasswordEncoder passwordEncoder,
+                       UserRoleRepository userRoleRepository,
+                       UserMapper userMapper,
+                       MailService mailService,
+                       ApplicationProperties applicationProperties) {
+        this.userRepository = userRepository;
+        this.passwordEncoder = passwordEncoder;
+        this.userRoleRepository = userRoleRepository;
+        this.userMapper = userMapper;
+        this.mailService = mailService;
+        this.applicationProperties = applicationProperties;
+    }
+
+    private User getUserByEmail(String email) {
+        return userRepository.findOneByEmailIgnoreCase(email);
+    }
+
+    private User getUserByActivationKey(String activationKey) {
+        return userRepository.findOneByActivationKey(activationKey);
+    }
+
+    public User getUserByLogin(String login) {
+        return userRepository.findOneByLoginIgnoreCase(login);
+    }
+
+    @Transactional(readOnly = true)
+    public UserDto getUserWithRolesById(Integer userId) {
+        final User userEntity = userRepository.findOneWithRolesById(userId);
+        if (userEntity == null) {
+            throw new UserNotFoundException(userId.toString());
+        }
+        return userMapper.userEntityToUserDto(userEntity);
+    }
+
+    @Transactional(readOnly = true)
+    public PageableItems<UserListDto> getAllUsers(int offset, int count) {
+        final Page<User> page = userRepository.findAll(new OffsetablePageRequest(offset, count, new Sort("id")));
+        return new PageableItems<>(page.getTotalElements(), userMapper.userEntitiesToUserListDtos(page.getContent()));
+    }
+
+    // TODO: read only active users
+    public List<User> findAll() {
+        return userRepository.findAll();
+    }
+
+    @Transactional(readOnly = true)
+    public PageableItems<UserRoleDto> getUserRoles() {
+        final List<UserRoleDto> roles = userRoleRepository.findAll().stream()
+                .map(UserRoleDto::new)
+                .sorted(Comparator.comparing(UserRoleDto::getViewValue))
+                .collect(Collectors.toList());
+        return new PageableItems<>(roles.size(), roles);
+    }
+
+    public UserDto createUser(UserDto userDto) {
+        if (userDto.getId() != null) {
+            throw new UserIdExistsException();
+        }
+        if (getUserByLogin(userDto.getLogin()) != null) {
+            throw new UserLoginExistsException(userDto.getLogin());
+        }
+        if (getUserByEmail(userDto.getEmail()) != null) {
+            throw new UserEmailExistsException(userDto.getEmail());
+        }
+        if (!userDto.isPasswordsValid()) {
+            throw new UserPasswordsNotValidOrNotMatchException("");
+        }
+        User user = userMapper.userDtoToUserEntity(userDto);
+        user.setActivated(false);
+        user.setActivationKey(UserUtils.generateActivationKey());
+        user.setRoles(Collections.singleton(new UserRole(UserRoleConstants.USER)));
+        user.setPassword(passwordEncoder.encode(userDto.getPassword()));
+        user = userRepository.save(user);
+        mailService.sendActivationEmail(user);
+        log.debug("Created Information for User: {}", user.getLogin());
+        return userMapper.userEntityToUserDto(user);
+    }
+
+    public UserDto activateUser(String activationKey) {
+        final User user = getUserByActivationKey(activationKey);
+        if (user == null) {
+            throw new UserActivationError(activationKey);
+        }
+        user.setActivated(true);
+        user.setActivationKey(null);
+        user.setActivationDate(null);
+        log.debug("Activated user: {}", user.getLogin());
+        return userMapper.userEntityToUserDto(userRepository.save(user));
+    }
+
+    public UserDto updateUser(UserDto userDto) {
+        if (userDto.getId() == null) {
+            throw new EntityIdIsNullException();
+        }
+        if (!Objects.equals(
+                Optional.ofNullable(getUserByEmail(userDto.getEmail()))
+                        .map(BaseEntity::getId).orElse(userDto.getId()),
+                userDto.getId())) {
+            throw new UserEmailExistsException(userDto.getEmail());
+        }
+        if (!Objects.equals(
+                Optional.ofNullable(getUserByLogin(userDto.getLogin()))
+                        .map(BaseEntity::getId).orElse(userDto.getId()),
+                userDto.getId())) {
+            throw new UserLoginExistsException(userDto.getLogin());
+        }
+        User user = userRepository.findOne(userDto.getId());
+        if (user == null) {
+            throw new UserNotFoundException(userDto.getId().toString());
+        }
+        if (applicationProperties.getUndeadUserLogin().equalsIgnoreCase(user.getLogin())) {
+            userDto.setLogin(applicationProperties.getUndeadUserLogin());
+            userDto.setActivated(true);
+            userDto.setRoles(Collections.singletonList(new UserRoleDto(UserRoleConstants.ADMIN)));
+        }
+        user.setLogin(userDto.getLogin());
+        user.setFirstName(userDto.getFirstName());
+        user.setLastName(userDto.getLastName());
+        user.setEmail(userDto.getEmail());
+        if (userDto.isActivated() != user.getActivated()) {
+            if (userDto.isActivated()) {
+                user.setActivationKey(null);
+                user.setActivationDate(null);
+            } else {
+                user.setActivationKey(UserUtils.generateActivationKey());
+                user.setActivationDate(new Date());
+            }
+        }
+        user.setActivated(userDto.isActivated());
+        final Set<UserRole> roles = userMapper.rolesFromDto(userDto.getRoles());
+        user.setRoles(roles.isEmpty()
+                ? Collections.singleton(new UserRole(UserRoleConstants.USER))
+                : roles);
+        if (!StringUtils.isEmpty(userDto.getOldPassword())) {
+            if (!userDto.isPasswordsValid() || !userDto.isOldPasswordValid()) {
+                throw new UserPasswordsNotValidOrNotMatchException("");
+            }
+            if (!passwordEncoder.matches(userDto.getOldPassword(), user.getPassword())) {
+                throw new UserPasswordsNotValidOrNotMatchException("");
+            }
+            user.setPassword(passwordEncoder.encode(userDto.getPassword()));
+            log.debug("Changed password for User: {}", user.getLogin());
+        }
+        user = userRepository.save(user);
+        log.debug("Changed Information for User: {}", user.getLogin());
+        return userMapper.userEntityToUserDto(user);
+    }
+
+    public UserDto updateUserInformation(User user, UserDto updateUser) {
+        user.setFirstName(updateUser.getFirstName());
+        user.setLastName(updateUser.getLastName());
+        user.setEmail(updateUser.getEmail());
+        user.setLogin(updateUser.getLogin());
+        user = userRepository.save(user);
+        log.debug("Updated Information for User: {}", user.getLogin());
+        return userMapper.userEntityToUserDto(user);
+    }
+
+    public void changeUserPassword(User user, Map<String, String> payload) {
+        if (!payload.get("password").equals(payload.get("confirmPassword"))) {
+            throw new UserPasswordsNotValidOrNotMatchException("");
+        }
+        if (!passwordEncoder.matches(payload.get("oldPassword"), user.getPassword())) {
+            throw new UserPasswordsNotValidOrNotMatchException("Старый пароль введен неправильно");
+        }
+        user.setPassword(passwordEncoder.encode(payload.get("password")));
+        log.debug("Changed password for User: {}", user.getLogin());
+        userRepository.save(user);
+
+        mailService.sendChangePasswordMail(user);
+    }
+
+    public boolean requestUserPasswordReset(String email) {
+        User user = userRepository.findOneByEmailIgnoreCase(email);
+        if (user == null) {
+            throw new UserNotFoundException(email);
+        }
+        if (!user.getActivated()) {
+            throw new UserNotActivatedException();
+        }
+        user.setResetKey(UserUtils.generateResetKey());
+        user.setResetDate(new Date());
+        user = userRepository.save(user);
+        mailService.sendPasswordResetMail(user);
+        log.debug("Created Reset Password Request for User: {}", user.getLogin());
+        return true;
+    }
+
+    public boolean completeUserPasswordReset(String key, UserResetPasswordDto userResetPasswordDto) {
+        if (!userResetPasswordDto.isPasswordsValid()) {
+            throw new UserPasswordsNotValidOrNotMatchException("");
+        }
+        User user = userRepository.findOneByResetKey(key);
+        if (user == null) {
+            throw new UserResetKeyError(key);
+        }
+        user.setPassword(passwordEncoder.encode(userResetPasswordDto.getPassword()));
+        user.setResetKey(null);
+        user.setResetDate(null);
+        user = userRepository.save(user);
+        log.debug("Reset Password for User: {}", user.getLogin());
+        return true;
+    }
+
+    public UserDto deleteUser(Integer userId) {
+        final User user = userRepository.findOne(userId);
+        if (user == null) {
+            throw new UserNotFoundException(userId.toString());
+        }
+        if (applicationProperties.getUndeadUserLogin().equalsIgnoreCase(user.getLogin())) {
+            throw new UserIsUndeadException(user.getLogin());
+        }
+        userRepository.delete(user);
+        log.debug("Deleted User: {}", user.getLogin());
+        return userMapper.userEntityToUserDto(user);
+    }
+
+    @Override
+    public UserDetails loadUserByUsername(String username) {
+        final User user = userRepository.findOneByLoginIgnoreCase(username);
+        if (user == null) {
+            throw new UserNotFoundException(username);
+        }
+        if (!user.getActivated()) {
+            throw new UserNotActivatedException();
+        }
+        return new org.springframework.security.core.userdetails.User(user.getLogin(),
+                user.getPassword(),
+                Optional.ofNullable(user.getRoles()).orElse(Collections.emptySet()).stream()
+                        .map(role -> new SimpleGrantedAuthority(role.getName()))
+                        .collect(Collectors.toList()));
+    }
+
+    public List<User> findByIds(List<Integer> ids) {
+        return userRepository.findAll(ids);
+    }
+
+    public User findById(Integer id) {
+        return userRepository.findOne(id);
+    }
+
+    public User getCurrentUser() {
+        String login = UserUtils.getCurrentUserLogin();
+        User user = userRepository.findOneByLoginIgnoreCase(login);
+        if (user == null) {
+            throw new UserNotFoundException(login);
+        }
+        return user;
+    }
+
+    public List<User> filterByAgeAndDegree(boolean hasDegree, boolean hasAge) {
+        return userRepository.filterByAgeAndDegree(hasDegree, hasAge);
+    }
+
+    public void inviteUser(String email) throws UserSendingMailException {
+        if (userRepository.findOneByEmailIgnoreCase(email) != null) {
+            throw new UserEmailExistsException(email);
+        }
+
+        String password = UserUtils.generatePassword();
+
+        User user = new User();
+        user.setPassword(passwordEncoder.encode(password));
+        user.setLogin(email);
+        user.setEmail(email);
+        user.setFirstName("user");
+        user.setLastName("user");
+        user.setActivated(true);
+        userRepository.save(user);
+
+        Map<String, Object> variables = ImmutableMap.of("password", password, "email", email);
+        try {
+            mailService.sendInviteMail(variables, email);
+        } catch (MessagingException | MailException e) {
+            throw new UserSendingMailException(email);
+        }
+    }
+
+    public User findOneByLoginIgnoreCase(String login) {
+        return userRepository.findOneByLoginIgnoreCase(login);
+    }
+}
diff --git a/src/main/resources/drivers/chromedriver b/src/main/resources/drivers/chromedriver
old mode 100644
new mode 100755
diff --git a/src/main/resources/drivers/geckodriver b/src/main/resources/drivers/geckodriver
old mode 100644
new mode 100755

From 82e454a50b8b209d0e0eb771e62ea3a864c0dbcc Mon Sep 17 00:00:00 2001
From: ASH <anastasiansh@gmail.com>
Date: Thu, 23 May 2019 16:17:04 +0400
Subject: [PATCH 27/74] #104 mod tests generate task

---
 .../ulstu/students/service/TaskService.java   |  4 ++-
 .../students/service/TaskServiceTest.java     | 26 ++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ru/ulstu/students/service/TaskService.java b/src/main/java/ru/ulstu/students/service/TaskService.java
index 379314d..d080d37 100644
--- a/src/main/java/ru/ulstu/students/service/TaskService.java
+++ b/src/main/java/ru/ulstu/students/service/TaskService.java
@@ -186,7 +186,7 @@ public class TaskService {
     }
 
     @Transactional
-    public void generateYearTasks() {
+    public List<Task> generateYearTasks() {
         Set<Tag> tags = checkRepeatingTags(false);
         List<Task> tasks = new ArrayList<>();
         tags.forEach(tag -> {
@@ -202,7 +202,9 @@ public class TaskService {
                 Task newTask = copyTaskWithNewYear(task);
                 taskRepository.save(newTask);
             });
+            return tasks;
         }
+        return null;
     }
 
 
diff --git a/src/test/java/ru/ulstu/students/service/TaskServiceTest.java b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
index 19eff12..1ba04c4 100644
--- a/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
+++ b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
@@ -21,6 +21,7 @@ import ru.ulstu.timeline.service.EventService;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
@@ -157,16 +158,35 @@ public class TaskServiceTest {
 
     @Test
     public void generateYearTasks() {
-        when(taskService.checkRepeatingTags(false)).thenReturn(repeatingTags);
+        when(tagService.getTags()).thenReturn(tags);
+        tasks.get(0).setTags(tags);
+        when(taskRepository.findAllYear(DateUtils.clearTime(DateUtils.addYears(new Date(), -1)))).thenReturn(tasks);
+        tasks.get(0).setCreateDate(DateUtils.clearTime(DateUtils.addYears(new Date(), -1)));
+        when(taskRepository.findByTag(tag)).thenReturn(tasks);
 
+        Task newTask = new Task();
+        newTask.setTitle(tasks.get(0).getTitle());
+        newTask.setTags(tasks.get(0).getTags());
+        newTask.setCreateDate(new Date());
+        newTask.setStatus(Task.TaskStatus.LOADED_FROM_KIAS);
+
+        Deadline newDeadline = new Deadline();
+        newDeadline.setDescription(deadline.getDescription());
+        newDeadline.setDate(DateUtils.addYears(deadline.getDate(), 1));
+        newTask.setDeadlines(Arrays.asList(newDeadline));
+
+        when(taskRepository.save(newTask)).thenReturn(task);
+
+        assertEquals(Arrays.asList(task), taskService.generateYearTasks());
     }
 
     @Test
     public void checkRepeatingTags() {
-        when(tagService.findById(ID)).thenReturn(tag);
+        when(tagService.getTags()).thenReturn(tags);
+        tasks.get(0).setTags(tags);
         when(taskRepository.findAllYear(DateUtils.clearTime(DateUtils.addYears(new Date(), -1)))).thenReturn(tasks);
 
-        assertEquals(tag, taskService.checkRepeatingTags(false));
+        assertEquals(new HashSet<Tag>(Arrays.asList(tag)), taskService.checkRepeatingTags(false));
     }
 
     @Test

From 181086c9db9e7eb5683c520d4a89110d6561b38f Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Thu, 23 May 2019 16:36:48 +0400
Subject: [PATCH 28/74] #120 disable start browser on run application

---
 src/main/java/ru/ulstu/grant/service/KiasService.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/service/KiasService.java b/src/main/java/ru/ulstu/grant/service/KiasService.java
index 6ff0bd9..449b948 100644
--- a/src/main/java/ru/ulstu/grant/service/KiasService.java
+++ b/src/main/java/ru/ulstu/grant/service/KiasService.java
@@ -32,17 +32,16 @@ public class KiasService {
     private final static String DRIVER_TYPE = "webdriver.chrome.driver";
 
     private final UserService userService;
-    private WebDriver webDriver;
 
     public KiasService(UserService userService) {
-        System.setProperty(DRIVER_TYPE, getDriverExecutablePath());
         this.userService = userService;
-        final ChromeOptions chromeOptions = new ChromeOptions();
-        chromeOptions.addArguments("--headless");
-        webDriver = new ChromeDriver(chromeOptions);
     }
 
     public List<GrantDto> getNewGrantsDto() throws ParseException {
+        System.setProperty(DRIVER_TYPE, getDriverExecutablePath());
+        final ChromeOptions chromeOptions = new ChromeOptions();
+        chromeOptions.addArguments("--headless");
+        WebDriver webDriver = new ChromeDriver(chromeOptions);
         webDriver.get(String.format(BASE_URL, CONTEST_STATUS_ID, CONTEST_TYPE, CONTEST_YEAR));
         KiasPage kiasPage = new KiasPage(webDriver);
         List<WebElement> kiasGrants = new ArrayList<>();
@@ -64,7 +63,7 @@ public class KiasService {
             kiasGrants.clear();
         }
         while (kiasPage.checkPagination()); //проверка существования следующей страницы с грантами
-
+        webDriver.quit();
         return newGrants;
     }
 

From ab17b9f1521e498d7bea148935e48cfa675f1b5e Mon Sep 17 00:00:00 2001
From: ASH <anastasiansh@gmail.com>
Date: Thu, 23 May 2019 16:45:09 +0400
Subject: [PATCH 29/74] #104 mod tests period task

---
 .../ulstu/students/service/TaskService.java   |  3 +-
 .../students/service/TaskServiceTest.java     | 47 +++++++++++--------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/main/java/ru/ulstu/students/service/TaskService.java b/src/main/java/ru/ulstu/students/service/TaskService.java
index d080d37..e89aedf 100644
--- a/src/main/java/ru/ulstu/students/service/TaskService.java
+++ b/src/main/java/ru/ulstu/students/service/TaskService.java
@@ -249,8 +249,9 @@ public class TaskService {
     }
 
     @Transactional
-    public void createPeriodTask(Scheduler scheduler) {
+    public Task createPeriodTask(Scheduler scheduler) {
         Task newTask = copyTaskWithNewDates(scheduler.getTask());
         taskRepository.save(newTask);
+        return newTask;
     }
 }
diff --git a/src/test/java/ru/ulstu/students/service/TaskServiceTest.java b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
index 1ba04c4..8edfc77 100644
--- a/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
+++ b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
@@ -10,6 +10,7 @@ import org.springframework.data.domain.Sort;
 import ru.ulstu.core.util.DateUtils;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.service.DeadlineService;
+import ru.ulstu.students.model.Scheduler;
 import ru.ulstu.students.model.Task;
 import ru.ulstu.students.model.TaskDto;
 import ru.ulstu.students.model.TaskFilterDto;
@@ -26,7 +27,6 @@ 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;
@@ -64,14 +64,12 @@ public class TaskServiceTest {
     private List<Task> tasks;
     private List<Tag> tags;
     private Task task;
-    private TaskFilterDto filterDto;
+    private Task taskForSchedule;
     private TaskDto taskDto;
-    private List<TaskDto> tasksDto;
     private Tag tag;
-    private Tag tagNull;
     private Deadline deadline;
     private List<Deadline> deadlines;
-    private Set<Tag> repeatingTags;
+    private Scheduler scheduler;
 
 
     @Before
@@ -102,8 +100,14 @@ public class TaskServiceTest {
         tasks.add(task);
         taskDto = new TaskDto(task);
 
-        repeatingTags = new HashSet<>();
-        repeatingTags.add(tag);
+        taskForSchedule = new Task();
+        taskForSchedule.setTitle(TITLE);
+        taskForSchedule.setDescription(DESCR);
+
+        scheduler = new Scheduler();
+        scheduler.setDate(new Date());
+        scheduler.setTask(taskForSchedule);
+
 
     }
 
@@ -171,8 +175,10 @@ public class TaskServiceTest {
         newTask.setStatus(Task.TaskStatus.LOADED_FROM_KIAS);
 
         Deadline newDeadline = new Deadline();
+        newDeadline.setId(ID);
         newDeadline.setDescription(deadline.getDescription());
         newDeadline.setDate(DateUtils.addYears(deadline.getDate(), 1));
+        when(deadlineService.create(newDeadline)).thenReturn(newDeadline);
         newTask.setDeadlines(Arrays.asList(newDeadline));
 
         when(taskRepository.save(newTask)).thenReturn(task);
@@ -189,19 +195,22 @@ public class TaskServiceTest {
         assertEquals(new HashSet<Tag>(Arrays.asList(tag)), taskService.checkRepeatingTags(false));
     }
 
-    @Test
-    public void getTaskStatuses() {
-    }
-
-    @Test
-    public void getTags() {
-    }
-
-    @Test
-    public void findTasksByTag() {
-    }
-
     @Test
     public void createPeriodTask() {
+        Task newTask = new Task();
+        newTask.setTitle(scheduler.getTask().getTitle());
+        newTask.setTags(scheduler.getTask().getTags());
+        newTask.setCreateDate(new Date());
+
+        Deadline newDeadline = new Deadline();
+        newDeadline.setId(ID);
+        newDeadline.setDescription(deadline.getDescription());
+        newDeadline.setDate(DateUtils.addYears(deadline.getDate(), 1));
+        when(deadlineService.create(newDeadline)).thenReturn(newDeadline);
+        newTask.setDeadlines(Arrays.asList(newDeadline));
+
+        when(taskRepository.save(newTask)).thenReturn(taskForSchedule);
+
+        assertEquals(taskForSchedule, taskService.createPeriodTask(scheduler));
     }
 }
\ No newline at end of file

From 512a805e8c4c4fa26cb58027ff2efc173e179c4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=20=D0=9C?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B8=D1=8F?= <semenovamasha98@mail.ru>
Date: Thu, 23 May 2019 17:26:22 +0400
Subject: [PATCH 30/74] #127 references formatting

---
 .../paper/controller/PaperController.java     |  5 +++
 .../ru/ulstu/paper/service/PaperService.java  | 11 +++++
 src/main/resources/public/css/paper.css       |  4 ++
 src/main/resources/public/js/core.js          |  1 +
 .../resources/templates/papers/paper.html     | 45 +++++++++++++++++++
 5 files changed, 66 insertions(+)

diff --git a/src/main/java/ru/ulstu/paper/controller/PaperController.java b/src/main/java/ru/ulstu/paper/controller/PaperController.java
index beae772..e10135f 100644
--- a/src/main/java/ru/ulstu/paper/controller/PaperController.java
+++ b/src/main/java/ru/ulstu/paper/controller/PaperController.java
@@ -157,6 +157,11 @@ public class PaperController {
         return new ResponseEntity<>(latexService.generatePdfFromLatexFile(paper), headers, HttpStatus.OK);
     }
 
+    @PostMapping("/getFormattedReferences")
+    public ResponseEntity<String> getFormattedReferences(PaperDto paperDto) {
+        return new ResponseEntity<>(paperService.getFormattedReferences(paperDto), new HttpHeaders(), HttpStatus.OK);
+    }
+
     private void filterEmptyDeadlines(PaperDto paperDto) {
         paperDto.setDeadlines(paperDto.getDeadlines().stream()
                 .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index 8658015..8a59486 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -344,6 +344,17 @@ public class PaperService {
                 : getSpringerReference(referenceDto);
     }
 
+    public String getFormattedReferences(PaperDto paperDto) {
+        return String.join("\r\n", paperDto.getReferences()
+                .stream()
+                .filter(r -> !r.getDeleted())
+                .map(r -> {
+                    r.setFormatStandard(paperDto.getFormatStandard());
+                    return getFormattedReference(r);
+                })
+                .collect(Collectors.toList()));
+    }
+
     public String getGostReference(ReferenceDto referenceDto) {
         return MessageFormat.format(referenceDto.getReferenceType() == BOOK ? "{0} {1} - {2}{3}. - {4}с." : "{0} {1}{5} {2}{3}. С. {4}.",
                 referenceDto.getAuthors(),
diff --git a/src/main/resources/public/css/paper.css b/src/main/resources/public/css/paper.css
index 1be8c1f..386c5af 100644
--- a/src/main/resources/public/css/paper.css
+++ b/src/main/resources/public/css/paper.css
@@ -26,4 +26,8 @@
 
 #nav-references a:hover {
     text-decoration: none;
+}
+
+#nav-references #formattedReferencesArea {
+    height: 150px;
 }
\ No newline at end of file
diff --git a/src/main/resources/public/js/core.js b/src/main/resources/public/js/core.js
index 58e68f4..cc42258 100644
--- a/src/main/resources/public/js/core.js
+++ b/src/main/resources/public/js/core.js
@@ -4,6 +4,7 @@
 var urlFileUpload = "/api/1.0/files/uploadTmpFile";
 var urlFileDownload = "/api/1.0/files/download/";
 var urlPdfGenerating = "/papers/generatePdf";
+var urlReferencesFormatting = "/papers/getFormattedReferences";
 var urlFileDownloadTmp = "/api/1.0/files/download-tmp/";
 
 /* exported MessageTypesEnum */
diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html
index ef4217d..e80fe85 100644
--- a/src/main/resources/templates/papers/paper.html
+++ b/src/main/resources/templates/papers/paper.html
@@ -260,7 +260,33 @@
                                                        class="btn btn-primary"
                                                        value="Добавить источник"/>
                                             </div>
+                                            <div class="form-group">
+                                                <div class="col-12 form-group">
+                                                    <label for="formatStandard">Стандарт форматирования:</label>
 
+                                                    <select class="form-control" th:field="*{formatStandard}"
+                                                            id="formatStandard">
+                                                        <option th:each="standard : ${allFormatStandards}"
+                                                                th:value="${standard}"
+                                                                th:text="${standard.standardName}">standard
+                                                        </option>
+                                                    </select>
+
+                                                </div>
+
+                                                <div class="col-12 form-group">
+                                                    <button id="formatBtn" class="btn btn-primary text-uppercase"
+                                                            onclick="getFormattedReferences()"
+                                                            type="button">
+                                                        Форматировать
+                                                    </button>
+                                                </div>
+
+                                                <div class="col-12">
+                                                    <textarea class="form-control"
+                                                              id="formattedReferencesArea"></textarea>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -474,6 +500,25 @@
                 $('#pdfBtn').prop('disabled', false);
             }
         }
+
+        function getFormattedReferences() {
+
+            var formData = new FormData(document.forms.paperform);
+            var xhr = new XMLHttpRequest();
+            xhr.open("POST", urlReferencesFormatting);
+            console.log(formData);
+            xhr.send(formData);
+
+            xhr.onload = function () {
+                if (this.status == 200) {
+                    console.debug(this.response);
+                    $('#formattedReferencesArea').val(this.response);
+
+                } else {
+                    showFeedbackMessage("Ошибка при форматировании списка литературы", MessageTypesEnum.DANGER);
+                }
+            }
+        }
     </script>
 </div>
 

From 24a1276005ecaac2d95bd0ca20ad5eddd353c778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=20=D0=9C?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B8=D1=8F?= <semenovamasha98@mail.ru>
Date: Fri, 24 May 2019 00:14:46 +0400
Subject: [PATCH 31/74] #127 autocomplete

---
 .../paper/controller/PaperController.java     |   6 +
 .../ulstu/paper/model/AutoCompleteData.java   |  42 ++++++
 .../paper/repository/ReferenceRepository.java |  15 ++
 .../ru/ulstu/paper/service/PaperService.java  |  10 ++
 src/main/resources/public/css/paper.css       |   7 +
 .../resources/templates/papers/paper.html     | 139 ++++++++++++------
 6 files changed, 172 insertions(+), 47 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/paper/model/AutoCompleteData.java

diff --git a/src/main/java/ru/ulstu/paper/controller/PaperController.java b/src/main/java/ru/ulstu/paper/controller/PaperController.java
index e10135f..29da57d 100644
--- a/src/main/java/ru/ulstu/paper/controller/PaperController.java
+++ b/src/main/java/ru/ulstu/paper/controller/PaperController.java
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import ru.ulstu.conference.service.ConferenceService;
 import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.paper.model.AutoCompleteData;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.paper.model.PaperListDto;
@@ -162,6 +163,11 @@ public class PaperController {
         return new ResponseEntity<>(paperService.getFormattedReferences(paperDto), new HttpHeaders(), HttpStatus.OK);
     }
 
+    @ModelAttribute("autocompleteData")
+    public AutoCompleteData getAutocompleteData() {
+        return paperService.getAutoCompleteData();
+    }
+
     private void filterEmptyDeadlines(PaperDto paperDto) {
         paperDto.setDeadlines(paperDto.getDeadlines().stream()
                 .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
diff --git a/src/main/java/ru/ulstu/paper/model/AutoCompleteData.java b/src/main/java/ru/ulstu/paper/model/AutoCompleteData.java
new file mode 100644
index 0000000..b70a780
--- /dev/null
+++ b/src/main/java/ru/ulstu/paper/model/AutoCompleteData.java
@@ -0,0 +1,42 @@
+package ru.ulstu.paper.model;
+
+import java.util.ArrayList;
+
+public class AutoCompleteData {
+    ArrayList<String> authors = new ArrayList<>();
+    ArrayList<String> publicationTitles = new ArrayList<>();
+    ArrayList<String> publishers = new ArrayList<>();
+    ArrayList<String> journalOrCollectionTitles = new ArrayList<>();
+
+    public ArrayList<String> getAuthors() {
+        return authors;
+    }
+
+    public void setAuthors(ArrayList<String> authors) {
+        this.authors = authors;
+    }
+
+    public ArrayList<String> getPublicationTitles() {
+        return publicationTitles;
+    }
+
+    public void setPublicationTitles(ArrayList<String> publicationTitles) {
+        this.publicationTitles = publicationTitles;
+    }
+
+    public ArrayList<String> getPublishers() {
+        return publishers;
+    }
+
+    public void setPublishers(ArrayList<String> publishers) {
+        this.publishers = publishers;
+    }
+
+    public ArrayList<String> getJournalOrCollectionTitles() {
+        return journalOrCollectionTitles;
+    }
+
+    public void setJournalOrCollectionTitles(ArrayList<String> journalOrCollectionTitles) {
+        this.journalOrCollectionTitles = journalOrCollectionTitles;
+    }
+}
diff --git a/src/main/java/ru/ulstu/paper/repository/ReferenceRepository.java b/src/main/java/ru/ulstu/paper/repository/ReferenceRepository.java
index 68e97d4..1d4321b 100644
--- a/src/main/java/ru/ulstu/paper/repository/ReferenceRepository.java
+++ b/src/main/java/ru/ulstu/paper/repository/ReferenceRepository.java
@@ -1,8 +1,23 @@
 package ru.ulstu.paper.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import ru.ulstu.paper.model.Reference;
 
+import java.util.ArrayList;
+
 public interface ReferenceRepository extends JpaRepository<Reference, Integer> {
     void deleteById(Integer id);
+
+    @Query("SELECT DISTINCT r.authors FROM Reference r")
+    ArrayList<String> findDistinctAuthors();
+
+    @Query("SELECT DISTINCT r.publicationTitle FROM Reference r")
+    ArrayList<String> findDistinctPublicationTitles();
+
+    @Query("SELECT DISTINCT r.publisher FROM Reference r")
+    ArrayList<String> findDistinctPublishers();
+
+    @Query("SELECT DISTINCT r.journalOrCollectionTitle FROM Reference r where r.journalOrCollectionTitle <> ''")
+    ArrayList<String> findDistinctJournalOrCollectionTitles();
 }
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index 8a59486..f452c2f 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -7,6 +7,7 @@ import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.file.model.FileDataDto;
 import ru.ulstu.file.service.FileService;
+import ru.ulstu.paper.model.AutoCompleteData;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.paper.model.PaperListDto;
@@ -378,4 +379,13 @@ public class PaperService {
     public List<Paper> findAllCompletedByType(Paper.PaperType type) {
         return paperRepository.findByTypeAndStatus(type, Paper.PaperStatus.COMPLETED);
     }
+
+    public AutoCompleteData getAutoCompleteData() {
+        AutoCompleteData autoCompleteData = new AutoCompleteData();
+        autoCompleteData.setAuthors(referenceRepository.findDistinctAuthors());
+        autoCompleteData.setJournalOrCollectionTitles(referenceRepository.findDistinctJournalOrCollectionTitles());
+        autoCompleteData.setPublicationTitles(referenceRepository.findDistinctPublicationTitles());
+        autoCompleteData.setPublishers(referenceRepository.findDistinctPublishers());
+        return autoCompleteData;
+    }
 }
diff --git a/src/main/resources/public/css/paper.css b/src/main/resources/public/css/paper.css
index 386c5af..b4b3f85 100644
--- a/src/main/resources/public/css/paper.css
+++ b/src/main/resources/public/css/paper.css
@@ -30,4 +30,11 @@
 
 #nav-references #formattedReferencesArea {
     height: 150px;
+}
+
+.ui-autocomplete {
+    max-height: 200px;
+    max-width: 400px;
+    overflow-y: scroll;
+    overflow-x: hidden;
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html
index e80fe85..2755aba 100644
--- a/src/main/resources/templates/papers/paper.html
+++ b/src/main/resources/templates/papers/paper.html
@@ -4,6 +4,10 @@
       layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
 <head>
     <link rel="stylesheet" href="../css/paper.css"/>
+
+    <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"/>
+    <script type="text/javascript" src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+
 </head>
 <body>
 
@@ -74,54 +78,56 @@
                                                       th:field="*{comment}"></textarea>
                                         </div>
 
-                                <div class="form-group">
-                                    <label for="title">Ссылка на сайт конференции:</label>
-                                    <input class="form-control" id="url" type="text"
-                                           placeholder="Url"
-                                           th:field="*{url}"/>
-                                </div>
+                                        <div class="form-group">
+                                            <label for="title">Ссылка на сайт конференции:</label>
+                                            <input class="form-control" id="url" type="text"
+                                                   placeholder="Url"
+                                                   th:field="*{url}"/>
+                                        </div>
 
-                                <div class="form-group">
-                                    <label>Дедлайны:</label>
-                                    <div class="row" th:each="deadline, rowStat : *{deadlines}">
-                                        <input type="hidden" th:field="*{deadlines[__${rowStat.index}__].id}"/>
-                                        <div class="col-6">
-                                            <input type="date" class="form-control" name="deadline"
-                                                   th:field="*{deadlines[__${rowStat.index}__].date}"/>
-                                        </div>
-                                        <div class="col-4">
-                                            <input class="form-control" type="text" placeholder="Описание"
-                                                   th:field="*{deadlines[__${rowStat.index}__].description}"/>
-                                        </div>
-                                        <div class="col-2">
-                                            <a class="btn btn-danger float-right"
-                                               th:onclick="|$('#deadlines${rowStat.index}\\.description').val('');
+                                        <div class="form-group">
+                                            <label>Дедлайны:</label>
+                                            <div class="row" th:each="deadline, rowStat : *{deadlines}">
+                                                <input type="hidden" th:field="*{deadlines[__${rowStat.index}__].id}"/>
+                                                <div class="col-6">
+                                                    <input type="date" class="form-control" name="deadline"
+                                                           th:field="*{deadlines[__${rowStat.index}__].date}"/>
+                                                </div>
+                                                <div class="col-4">
+                                                    <input class="form-control" type="text" placeholder="Описание"
+                                                           th:field="*{deadlines[__${rowStat.index}__].description}"/>
+                                                </div>
+                                                <div class="col-2">
+                                                    <a class="btn btn-danger float-right"
+                                                       th:onclick="|$('#deadlines${rowStat.index}\\.description').val('');
                                                 $('#deadlines${rowStat.index}\\.date').val('');
                                                 $('#addDeadline').click();|"><span
-                                                    aria-hidden="true"><i class="fa fa-times"/></span>
-                                            </a>
+                                                            aria-hidden="true"><i class="fa fa-times"/></span>
+                                                    </a>
+                                                </div>
+                                            </div>
+                                            <p th:if="${#fields.hasErrors('deadlines')}" th:errors="*{deadlines}"
+                                               class="alert alert-danger">Incorrect title</p>
                                         </div>
-                                    </div>
-                                    <p th:if="${#fields.hasErrors('deadlines')}" th:errors="*{deadlines}"
-                                       class="alert alert-danger">Incorrect title</p>
-                                </div>
-                                <div class="form-group">
-                                    <input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"
-                                           value="Добавить
+                                        <div class="form-group">
+                                            <input type="submit" id="addDeadline" name="addDeadline"
+                                                   class="btn btn-primary"
+                                                   value="Добавить
                                     дедлайн"/>
-                                </div>
-                                <div class="form-group">
-                                    <label>Авторы:</label>
-                                    <select class="selectpicker form-control" multiple="true" data-live-search="true"
-                                            title="-- Выберите авторов --"
-                                            th:field="*{authorIds}">
-                                        <option th:each="author: ${allAuthors}" th:value="${author.id}"
-                                                th:text="${author.lastName}">Status
-                                        </option>
-                                    </select>
-                                    <p th:if="${#fields.hasErrors('authorIds')}" th:errors="*{authorIds}"
-                                       class="alert alert-danger">Incorrect title</p>
-                                </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>Авторы:</label>
+                                            <select class="selectpicker form-control" multiple="true"
+                                                    data-live-search="true"
+                                                    title="-- Выберите авторов --"
+                                                    th:field="*{authorIds}">
+                                                <option th:each="author: ${allAuthors}" th:value="${author.id}"
+                                                        th:text="${author.lastName}">Status
+                                                </option>
+                                            </select>
+                                            <p th:if="${#fields.hasErrors('authorIds')}" th:errors="*{authorIds}"
+                                               class="alert alert-danger">Incorrect title</p>
+                                        </div>
 
                                         <div class="form-group files-list" id="files-list">
                                             <label>Файлы:</label>
@@ -215,14 +221,14 @@
                                                         <div class="form-group col-12">
                                                             <label class="col-4">Авторы:</label>
                                                             <input type="text"
-                                                                   class="form-control col-7"
+                                                                   class="form-control col-7 autocomplete author"
                                                                    name="authors"
                                                                    th:field="*{references[__${rowStat.index}__].authors}"/>
                                                         </div>
                                                         <div class="form-group col-12">
                                                             <label class="col-4 ">Название публикации:</label>
                                                             <input type="text"
-                                                                   class="form-control col-7"
+                                                                   class="form-control col-7  autocomplete publicationTitle"
                                                                    name="publicationTitle"
                                                                    th:field="*{references[__${rowStat.index}__].publicationTitle}"/>
                                                         </div>
@@ -235,7 +241,7 @@
                                                         <div class="form-group col-12">
                                                             <label class="col-4">Издательство:</label>
                                                             <input type="text"
-                                                                   class="form-control col-7"
+                                                                   class="form-control col-7 autocomplete publisher"
                                                                    name="publisher"
                                                                    th:field="*{references[__${rowStat.index}__].publisher}"/>
                                                         </div>
@@ -248,7 +254,7 @@
                                                             <label class="col-4">Название журнала или сборника статей
                                                                 конференции:</label>
                                                             <input type="text"
-                                                                   class="form-control col-7"
+                                                                   class="form-control col-7  autocomplete journalOrCollectionTitle"
                                                                    name="journalOrCollectionTitle"
                                                                    th:field="*{references[__${rowStat.index}__].journalOrCollectionTitle}"/>
                                                         </div>
@@ -519,6 +525,45 @@
                 }
             }
         }
+
+    </script>
+    <script th:inline="javascript">
+        /*<![CDATA[*/
+
+        var autoCompleteData = /*[[${autocompleteData}]]*/ 'default';
+        console.log(autoCompleteData);
+
+
+        $(".autocomplete.author").autocomplete({
+            source: autoCompleteData.authors,
+            minLength: 0,
+        }).focus(function () {
+            $(this).autocomplete("search");
+        });
+
+        $(".autocomplete.publicationTitle").autocomplete({
+            source: autoCompleteData.publicationTitles,
+            minLength: 0,
+        }).focus(function () {
+            $(this).autocomplete("search");
+        });
+
+        $(".autocomplete.publisher").autocomplete({
+            source: autoCompleteData.publishers,
+            minLength: 0,
+        }).focus(function () {
+            $(this).autocomplete("search");
+        });
+
+        $(".autocomplete.journalOrCollectionTitle").autocomplete({
+            source: autoCompleteData.journalOrCollectionTitles,
+            minLength: 0,
+        }).focus(function () {
+            $(this).autocomplete("search");
+        });
+
+
+        /*]]>*/
     </script>
 </div>
 

From 01bcac2680f4b0e64e5fd69b03d3679d7c0bd759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=20=D0=9C?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B8=D1=8F?= <semenovamasha98@mail.ru>
Date: Fri, 24 May 2019 00:26:38 +0400
Subject: [PATCH 32/74] #127 allow nullable year

---
 src/main/java/ru/ulstu/paper/service/PaperService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index f452c2f..cfb1a0a 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -361,7 +361,7 @@ public class PaperService {
                 referenceDto.getAuthors(),
                 referenceDto.getPublicationTitle(),
                 StringUtils.isEmpty(referenceDto.getPublisher()) ? "" : referenceDto.getPublisher() + ", ",
-                referenceDto.getPublicationYear().toString(),
+                referenceDto.getPublicationYear() != null ? referenceDto.getPublicationYear().toString() : "",
                 referenceDto.getPages(),
                 StringUtils.isEmpty(referenceDto.getJournalOrCollectionTitle()) ? "." : " // " + referenceDto.getJournalOrCollectionTitle() + ".");
     }
@@ -369,7 +369,7 @@ public class PaperService {
     public String getSpringerReference(ReferenceDto referenceDto) {
         return MessageFormat.format("{0} ({1}) {2}.{3} {4}pp {5}",
                 referenceDto.getAuthors(),
-                referenceDto.getPublicationYear().toString(),
+                referenceDto.getPublicationYear() != null ? referenceDto.getPublicationYear().toString() : "",
                 referenceDto.getPublicationTitle(),
                 referenceDto.getReferenceType() == ARTICLE ? " " + referenceDto.getJournalOrCollectionTitle() + "," : "",
                 StringUtils.isEmpty(referenceDto.getPublisher()) ? "" : referenceDto.getPublisher() + ", ",

From 8bb9e3a84469d2ff8529a463459f91497cf9600a Mon Sep 17 00:00:00 2001
From: "Artem.Arefev" <a.arefyev@mediasoft.team>
Date: Fri, 24 May 2019 01:52:50 +0400
Subject: [PATCH 33/74] #89 jquery

---
 src/main/resources/public/js/users.js         | 38 +++++++++----------
 .../resources/templates/resetRequest.html     | 12 +++---
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/public/js/users.js b/src/main/resources/public/js/users.js
index 1ea26e3..e31d3ad 100644
--- a/src/main/resources/public/js/users.js
+++ b/src/main/resources/public/js/users.js
@@ -1,7 +1,7 @@
 function changePassword() {
-    oldPassword = document.getElementById("oldPassword").value
-    password = document.getElementById("password").value
-    confirmPassword = document.getElementById("confirmPassword").value
+    oldPassword = $("#oldPassword").val()
+    password = $("#password").val()
+    confirmPassword = $("#confirmPassword").val()
 
     if ([oldPassword.length, password.length, confirmPassword.length].includes(0)) {
         showFeedbackMessage("Заполните все поля", MessageTypesEnum.WARNING);
@@ -23,7 +23,7 @@ function changePassword() {
         }),
         method: "POST",
         success: function() {
-            document.getElementById("closeModalPassword").click();
+            $("#closeModalPassword").click();
                 showFeedbackMessage("Пароль был обновлен", MessageTypesEnum.SUCCESS)
 
         },
@@ -34,7 +34,7 @@ function changePassword() {
 }
 
 function inviteUser() {
-    email = document.getElementById("email").value;
+    email = $("#email").val();
     if (!isEmailValid(email)) {
         showFeedbackMessage("Некорректный почтовый ящик", MessageTypesEnum.WARNING);
         return;
@@ -45,7 +45,7 @@ function inviteUser() {
         contentType: "application/json; charset=utf-8",
         method: "POST",
         success: function() {
-            document.getElementById("closeModalInvite").click();
+            $("#closeModalInvite").click();
             showFeedbackMessage("Пользователь был успешно приглашен", MessageTypesEnum.SUCCESS)
         },
         error: function(errorData) {
@@ -55,13 +55,13 @@ function inviteUser() {
 }
 
 function requestResetPassword() {
-    email = document.getElementById("emailReset").value
+    email = $("#emailReset").val()
 
     if (!isEmailValid(email)) {
         showFeedbackMessage("Некорректный почтовый ящик", MessageTypesEnum.WARNING);
         return;
     }
-    document.getElementById("dvloader").hidden = false;
+    $("#dvloader").show();
 
     $.ajax({
         url:"/api/1.0/users/password-reset-request?email=" + email,
@@ -69,27 +69,27 @@ function requestResetPassword() {
         method: "POST",
         success: function() {
             showFeedbackMessage("Проверочный код был отправлен на указанный почтовый ящик", MessageTypesEnum.SUCCESS)
-            document.getElementById("passwordNew").hidden = false
-            document.getElementById("passwordConfirm").hidden = false
-            document.getElementById("btnReset").hidden = false
-            document.getElementById("resetKey").hidden = false
-            document.getElementById("emailReset").hidden = true
-            document.getElementById("btnSend").hidden = true
-            document.getElementById("dvloader").hidden = true;
+            $("#passwordNew").show()
+            $("#passwordConfirm").show()
+            $("#btnReset").show()
+            $("#resetKey").show()
+            $("#emailReset").hide()
+            $("#btnSend").hide()
+            $("#dvloader").hide()
 
         },
         error: function(errorData) {
             showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING)
-            document.getElementById("dvloader").hidden = true;
+            $("#dvloader").hide()
         }
     })
 
 }
 
 function resetPassword() {
-    passwordNew = document.getElementById("passwordNew").value;
-    passwordConfirm = document.getElementById("passwordConfirm").value;
-    resetKey = document.getElementById("resetKey").value;
+    passwordNew = $("#passwordNew").val();
+    passwordConfirm = $("#passwordConfirm").val();
+    resetKey = $("#resetKey").val();
 
     if ([passwordNew, passwordConfirm, resetKey].includes("")) {
         showFeedbackMessage("Заполните все поля", MessageTypesEnum.WARNING);
diff --git a/src/main/resources/templates/resetRequest.html b/src/main/resources/templates/resetRequest.html
index 73bff76..4a2aeab 100644
--- a/src/main/resources/templates/resetRequest.html
+++ b/src/main/resources/templates/resetRequest.html
@@ -10,7 +10,7 @@
 <nav layout:fragment="navbar">
     <div class="navbar-header">
         <a class="navbar-brand" href="/"><span class="ui-menuitem-text"><i
-                class="fa fa-plane fa-4" aria-hidden="true"></i> Balance</span></a>
+                class="fa fa-plane fa-4" aria-style="display:none"></i> Balance</span></a>
     </div>
 </nav>
 <div layout:fragment="content">
@@ -25,22 +25,22 @@
                     </div>
                     <div class="form-group">
                         <input type="password" name="email" id="passwordNew" class="form-control"
-                               placeholder="Новый пароль" hidden="true"/>
+                               placeholder="Новый пароль" style="display:none"/>
                     </div>
                     <div class="form-group">
                         <input type="password" name="email" id="passwordConfirm" class="form-control"
-                               placeholder="Подтвердите пароль" hidden="true"/>
+                               placeholder="Подтвердите пароль" style="display:none"/>
                     </div>
                     <div class="form-group">
                         <input type="text" name="email" id="resetKey" class="form-control"
-                               placeholder="Код подтверждения" hidden="true"/>
+                               placeholder="Код подтверждения" style="display:none"/>
                     </div>
-                    <div id="dvloader" class="loader" hidden="true"><img src="../img/main/ajax-loader.gif" /></div>
+                    <div id="dvloader" class="loader" style="display:none"><img src="../img/main/ajax-loader.gif" /></div>
                     <button id="btnSend" type="button" onclick="requestResetPassword()"
                             class="btn btn-success btn-block">
                         Отправить код подтверждения
                     </button>
-                    <button id="btnReset" hidden="true" type="button" onclick="resetPassword()"
+                    <button id="btnReset" style="display:none" type="button" onclick="resetPassword()"
                             class="btn btn-success btn-block">
                         Сбросить
                         пароль

From 308da4113d395005204741494b71d85bcf252271 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 24 May 2019 13:26:02 +0400
Subject: [PATCH 34/74] fix week number calculation

---
 .../ru/ulstu/utils/timetable/TimetableService.java  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/ulstu/utils/timetable/TimetableService.java b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
index aa49fed..d65e276 100644
--- a/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
+++ b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
@@ -3,6 +3,7 @@ package ru.ulstu.utils.timetable;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
+import ru.ulstu.core.util.DateUtils;
 import ru.ulstu.utils.timetable.errors.TimetableClientException;
 import ru.ulstu.utils.timetable.model.Lesson;
 import ru.ulstu.utils.timetable.model.TimetableResponse;
@@ -50,9 +51,15 @@ public class TimetableService {
     }
 
     private int getCurrentWeek() {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(new Date());
-        return (cal.get(Calendar.WEEK_OF_YEAR) + 1) % 2;
+        Date currentDate = Calendar.getInstance().getTime();
+        currentDate = DateUtils.clearTime(currentDate);
+
+        Calendar firstJan = Calendar.getInstance();
+        firstJan.set(Calendar.MONTH, 0);
+        firstJan.set(Calendar.DAY_OF_MONTH, 1);
+
+         return (int) Math.round(Math.ceil((((currentDate.getTime() - firstJan.getTime().getTime()) / 86400000)
+                 + DateUtils.addDays(firstJan.getTime(), 1).getTime() / 7) % 2));
     }
 
     private TimetableResponse getTimetableForUser(String userFIO) throws RestClientException {

From 22195813aed9d14e7e7114b723f07be04dbbbbbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=20=D0=9C?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B8=D1=8F?= <semenovamasha98@mail.ru>
Date: Fri, 24 May 2019 16:15:38 +0400
Subject: [PATCH 35/74] #127 fixes

---
 .../ulstu/paper/model/AutoCompleteData.java   | 25 +++++++++---------
 .../paper/repository/ReferenceRepository.java | 10 +++----
 .../ru/ulstu/paper/service/PaperService.java  | 26 +++++++++----------
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/main/java/ru/ulstu/paper/model/AutoCompleteData.java b/src/main/java/ru/ulstu/paper/model/AutoCompleteData.java
index b70a780..91c3bf4 100644
--- a/src/main/java/ru/ulstu/paper/model/AutoCompleteData.java
+++ b/src/main/java/ru/ulstu/paper/model/AutoCompleteData.java
@@ -1,42 +1,43 @@
 package ru.ulstu.paper.model;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class AutoCompleteData {
-    ArrayList<String> authors = new ArrayList<>();
-    ArrayList<String> publicationTitles = new ArrayList<>();
-    ArrayList<String> publishers = new ArrayList<>();
-    ArrayList<String> journalOrCollectionTitles = new ArrayList<>();
+    private List<String> authors = new ArrayList<>();
+    private List<String> publicationTitles = new ArrayList<>();
+    private List<String> publishers = new ArrayList<>();
+    private List<String> journalOrCollectionTitles = new ArrayList<>();
 
-    public ArrayList<String> getAuthors() {
+    public List<String> getAuthors() {
         return authors;
     }
 
-    public void setAuthors(ArrayList<String> authors) {
+    public void setAuthors(List<String> authors) {
         this.authors = authors;
     }
 
-    public ArrayList<String> getPublicationTitles() {
+    public List<String> getPublicationTitles() {
         return publicationTitles;
     }
 
-    public void setPublicationTitles(ArrayList<String> publicationTitles) {
+    public void setPublicationTitles(List<String> publicationTitles) {
         this.publicationTitles = publicationTitles;
     }
 
-    public ArrayList<String> getPublishers() {
+    public List<String> getPublishers() {
         return publishers;
     }
 
-    public void setPublishers(ArrayList<String> publishers) {
+    public void setPublishers(List<String> publishers) {
         this.publishers = publishers;
     }
 
-    public ArrayList<String> getJournalOrCollectionTitles() {
+    public List<String> getJournalOrCollectionTitles() {
         return journalOrCollectionTitles;
     }
 
-    public void setJournalOrCollectionTitles(ArrayList<String> journalOrCollectionTitles) {
+    public void setJournalOrCollectionTitles(List<String> journalOrCollectionTitles) {
         this.journalOrCollectionTitles = journalOrCollectionTitles;
     }
 }
diff --git a/src/main/java/ru/ulstu/paper/repository/ReferenceRepository.java b/src/main/java/ru/ulstu/paper/repository/ReferenceRepository.java
index 1d4321b..942a5b8 100644
--- a/src/main/java/ru/ulstu/paper/repository/ReferenceRepository.java
+++ b/src/main/java/ru/ulstu/paper/repository/ReferenceRepository.java
@@ -4,20 +4,20 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import ru.ulstu.paper.model.Reference;
 
-import java.util.ArrayList;
+import java.util.List;
 
 public interface ReferenceRepository extends JpaRepository<Reference, Integer> {
     void deleteById(Integer id);
 
     @Query("SELECT DISTINCT r.authors FROM Reference r")
-    ArrayList<String> findDistinctAuthors();
+    List<String> findDistinctAuthors();
 
     @Query("SELECT DISTINCT r.publicationTitle FROM Reference r")
-    ArrayList<String> findDistinctPublicationTitles();
+    List<String> findDistinctPublicationTitles();
 
     @Query("SELECT DISTINCT r.publisher FROM Reference r")
-    ArrayList<String> findDistinctPublishers();
+    List<String> findDistinctPublishers();
 
     @Query("SELECT DISTINCT r.journalOrCollectionTitle FROM Reference r where r.journalOrCollectionTitle <> ''")
-    ArrayList<String> findDistinctJournalOrCollectionTitles();
+    List<String> findDistinctJournalOrCollectionTitles();
 }
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index cfb1a0a..2393af4 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -146,13 +146,7 @@ public class PaperService {
     @Transactional
     public Reference updateReference(ReferenceDto referenceDto) {
         Reference updateReference = referenceRepository.findOne(referenceDto.getId());
-        updateReference.setAuthors(referenceDto.getAuthors());
-        updateReference.setJournalOrCollectionTitle(referenceDto.getJournalOrCollectionTitle());
-        updateReference.setPages(referenceDto.getPages());
-        updateReference.setPublicationTitle(referenceDto.getPublicationTitle());
-        updateReference.setPublicationYear(referenceDto.getPublicationYear());
-        updateReference.setPublisher(referenceDto.getPublisher());
-        updateReference.setReferenceType(referenceDto.getReferenceType());
+        copyFromDto(updateReference, referenceDto);
         referenceRepository.save(updateReference);
         return updateReference;
     }
@@ -160,17 +154,21 @@ public class PaperService {
     @Transactional
     public Reference createReference(ReferenceDto referenceDto) {
         Reference newReference = new Reference();
-        newReference.setAuthors(referenceDto.getAuthors());
-        newReference.setJournalOrCollectionTitle(referenceDto.getJournalOrCollectionTitle());
-        newReference.setPages(referenceDto.getPages());
-        newReference.setPublicationTitle(referenceDto.getPublicationTitle());
-        newReference.setPublicationYear(referenceDto.getPublicationYear());
-        newReference.setPublisher(referenceDto.getPublisher());
-        newReference.setReferenceType(referenceDto.getReferenceType());
+        copyFromDto(newReference, referenceDto);
         newReference = referenceRepository.save(newReference);
         return newReference;
     }
 
+    private Reference copyFromDto(Reference reference, ReferenceDto referenceDto) {
+        reference.setAuthors(referenceDto.getAuthors());
+        reference.setJournalOrCollectionTitle(referenceDto.getJournalOrCollectionTitle());
+        reference.setPages(referenceDto.getPages());
+        reference.setPublicationTitle(referenceDto.getPublicationTitle());
+        reference.setPublicationYear(referenceDto.getPublicationYear());
+        reference.setPublisher(referenceDto.getPublisher());
+        reference.setReferenceType(referenceDto.getReferenceType());
+        return reference;
+    }
 
     @Transactional
     public Integer update(PaperDto paperDto) throws IOException {

From 193b2b3a3255f45274f299364e8c398f9f1ce3ad Mon Sep 17 00:00:00 2001
From: "Artem.Arefev" <a.arefyev@mediasoft.team>
Date: Sat, 25 May 2019 14:03:43 +0400
Subject: [PATCH 36/74] #91 using RestTemplate & show error on timetable
 loading exception

---
 .../user/controller/UserMvcController.java    |  2 +-
 .../ru/ulstu/user/service/UserService.java    | 12 +++--
 .../utils/timetable/TimetableService.java     | 48 ++++++++-----------
 .../errors/TimetableClientException.java      |  7 +++
 .../ru/ulstu/utils/timetable/model/Day.java   |  9 ++--
 .../ulstu/utils/timetable/model/Lesson.java   |  5 +-
 .../ulstu/utils/timetable/model/Response.java |  3 +-
 .../timetable/model/TimetableResponse.java    |  2 +-
 .../ru/ulstu/utils/timetable/model/Week.java  |  6 ++-
 src/main/resources/application.properties     |  4 +-
 .../resources/templates/users/dashboard.html  | 13 ++++-
 11 files changed, 63 insertions(+), 48 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/errors/TimetableClientException.java

diff --git a/src/main/java/ru/ulstu/user/controller/UserMvcController.java b/src/main/java/ru/ulstu/user/controller/UserMvcController.java
index d283a21..044bde8 100644
--- a/src/main/java/ru/ulstu/user/controller/UserMvcController.java
+++ b/src/main/java/ru/ulstu/user/controller/UserMvcController.java
@@ -51,6 +51,6 @@ public class UserMvcController extends OdinController<UserListDto, UserDto> {
 
     @GetMapping("/dashboard")
     public void getUsersDashboard(ModelMap modelMap) {
-        modelMap.addAttribute("users", userService.getUsersInfo());
+        modelMap.addAllAttributes(userService.getUsersInfo());
     }
 }
diff --git a/src/main/java/ru/ulstu/user/service/UserService.java b/src/main/java/ru/ulstu/user/service/UserService.java
index 334fbf5..b022866 100644
--- a/src/main/java/ru/ulstu/user/service/UserService.java
+++ b/src/main/java/ru/ulstu/user/service/UserService.java
@@ -42,10 +42,10 @@ import ru.ulstu.user.repository.UserRepository;
 import ru.ulstu.user.repository.UserRoleRepository;
 import ru.ulstu.user.util.UserUtils;
 import ru.ulstu.utils.timetable.TimetableService;
+import ru.ulstu.utils.timetable.errors.TimetableClientException;
 import ru.ulstu.utils.timetable.model.Lesson;
 
 import javax.mail.MessagingException;
-import java.io.IOException;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -358,14 +358,16 @@ public class UserService implements UserDetailsService {
         }
     }
 
-    public List<UserInfoNow> getUsersInfo() {
+    public Map<String, Object> getUsersInfo() {
         List<UserInfoNow> usersInfoNow = new ArrayList<>();
+        String err = "";
+
         for (User user : userRepository.findAll()) {
             Lesson lesson = null;
             try {
                 lesson = timetableService.getCurrentLesson(user.getUserAbbreviate());
-            } catch (IOException e) {
-                e.printStackTrace();
+            } catch (TimetableClientException e) {
+                err = "Не удалось загрузить расписание";
             }
             usersInfoNow.add(new UserInfoNow(
                     lesson,
@@ -374,6 +376,6 @@ public class UserService implements UserDetailsService {
                     userSessionService.isOnline(user))
             );
         }
-        return usersInfoNow;
+        return ImmutableMap.of("users", usersInfoNow, "error", err);
     }
 }
diff --git a/src/main/java/ru/ulstu/utils/timetable/TimetableService.java b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
index f17ea86..aa49fed 100644
--- a/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
+++ b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
@@ -1,15 +1,12 @@
 package ru.ulstu.utils.timetable;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+import ru.ulstu.utils.timetable.errors.TimetableClientException;
 import ru.ulstu.utils.timetable.model.Lesson;
 import ru.ulstu.utils.timetable.model.TimetableResponse;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -17,10 +14,10 @@ import java.util.Date;
 import java.util.List;
 
 public class TimetableService {
-    private static final String TIMETABLE_URL = "http://timetable.athene.tech";
+    private static final String TIMETABLE_URL = "http://timetable.athene.tech/api/1.0/timetable?filter=%s";
     private SimpleDateFormat lessonTimeFormat = new SimpleDateFormat("hh:mm");
 
-    private long[] lessonsStarts = new long[]{
+    private long[] lessonsStarts = new long[] {
             lessonTimeFormat.parse("8:00:00").getTime(),
             lessonTimeFormat.parse("9:40:00").getTime(),
             lessonTimeFormat.parse("11:30:00").getTime(),
@@ -30,7 +27,8 @@ public class TimetableService {
             lessonTimeFormat.parse("18:10:00").getTime(),
     };
 
-    public TimetableService() throws ParseException { }
+    public TimetableService() throws ParseException {
+    }
 
     private int getCurrentDay() {
         Calendar calendar = Calendar.getInstance();
@@ -42,6 +40,7 @@ public class TimetableService {
         long lessonDuration = 90 * 60000;
         Date now = new Date();
         long timeNow = now.getTime() % (24 * 60 * 60 * 1000L);
+
         for (int i = 0; i < lessonsStarts.length; i++) {
             if (timeNow > lessonsStarts[i] && timeNow < lessonsStarts[i] + lessonDuration) {
                 return i;
@@ -56,31 +55,26 @@ public class TimetableService {
         return (cal.get(Calendar.WEEK_OF_YEAR) + 1) % 2;
     }
 
-    private TimetableResponse getTimetableForUser(String userFIO) throws IOException {
-        URL url = new URL(TIMETABLE_URL + "/api/1.0/timetable?filter=" + URLEncoder.encode(userFIO, "UTF-8"));
-        HttpURLConnection con = (HttpURLConnection) url.openConnection();
-        con.setRequestMethod("GET");
-
-        BufferedReader in = new BufferedReader(
-                new InputStreamReader(con.getInputStream()));
-        String inputLine;
-        StringBuilder content = new StringBuilder();
-        while ((inputLine = in.readLine()) != null) {
-            content.append(inputLine);
-        }
-        in.close();
-
-        return new ObjectMapper().readValue(content.toString(), TimetableResponse.class);
+    private TimetableResponse getTimetableForUser(String userFIO) throws RestClientException {
+        RestTemplate restTemplate = new RestTemplate();
+        return restTemplate.getForObject(String.format(TIMETABLE_URL, userFIO), TimetableResponse.class);
     }
 
-    public Lesson getCurrentLesson(String userFio) throws IOException {
-        TimetableResponse response = getTimetableForUser(userFio);
+    public Lesson getCurrentLesson(String userFio)  {
+        TimetableResponse response;
+        try {
+            response = getTimetableForUser(userFio);
+        } catch (RestClientException e) {
+            e.printStackTrace();
+            throw new TimetableClientException(userFio);
+        }
+
         int lessonNumber = getCurrentLessonNumber();
         if (lessonNumber < 0) {
             return null;
         }
 
-        List<Object> lessons = response
+        List<Lesson> lessons = response
                 .getResponse()
                 .getWeeks()
                 .get(getCurrentWeek())
diff --git a/src/main/java/ru/ulstu/utils/timetable/errors/TimetableClientException.java b/src/main/java/ru/ulstu/utils/timetable/errors/TimetableClientException.java
new file mode 100644
index 0000000..4723bda
--- /dev/null
+++ b/src/main/java/ru/ulstu/utils/timetable/errors/TimetableClientException.java
@@ -0,0 +1,7 @@
+package ru.ulstu.utils.timetable.errors;
+
+public class TimetableClientException extends RuntimeException {
+    public TimetableClientException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Day.java b/src/main/java/ru/ulstu/utils/timetable/model/Day.java
index f548462..e4e37f9 100644
--- a/src/main/java/ru/ulstu/utils/timetable/model/Day.java
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Day.java
@@ -1,12 +1,13 @@
 package ru.ulstu.utils.timetable.model;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
-public class Day {
+public class Day  {
 
     private Integer day;
-    private List<List<Object>> lessons = null;
+    private List<List<Lesson>> lessons = new ArrayList<>();
 
     public Integer getDay() {
         return day;
@@ -16,11 +17,11 @@ public class Day {
         this.day = day;
     }
 
-    public List<List<Object>> getLessons() {
+    public List<List<Lesson>> getLessons() {
         return lessons;
     }
 
-    public void setLessons(List<List<Object>> lessons) {
+    public void setLessons(List<List<Lesson>> lessons) {
         this.lessons = lessons;
     }
 }
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java b/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java
index e651e1a..b1b1707 100644
--- a/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java
@@ -1,14 +1,11 @@
 package ru.ulstu.utils.timetable.model;
 
-public class Lesson {
+public class Lesson  {
     private String group;
     private String nameOfLesson;
     private String teacher;
     private String room;
 
-    public Lesson() {
-    }
-
     public String getGroup() {
         return group;
     }
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Response.java b/src/main/java/ru/ulstu/utils/timetable/model/Response.java
index b5b9e97..dfd3a84 100644
--- a/src/main/java/ru/ulstu/utils/timetable/model/Response.java
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Response.java
@@ -1,10 +1,11 @@
 package ru.ulstu.utils.timetable.model;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class Response {
 
-    private List<Week> weeks = null;
+    private List<Week> weeks = new ArrayList<>();
 
     public List<Week> getWeeks() {
         return weeks;
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java b/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java
index 118c979..925d9a8 100644
--- a/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java
+++ b/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java
@@ -1,6 +1,6 @@
 package ru.ulstu.utils.timetable.model;
 
-public class TimetableResponse {
+public class TimetableResponse  {
     private Response response;
     private String error;
 
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Week.java b/src/main/java/ru/ulstu/utils/timetable/model/Week.java
index 19f3c50..8ea76ea 100644
--- a/src/main/java/ru/ulstu/utils/timetable/model/Week.java
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Week.java
@@ -1,10 +1,12 @@
 package ru.ulstu.utils.timetable.model;
 
+import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
-public class Week {
+public class Week implements Serializable {
 
-    private List<Day> days = null;
+    private List<Day> days = new ArrayList<>();
 
     public List<Day> getDays() {
         return days;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 038ddcf..41c8ece 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -24,7 +24,7 @@ spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFact
 # JPA Settings
 spring.datasource.url=jdbc:postgresql://localhost:5432/ng-tracker
 spring.datasource.username=postgres
-spring.datasource.password=postgres
+spring.datasource.password=password
 spring.datasource.driverclassName=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=validate
 # Liquibase Settings
@@ -34,6 +34,6 @@ 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
-ng-tracker.dev-mode=true
+ng-tracker.dev-mode=false
 ng-tracker.use-https=false
 ng-tracker.check-run=false
\ No newline at end of file
diff --git a/src/main/resources/templates/users/dashboard.html b/src/main/resources/templates/users/dashboard.html
index 8236734..e5b7563 100644
--- a/src/main/resources/templates/users/dashboard.html
+++ b/src/main/resources/templates/users/dashboard.html
@@ -3,15 +3,18 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml">
 <head>
+    <script src="/js/core.js"></script>
 </head>
 <body>
-
 <div class="container" layout:fragment="content">
     <section id="services">
         <div class="container">
             <div class="col-lg-12 text-center">
                 <h2 class="section-heading text-uppercase">Пользователи</h2>
             </div>
+            <div class="text-center">
+                <h2 th:text="${error}">teste</h2>
+            </div>
             <div class="row justify-content-center" id="dashboard">
                 <th:block th:each="user : ${users}">
                     <div th:replace="users/fragments/userDashboardFragment :: userDashboard(user=${user})"/>
@@ -19,6 +22,14 @@
             </div>
         </div>
     </section>
+    <script th:inline="javascript">
+        /*<![CDATA[*/
+        $(document).ready(function () {
+            var error = /*[[${error}]]*/
+            showFeedbackMessage(error, MessageTypesEnum.WARNING)
+        });
+        /*]]>*/
+    </script>
 </div>
 </body>
 </html>
\ No newline at end of file

From f4479c2ab7d7d48806cac42361aa970b50cbd2ff Mon Sep 17 00:00:00 2001
From: "Artem.Arefev" <a.arefyev@mediasoft.team>
Date: Sat, 25 May 2019 14:11:57 +0400
Subject: [PATCH 37/74] #91 fixed app properties

---
 src/main/resources/application.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 41c8ece..038ddcf 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -24,7 +24,7 @@ spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFact
 # JPA Settings
 spring.datasource.url=jdbc:postgresql://localhost:5432/ng-tracker
 spring.datasource.username=postgres
-spring.datasource.password=password
+spring.datasource.password=postgres
 spring.datasource.driverclassName=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=validate
 # Liquibase Settings
@@ -34,6 +34,6 @@ 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
-ng-tracker.dev-mode=false
+ng-tracker.dev-mode=true
 ng-tracker.use-https=false
 ng-tracker.check-run=false
\ No newline at end of file

From 59d6edb818c766e4f70776a0cf19de60119b84f2 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Sat, 25 May 2019 15:42:08 +0400
Subject: [PATCH 38/74] #120 refactor

---
 .../java/ru/ulstu/grant/model/GrantDto.java   |  7 +++
 .../java/ru/ulstu/grant/page/KiasPage.java    | 54 ++++++++++++------
 .../ru/ulstu/grant/service/KiasService.java   | 49 +++++++---------
 src/test/java/IndexKiasTest.java              | 56 -------------------
 src/test/java/grant/KiasPage.java             | 41 --------------
 5 files changed, 63 insertions(+), 144 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/model/GrantDto.java b/src/main/java/ru/ulstu/grant/model/GrantDto.java
index 5a561b1..9e59d86 100644
--- a/src/main/java/ru/ulstu/grant/model/GrantDto.java
+++ b/src/main/java/ru/ulstu/grant/model/GrantDto.java
@@ -12,6 +12,7 @@ import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.user.model.UserDto;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -96,6 +97,12 @@ public class GrantDto extends NameContainer {
         this.papers = convert(grant.getPapers(), PaperDto::new);
     }
 
+    public GrantDto(String grantTitle, Date deadLineDate) {
+        this.title = grantTitle;
+        deadlines.add(new Deadline(deadLineDate, "Окончание приёма заявок"));
+        status = Grant.GrantStatus.LOADED_FROM_KIAS;
+    }
+
     public Integer getId() {
         return id;
     }
diff --git a/src/main/java/ru/ulstu/grant/page/KiasPage.java b/src/main/java/ru/ulstu/grant/page/KiasPage.java
index 4353684..8a6e444 100644
--- a/src/main/java/ru/ulstu/grant/page/KiasPage.java
+++ b/src/main/java/ru/ulstu/grant/page/KiasPage.java
@@ -3,34 +3,31 @@ package ru.ulstu.grant.page;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
+import ru.ulstu.grant.model.GrantDto;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.NoSuchElementException;
 
 public class KiasPage {
     private WebDriver driver;
+
     public KiasPage(WebDriver webDriver) {
         this.driver = webDriver;
     }
 
-    public List<WebElement> getGrants() {
-        List<WebElement> grants = new ArrayList<>();
+    public List<GrantDto> getKiasGrants() throws ParseException {
+        List<GrantDto> newGrants = new ArrayList<>();
         do {
-            grants.addAll(getPageOfGrants());
-        }
-        while (checkPagination());
-
-        return grants;
+            newGrants.addAll(getGrantsFromPage());
+        } while (goToNextPage()); //проверка существования следующей страницы с грантами
+        return newGrants;
     }
 
-    public List<WebElement> getPageOfGrants() {
-        WebElement listContest = driver.findElement(By.tagName("tBody"));
-        List<WebElement> grants = listContest.findElements(By.cssSelector("tr.tr"));
-        return grants;
-    }
-
-    public boolean checkPagination() {
+    private boolean goToNextPage() {
         try {
             if (driver.findElements(By.id("js-ctrlNext")).size() > 0) {
                 driver.findElement(By.id("js-ctrlNext")).click();
@@ -42,11 +39,34 @@ public class KiasPage {
         return false;
     }
 
-    public String getGrantTitle(WebElement grant) {
+    private List<WebElement> getPageOfGrants() {
+        WebElement listContest = driver.findElement(By.tagName("tBody"));
+        List<WebElement> grants = listContest.findElements(By.cssSelector("tr.tr"));
+        return grants;
+    }
+
+    private String getGrantTitle(WebElement grant) {
         return grant.findElement(By.cssSelector("td.tertiary")).findElement(By.tagName("a")).getText();
     }
 
-    public String getFirstDeadline(WebElement grant) {
-        return grant.findElement(By.xpath("./td[5]")).getText();
+    private List<GrantDto> getGrantsFromPage() throws ParseException {
+        List<GrantDto> grants = new ArrayList<>();
+        for (WebElement grantElement : getPageOfGrants()) {
+            GrantDto grantDto = new GrantDto(
+                    getGrantTitle(grantElement),
+                    parseDeadLineDate(grantElement));
+            grants.add(grantDto);
+        }
+        return grants;
+    }
+
+    private Date parseDeadLineDate(WebElement grantElement) throws ParseException {
+        String deadlineDate = getFirstDeadline(grantElement); //10.06.2019 23:59
+        SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+        return formatter.parse(deadlineDate);
+    }
+
+    private String getFirstDeadline(WebElement grantElement) {
+        return grantElement.findElement(By.xpath("./td[5]")).getText();
     }
 }
diff --git a/src/main/java/ru/ulstu/grant/service/KiasService.java b/src/main/java/ru/ulstu/grant/service/KiasService.java
index 449b948..6881292 100644
--- a/src/main/java/ru/ulstu/grant/service/KiasService.java
+++ b/src/main/java/ru/ulstu/grant/service/KiasService.java
@@ -1,22 +1,17 @@
 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 org.springframework.stereotype.Service;
-import ru.ulstu.deadline.model.Deadline;
-import ru.ulstu.grant.model.Grant;
 import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.page.KiasPage;
 import ru.ulstu.user.service.UserService;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 
 @Service
@@ -24,7 +19,6 @@ 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 int CONTEST_YEAR = Calendar.getInstance().get(Calendar.YEAR);
 
     private final static String DRIVER_LOCATION = "drivers/%s";
     private final static String WINDOWS_DRIVER = "chromedriver.exe";
@@ -38,33 +32,28 @@ public class KiasService {
     }
 
     public List<GrantDto> getNewGrantsDto() throws ParseException {
+        WebDriver webDriver = getDriver();
+        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(new KiasPage(webDriver).getKiasGrants());
+        }
+        grants.forEach(grantDto -> grantDto.setLeaderId(leaderId));
+        webDriver.quit();
+        return grants;
+    }
+
+    private List<Integer> generateGrantYears() {
+        return Arrays.asList(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.YEAR) + 1);
+    }
+
+    private WebDriver getDriver() {
         System.setProperty(DRIVER_TYPE, getDriverExecutablePath());
         final ChromeOptions chromeOptions = new ChromeOptions();
         chromeOptions.addArguments("--headless");
-        WebDriver webDriver = new ChromeDriver(chromeOptions);
-        webDriver.get(String.format(BASE_URL, CONTEST_STATUS_ID, CONTEST_TYPE, CONTEST_YEAR));
-        KiasPage kiasPage = new KiasPage(webDriver);
-        List<WebElement> kiasGrants = new ArrayList<>();
-        List<GrantDto> newGrants = new ArrayList<>();
-        do {
-            kiasGrants.addAll(kiasPage.getPageOfGrants());
-            for (WebElement grant : kiasGrants) {
-                GrantDto grantDto = new GrantDto();
-                grantDto.setTitle(kiasPage.getGrantTitle(grant));
-                String deadlineDate = kiasPage.getFirstDeadline(grant); //10.06.2019 23:59
-                SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy HH:mm");
-                Date date = formatter.parse(deadlineDate);
-                Deadline deadline = new Deadline(date, "Окончание приёма заявок");
-                grantDto.setDeadlines(Arrays.asList(deadline));
-                grantDto.setLeaderId(userService.findOneByLoginIgnoreCase("admin").getId());
-                grantDto.setStatus(Grant.GrantStatus.LOADED_FROM_KIAS);
-                newGrants.add(grantDto);
-            }
-            kiasGrants.clear();
-        }
-        while (kiasPage.checkPagination()); //проверка существования следующей страницы с грантами
-        webDriver.quit();
-        return newGrants;
+        return new ChromeDriver(chromeOptions);
     }
 
     private String getDriverExecutablePath() {
diff --git a/src/test/java/IndexKiasTest.java b/src/test/java/IndexKiasTest.java
index 73dc646..8228e76 100644
--- a/src/test/java/IndexKiasTest.java
+++ b/src/test/java/IndexKiasTest.java
@@ -1,67 +1,11 @@
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import core.PageObject;
 import core.TestTemplate;
-import grant.KiasPage;
 import org.junit.runner.RunWith;
-import org.openqa.selenium.WebElement;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import ru.ulstu.NgTrackerApplication;
-import ru.ulstu.deadline.model.Deadline;
-import ru.ulstu.grant.model.Grant;
-import ru.ulstu.grant.model.GrantDto;
-import ru.ulstu.user.repository.UserRepository;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 public class IndexKiasTest extends TestTemplate {
-    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 CONTEST_YEAR = "2019";
 
-    private final Map<PageObject, List<String>> navigationHolder = ImmutableMap.of(
-            new KiasPage(), Arrays.asList("Поиск по конкурсам",
-                    String.format(BASE_URL, CONTEST_STATUS_ID, CONTEST_TYPE, CONTEST_YEAR))
-    );
-
-    @Autowired
-    UserRepository userRepository;
-
-    public List<GrantDto> getNewGrantsDto() throws ParseException {
-        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
-        getContext().goTo(page.getValue().get(1));
-        KiasPage kiasPage = (KiasPage) getContext().initPage(page.getKey());
-        List<WebElement> kiasGrants = new ArrayList<>();
-        List<GrantDto> newGrants = new ArrayList<>();
-        do {
-            kiasGrants.addAll(kiasPage.getPageOfGrants());
-            for (WebElement grant : kiasGrants) {
-                GrantDto grantDto = new GrantDto();
-                grantDto.setTitle(kiasPage.getGrantTitle(grant));
-                String deadlineDate = kiasPage.getFirstDeadline(grant); //10.06.2019 23:59
-                SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy HH:mm");
-                Date date = formatter.parse(deadlineDate);
-                Deadline deadline = new Deadline(date, "Окончание приёма заявок");
-                grantDto.setDeadlines(Arrays.asList(deadline));
-                grantDto.setLeaderId(userRepository.findOneByLoginIgnoreCase("admin").getId());
-                grantDto.setStatus(Grant.GrantStatus.LOADED_FROM_KIAS);
-                newGrants.add(grantDto);
-            }
-            kiasGrants.clear();
-        }
-        while (kiasPage.checkPagination()); //проверка существования следующей страницы с грантами
-
-        return newGrants;
-    }
 }
diff --git a/src/test/java/grant/KiasPage.java b/src/test/java/grant/KiasPage.java
index 7723b01..5864511 100644
--- a/src/test/java/grant/KiasPage.java
+++ b/src/test/java/grant/KiasPage.java
@@ -2,51 +2,10 @@ package grant;
 
 import core.PageObject;
 import org.openqa.selenium.By;
-import org.openqa.selenium.WebElement;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
 
 public class KiasPage extends PageObject {
     @Override
     public String getSubTitle() {
         return driver.findElement(By.tagName("h1")).getText();
     }
-
-    public List<WebElement> getGrants() {
-        List<WebElement> grants = new ArrayList<>();
-        do {
-            grants.addAll(getPageOfGrants());
-        }
-        while (checkPagination());
-
-        return grants;
-    }
-
-    public List<WebElement> getPageOfGrants() {
-        WebElement listContest = driver.findElement(By.tagName("tBody"));
-        List<WebElement> grants = listContest.findElements(By.cssSelector("tr.tr"));
-        return grants;
-    }
-
-    public boolean checkPagination() {
-        try {
-            if (driver.findElements(By.id("js-ctrlNext")).size() > 0) {
-                driver.findElement(By.id("js-ctrlNext")).click();
-                return true;
-            }
-        } catch (NoSuchElementException e) {
-            return false;
-        }
-        return false;
-    }
-
-    public String getGrantTitle(WebElement grant) {
-        return grant.findElement(By.cssSelector("td.tertiary")).findElement(By.tagName("a")).getText();
-    }
-
-    public String getFirstDeadline(WebElement grant) {
-        return grant.findElement(By.xpath("./td[5]")).getText();
-    }
 }

From 477a9fd6ffbff5d4128d31f298cc1212a4f0cc0b Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Sat, 25 May 2019 15:48:32 +0400
Subject: [PATCH 39/74] #120 move to service

---
 .../java/ru/ulstu/grant/page/KiasPage.java    | 29 +++----------------
 .../ru/ulstu/grant/service/KiasService.java   | 23 ++++++++++++++-
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/page/KiasPage.java b/src/main/java/ru/ulstu/grant/page/KiasPage.java
index 8a6e444..ea9bdb4 100644
--- a/src/main/java/ru/ulstu/grant/page/KiasPage.java
+++ b/src/main/java/ru/ulstu/grant/page/KiasPage.java
@@ -3,11 +3,9 @@ package ru.ulstu.grant.page;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import ru.ulstu.grant.model.GrantDto;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -19,15 +17,7 @@ public class KiasPage {
         this.driver = webDriver;
     }
 
-    public List<GrantDto> getKiasGrants() throws ParseException {
-        List<GrantDto> newGrants = new ArrayList<>();
-        do {
-            newGrants.addAll(getGrantsFromPage());
-        } while (goToNextPage()); //проверка существования следующей страницы с грантами
-        return newGrants;
-    }
-
-    private boolean goToNextPage() {
+    public boolean goToNextPage() {
         try {
             if (driver.findElements(By.id("js-ctrlNext")).size() > 0) {
                 driver.findElement(By.id("js-ctrlNext")).click();
@@ -39,28 +29,17 @@ public class KiasPage {
         return false;
     }
 
-    private List<WebElement> getPageOfGrants() {
+    public List<WebElement> getPageOfGrants() {
         WebElement listContest = driver.findElement(By.tagName("tBody"));
         List<WebElement> grants = listContest.findElements(By.cssSelector("tr.tr"));
         return grants;
     }
 
-    private String getGrantTitle(WebElement grant) {
+    public String getGrantTitle(WebElement grant) {
         return grant.findElement(By.cssSelector("td.tertiary")).findElement(By.tagName("a")).getText();
     }
 
-    private List<GrantDto> getGrantsFromPage() throws ParseException {
-        List<GrantDto> grants = new ArrayList<>();
-        for (WebElement grantElement : getPageOfGrants()) {
-            GrantDto grantDto = new GrantDto(
-                    getGrantTitle(grantElement),
-                    parseDeadLineDate(grantElement));
-            grants.add(grantDto);
-        }
-        return grants;
-    }
-
-    private Date parseDeadLineDate(WebElement grantElement) throws ParseException {
+    public Date parseDeadLineDate(WebElement grantElement) throws ParseException {
         String deadlineDate = getFirstDeadline(grantElement); //10.06.2019 23:59
         SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy HH:mm");
         return formatter.parse(deadlineDate);
diff --git a/src/main/java/ru/ulstu/grant/service/KiasService.java b/src/main/java/ru/ulstu/grant/service/KiasService.java
index 6881292..618e83c 100644
--- a/src/main/java/ru/ulstu/grant/service/KiasService.java
+++ b/src/main/java/ru/ulstu/grant/service/KiasService.java
@@ -1,6 +1,7 @@
 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 org.springframework.stereotype.Service;
@@ -37,13 +38,33 @@ public class KiasService {
         List<GrantDto> grants = new ArrayList<>();
         for (Integer year : generateGrantYears()) {
             webDriver.get(String.format(BASE_URL, CONTEST_STATUS_ID, CONTEST_TYPE, year));
-            grants.addAll(new KiasPage(webDriver).getKiasGrants());
+            grants.addAll(getKiasGrants(webDriver));
         }
         grants.forEach(grantDto -> grantDto.setLeaderId(leaderId));
         webDriver.quit();
         return grants;
     }
 
+    public List<GrantDto> getKiasGrants(WebDriver webDriver) throws ParseException {
+        List<GrantDto> newGrants = new ArrayList<>();
+        KiasPage kiasPage = new KiasPage(webDriver);
+        do {
+            newGrants.addAll(getGrantsFromPage(kiasPage));
+        } while (kiasPage.goToNextPage()); //проверка существования следующей страницы с грантами
+        return newGrants;
+    }
+
+    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);
+        }
+        return grants;
+    }
+
     private List<Integer> generateGrantYears() {
         return Arrays.asList(Calendar.getInstance().get(Calendar.YEAR),
                 Calendar.getInstance().get(Calendar.YEAR) + 1);

From 916bbae41494d0420a4aaede0c633d3730ca4806 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Sat, 25 May 2019 21:15:21 +0400
Subject: [PATCH 40/74] #120 add debug email

---
 .../ulstu/configuration/ApplicationProperties.java  | 10 ++++++++++
 .../java/ru/ulstu/user/service/MailService.java     | 13 ++++++++++---
 src/main/resources/application.properties           |  1 +
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/ulstu/configuration/ApplicationProperties.java b/src/main/java/ru/ulstu/configuration/ApplicationProperties.java
index f75f53f..49efac4 100644
--- a/src/main/java/ru/ulstu/configuration/ApplicationProperties.java
+++ b/src/main/java/ru/ulstu/configuration/ApplicationProperties.java
@@ -21,6 +21,8 @@ public class ApplicationProperties {
 
     private boolean checkRun;
 
+    private String debugEmail;
+
     public boolean isUseHttps() {
         return useHttps;
     }
@@ -60,4 +62,12 @@ public class ApplicationProperties {
     public void setCheckRun(boolean checkRun) {
         this.checkRun = checkRun;
     }
+
+    public String getDebugEmail() {
+        return debugEmail;
+    }
+
+    public void setDebugEmail(String debugEmail) {
+        this.debugEmail = debugEmail;
+    }
 }
diff --git a/src/main/java/ru/ulstu/user/service/MailService.java b/src/main/java/ru/ulstu/user/service/MailService.java
index 864b749..3724792 100644
--- a/src/main/java/ru/ulstu/user/service/MailService.java
+++ b/src/main/java/ru/ulstu/user/service/MailService.java
@@ -1,5 +1,6 @@
 package ru.ulstu.user.service;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.mail.MailProperties;
@@ -21,11 +22,9 @@ import java.util.Map;
 
 @Service
 public class MailService {
-    private final Logger log = LoggerFactory.getLogger(MailService.class);
-
     private static final String USER = "user";
     private static final String BASE_URL = "baseUrl";
-
+    private final Logger log = LoggerFactory.getLogger(MailService.class);
     private final JavaMailSender javaMailSender;
     private final SpringTemplateEngine templateEngine;
     private final MailProperties mailProperties;
@@ -48,10 +47,18 @@ public class MailService {
         message.setFrom(mailProperties.getUsername());
         message.setSubject(subject);
         message.setText(content, true);
+        modifyForDebug(message, subject);
         javaMailSender.send(mimeMessage);
         log.debug("Sent email to User '{}'", to);
     }
 
+    private void modifyForDebug(MimeMessageHelper message, String originalSubject) throws MessagingException {
+        if (!StringUtils.isEmpty(applicationProperties.getDebugEmail())) {
+            message.setTo(applicationProperties.getDebugEmail());
+            message.setSubject("To " + applicationProperties.getDebugEmail() + "; " + originalSubject);
+        }
+    }
+
     @Async
     public void sendEmailFromTemplate(User user, String templateName, String subject) {
         Context context = new Context();
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 038ddcf..cdd7569 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -35,5 +35,6 @@ liquibase.change-log=classpath:db/changelog-master.xml
 ng-tracker.base-url=http://127.0.0.1:8080
 ng-tracker.undead-user-login=admin
 ng-tracker.dev-mode=true
+ng-tracker.debug_email=romanov73@gmail.com
 ng-tracker.use-https=false
 ng-tracker.check-run=false
\ No newline at end of file

From 678397e970099cb6c655cc3ece6f43c3a47abf30 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Sat, 25 May 2019 21:15:54 +0400
Subject: [PATCH 41/74] #120 test classes refactor

---
 .../{IndexConferenceTest.java => ConferenceTest.java} |  2 +-
 src/test/java/IndexKiasTest.java                      | 11 -----------
 .../java/{IndexTaskTest.java => StudentTaskTest.java} |  2 +-
 3 files changed, 2 insertions(+), 13 deletions(-)
 rename src/test/java/{IndexConferenceTest.java => ConferenceTest.java} (99%)
 delete mode 100644 src/test/java/IndexKiasTest.java
 rename src/test/java/{IndexTaskTest.java => StudentTaskTest.java} (99%)

diff --git a/src/test/java/IndexConferenceTest.java b/src/test/java/ConferenceTest.java
similarity index 99%
rename from src/test/java/IndexConferenceTest.java
rename to src/test/java/ConferenceTest.java
index 269561f..3fae34b 100644
--- a/src/test/java/IndexConferenceTest.java
+++ b/src/test/java/ConferenceTest.java
@@ -26,7 +26,7 @@ import java.util.Map;
 @RunWith(SpringRunner.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-public class IndexConferenceTest extends TestTemplate {
+public class ConferenceTest extends TestTemplate {
     private final Map<PageObject, List<String>> navigationHolder = ImmutableMap.of(
             new ConferencesPage(), Arrays.asList("КОНФЕРЕНЦИИ", "/conferences/conferences"),
             new ConferencePage(), Arrays.asList("РЕДАКТИРОВАНИЕ КОНФЕРЕНЦИИ", "/conferences/conference?id=0"),
diff --git a/src/test/java/IndexKiasTest.java b/src/test/java/IndexKiasTest.java
deleted file mode 100644
index 8228e76..0000000
--- a/src/test/java/IndexKiasTest.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import core.TestTemplate;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-import ru.ulstu.NgTrackerApplication;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-public class IndexKiasTest extends TestTemplate {
-
-}
diff --git a/src/test/java/IndexTaskTest.java b/src/test/java/StudentTaskTest.java
similarity index 99%
rename from src/test/java/IndexTaskTest.java
rename to src/test/java/StudentTaskTest.java
index 51b5e07..f15b55c 100644
--- a/src/test/java/IndexTaskTest.java
+++ b/src/test/java/StudentTaskTest.java
@@ -24,7 +24,7 @@ import java.util.Map;
 @RunWith(SpringRunner.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-public class IndexTaskTest extends TestTemplate {
+public class StudentTaskTest extends TestTemplate {
     private final Map<PageObject, List<String>> navigationHolder = ImmutableMap.of(
             new TasksPage(), Arrays.asList("Список задач", "/students/tasks"),
             new TasksDashboardPage(), Arrays.asList("Панель управления", "/students/dashboard"),

From 828d320e0f9f9d38b6beca019c9cdf3b97245a49 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Sat, 25 May 2019 21:16:26 +0400
Subject: [PATCH 42/74] #120 try to run test in docker

---
 .gitlab-ci.yml                                  | 2 +-
 src/main/java/ru/ulstu/grant/page/KiasPage.java | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb4c0ed..6709891 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ checkRun:
 
 checkStyle:
   stage: test
-  script: ./gradlew check -x test
+  script: ./gradlew check
 
 deploy:
   stage: deploy
diff --git a/src/main/java/ru/ulstu/grant/page/KiasPage.java b/src/main/java/ru/ulstu/grant/page/KiasPage.java
index ea9bdb4..631f5db 100644
--- a/src/main/java/ru/ulstu/grant/page/KiasPage.java
+++ b/src/main/java/ru/ulstu/grant/page/KiasPage.java
@@ -8,9 +8,9 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-import java.util.NoSuchElementException;
 
 public class KiasPage {
+    private final static String KIAS_GRANT_DATE_FORMAT = "dd.MM.yyyy HH:mm";
     private WebDriver driver;
 
     public KiasPage(WebDriver webDriver) {
@@ -23,10 +23,9 @@ public class KiasPage {
                 driver.findElement(By.id("js-ctrlNext")).click();
                 return true;
             }
-        } catch (NoSuchElementException e) {
+        } finally {
             return false;
         }
-        return false;
     }
 
     public List<WebElement> getPageOfGrants() {
@@ -41,7 +40,7 @@ public class KiasPage {
 
     public Date parseDeadLineDate(WebElement grantElement) throws ParseException {
         String deadlineDate = getFirstDeadline(grantElement); //10.06.2019 23:59
-        SimpleDateFormat formatter = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+        SimpleDateFormat formatter = new SimpleDateFormat(KIAS_GRANT_DATE_FORMAT);
         return formatter.parse(deadlineDate);
     }
 

From 280c39dae4ddc76db07b21e5d12dbc2d47c59ca9 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Sat, 25 May 2019 21:32:20 +0400
Subject: [PATCH 43/74] #120 fix variable

---
 src/test/java/StudentTaskTest.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/java/StudentTaskTest.java b/src/test/java/StudentTaskTest.java
index f15b55c..f55a679 100644
--- a/src/test/java/StudentTaskTest.java
+++ b/src/test/java/StudentTaskTest.java
@@ -31,7 +31,7 @@ public class StudentTaskTest extends TestTemplate {
             new TaskPage(), Arrays.asList("Создать задачу", "/students/task?id=0")
     );
 
-    private final String TAG = "ATag";
+    private final String tag = "ATag";
 
     @Autowired
     private ApplicationProperties applicationProperties;
@@ -168,13 +168,13 @@ public class StudentTaskTest extends TestTemplate {
         String taskName = "Task " + (new Date()).getTime();
 
         taskPage.setName(taskName);
-        taskPage.setTag(TAG);
+        taskPage.setTag(tag);
         Thread.sleep(1000);
         taskPage.addDeadlineDate("01.01.2020", 0);
         taskPage.addDeadlineDescription("Description", 0);
         taskPage.save();
 
-        Assert.assertTrue(tasksPage.findTaskByTag(taskName, TAG));
+        Assert.assertTrue(tasksPage.findTaskByTag(taskName, tag));
     }
 
     @Test
@@ -185,7 +185,7 @@ public class StudentTaskTest extends TestTemplate {
         TasksPage tasksPage = (TasksPage) getContext().initPage(page.getKey());
 
 
-        Assert.assertTrue(tasksPage.findTag(TAG));
+        Assert.assertTrue(tasksPage.findTag(tag));
     }
 
     @Test
@@ -194,9 +194,9 @@ public class StudentTaskTest extends TestTemplate {
 
         getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
         TasksPage tasksPage = (TasksPage) getContext().initPage(page.getKey());
-        tasksPage.selectTag(TAG);
+        tasksPage.selectTag(tag);
 
-        Assert.assertTrue(tasksPage.findTasksByTag(TAG));
+        Assert.assertTrue(tasksPage.findTasksByTag(tag));
     }
 
     @Test

From 0cd3055176e76f2214478755da97830d44ee6bc9 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Sat, 25 May 2019 21:33:06 +0400
Subject: [PATCH 44/74] #120 disable tests

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6709891..fb4c0ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ checkRun:
 
 checkStyle:
   stage: test
-  script: ./gradlew check
+  script: ./gradlew check -x test
 
 deploy:
   stage: deploy

From 336a16ff73938acb32188a0f55caca3577961c16 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Mon, 27 May 2019 09:14:24 +0400
Subject: [PATCH 45/74] some refactor

---
 .../grant/controller/GrantController.java     |  2 +-
 src/main/java/ru/ulstu/grant/model/Grant.java |  7 ++--
 .../grant/repository/GrantRepository.java     |  3 ++
 .../ulstu/grant/service/GrantScheduler.java   |  2 +-
 .../ru/ulstu/grant/service/GrantService.java  | 19 +++++----
 .../java/ru/ulstu/timeline/model/Event.java   |  4 +-
 src/main/resources/application.properties     |  2 +-
 .../grants/fragments/grantLineFragment.html   |  3 +-
 .../resources/templates/grants/grant.html     | 42 +------------------
 .../papers/fragments/paperLineFragment.html   |  3 +-
 10 files changed, 27 insertions(+), 60 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/controller/GrantController.java b/src/main/java/ru/ulstu/grant/controller/GrantController.java
index 91b0f91..a9c01ed 100644
--- a/src/main/java/ru/ulstu/grant/controller/GrantController.java
+++ b/src/main/java/ru/ulstu/grant/controller/GrantController.java
@@ -43,7 +43,7 @@ public class GrantController {
 
     @GetMapping("/dashboard")
     public void getDashboard(ModelMap modelMap) {
-        modelMap.put("grants", grantService.findAllDto());
+        modelMap.put("grants", grantService.findAllActiveDto());
     }
 
     @GetMapping("/grant")
diff --git a/src/main/java/ru/ulstu/grant/model/Grant.java b/src/main/java/ru/ulstu/grant/model/Grant.java
index e0cd9be..369568f 100644
--- a/src/main/java/ru/ulstu/grant/model/Grant.java
+++ b/src/main/java/ru/ulstu/grant/model/Grant.java
@@ -43,7 +43,8 @@ public class Grant extends BaseEntity implements UserContainer {
         IN_WORK("В работе"),
         COMPLETED("Завершен"),
         FAILED("Провалены сроки"),
-        LOADED_FROM_KIAS("Загружен автоматически");
+        LOADED_FROM_KIAS("Загружен автоматически"),
+        SKIPPED("Не интересует");
 
         private String statusName;
 
@@ -62,14 +63,14 @@ public class Grant extends BaseEntity implements UserContainer {
     @Enumerated(value = EnumType.STRING)
     private GrantStatus status = GrantStatus.APPLICATION;
 
-    @OneToMany(cascade = CascadeType.ALL)
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     @JoinColumn(name = "grant_id")
     @OrderBy("date")
     private List<Deadline> deadlines = new ArrayList<>();
 
     private String comment;
 
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     @JoinColumn(name = "grant_id", unique = true)
     @Fetch(FetchMode.SUBSELECT)
     private List<FileData> files = new ArrayList<>();
diff --git a/src/main/java/ru/ulstu/grant/repository/GrantRepository.java b/src/main/java/ru/ulstu/grant/repository/GrantRepository.java
index ae9fcc8..876a8c1 100644
--- a/src/main/java/ru/ulstu/grant/repository/GrantRepository.java
+++ b/src/main/java/ru/ulstu/grant/repository/GrantRepository.java
@@ -17,4 +17,7 @@ public interface GrantRepository extends JpaRepository<Grant, Integer>, BaseRepo
     @Override
     @Query("SELECT title FROM Grant g WHERE (g.title = :name) AND (:id IS NULL OR g.id != :id) ")
     String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
+
+    @Query("SELECT g FROM Grant g WHERE (g.status <> 'SKIPPED') AND (g.status <> 'COMPLETED')")
+    List<Grant> findAllActive();
 }
diff --git a/src/main/java/ru/ulstu/grant/service/GrantScheduler.java b/src/main/java/ru/ulstu/grant/service/GrantScheduler.java
index fb236af..a2950a6 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantScheduler.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantScheduler.java
@@ -31,7 +31,7 @@ public class GrantScheduler {
         log.debug("GrantScheduler.checkDeadlineBeforeWeek finished");
     }
 
-    @Scheduled(cron = "0 0 8 1 * ?", zone = "Europe/Samara")
+    @Scheduled(cron = "0 0 8 * * ?", zone = "Europe/Samara")
     public void loadGrantsFromKias() {
         log.debug("GrantScheduler.loadGrantsFromKias started");
         try {
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index 8d65da7..86f8f1b 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -41,7 +41,6 @@ import static ru.ulstu.grant.model.Grant.GrantStatus.APPLICATION;
 
 @Service
 public class GrantService extends BaseService {
-    private final static int MAX_DISPLAY_SIZE = 50;
     private final Logger log = LoggerFactory.getLogger(GrantService.class);
 
     private final GrantRepository grantRepository;
@@ -80,9 +79,7 @@ public class GrantService extends BaseService {
     }
 
     public List<GrantDto> findAllDto() {
-        List<GrantDto> grants = convert(findAll(), GrantDto::new);
-        grants.forEach(grantDto -> grantDto.setTitle(StringUtils.abbreviate(grantDto.getTitle(), MAX_DISPLAY_SIZE)));
-        return grants;
+        return convert(findAll(), GrantDto::new);
     }
 
     public GrantDto findOneDto(Integer id) {
@@ -273,11 +270,7 @@ public class GrantService extends BaseService {
     }
 
     public List<PaperDto> getAllUncompletedPapers() {
-        List<PaperDto> papers = paperService.findAllNotCompleted();
-        papers.stream()
-                .forEach(paper ->
-                        paper.setTitle(StringUtils.abbreviate(paper.getTitle(), MAX_DISPLAY_SIZE)));
-        return papers;
+        return paperService.findAllNotCompleted();
     }
 
     public void attachPaper(GrantDto grantDto) {
@@ -335,4 +328,12 @@ public class GrantService extends BaseService {
             }
         }
     }
+
+    public List<GrantDto> findAllActiveDto() {
+        return convert(findAllActive(), GrantDto::new);
+    }
+
+    private List<Grant> findAllActive() {
+        return grantRepository.findAllActive();
+    }
 }
diff --git a/src/main/java/ru/ulstu/timeline/model/Event.java b/src/main/java/ru/ulstu/timeline/model/Event.java
index e56c91c..8038f0b 100644
--- a/src/main/java/ru/ulstu/timeline/model/Event.java
+++ b/src/main/java/ru/ulstu/timeline/model/Event.java
@@ -65,8 +65,8 @@ public class Event extends BaseEntity {
 
     private String description;
 
-    @ManyToMany(fetch = FetchType.EAGER)
-    private List<User> recipients = new ArrayList<User>();
+    @ManyToMany(fetch = FetchType.LAZY)
+    private List<User> recipients = new ArrayList<>();
 
     @ManyToOne
     @JoinColumn(name = "child_id")
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index cdd7569..f4be778 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -35,6 +35,6 @@ liquibase.change-log=classpath:db/changelog-master.xml
 ng-tracker.base-url=http://127.0.0.1:8080
 ng-tracker.undead-user-login=admin
 ng-tracker.dev-mode=true
-ng-tracker.debug_email=romanov73@gmail.com
+ng-tracker.debug_email=
 ng-tracker.use-https=false
 ng-tracker.check-run=false
\ No newline at end of file
diff --git a/src/main/resources/templates/grants/fragments/grantLineFragment.html b/src/main/resources/templates/grants/fragments/grantLineFragment.html
index dda0e8d..877f1d7 100644
--- a/src/main/resources/templates/grants/fragments/grantLineFragment.html
+++ b/src/main/resources/templates/grants/fragments/grantLineFragment.html
@@ -8,7 +8,8 @@
     <div class="col">
         <span th:replace="grants/fragments/grantStatusFragment :: grantStatus(grantStatus=${grant.status})"/>
         <a th:href="@{'grant?id='+${grant.id}}">
-            <span class="h6" th:text="${grant.title}"/>
+            <span class="h6" th:if="${#strings.length(grant.title) > 50}" th:text="${#strings.substring(grant.title, 0, 50)} + '...'" th:title="${grant.title}"/>
+            <span class="h6" th:if="${#strings.length(grant.title) le 50}" th:text="${grant.title}" th:title="${grant.title}"/>
             <span class="text-muted" th:text="${grant.authorsString}"/>
         </a>
         <input class="id-class" type="hidden" th:value="${grant.id}"/>
diff --git a/src/main/resources/templates/grants/grant.html b/src/main/resources/templates/grants/grant.html
index 38047bf..acb7f7b 100644
--- a/src/main/resources/templates/grants/grant.html
+++ b/src/main/resources/templates/grants/grant.html
@@ -186,47 +186,7 @@
                                     <div class="row">
                                         <div class="form-control list-group div-selected-papers" id="selected-papers">
                                             <div th:each="paper, rowStat : *{papers}">
-                                                <input type="hidden" th:field="*{papers[__${rowStat.index}__].id}"/>
-                                                <div class="col">
-                                                    <a th:href="@{'/papers/paper?id=' + *{papers[__${rowStat.index}__].id} + ''}">
-                                                        <img class="icon-paper" src="/img/conference/paper.png"/>
-                                                        <span th:text="*{papers[__${rowStat.index}__].title}">
-                                                        Название статьи
-                                                        </span>
-                                                    </a>
-                                                </div>
-                                                <div class="col">
-                                                    <label>Статус: </label>
-                                                    <span th:text="*{papers[__${rowStat.index}__].status.statusName}">
-                                                        Статус статьи
-                                                    </span>
-                                                </div>
-                                                <!--
-                                                <div class="col" th:unless="${#lists.isEmpty(paper.grants)}">
-                                                    <label>Гранты: </label>
-                                                    <div th:each="grant, grantRowStat : *{papers[__${rowStat.index}__].grants}"
-                                                         th:remove="tag">
-                                                        <div th:unless="${grant.id}==*{id}" th:remove="tag">
-                                                            <li>
-                                                                <a th:href="@{'/grants/grant?id=' + ${grant.id} + ''}">
-                                                                    <span th:text="${grant.title} "></span>
-                                                                </a>
-                                                            </li>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="col" th:unless="${#lists.isEmpty(paper.conferences)}">
-                                                    <label>Конференции: </label>
-                                                    <div th:each="conference, conferenceRowStat : *{papers[__${rowStat.index}__].conferences}"
-                                                         th:remove="tag">
-                                                        <li>
-                                                            <a th:href="@{'/conferences/conference?id=' + ${conference.id} + ''}">
-                                                                <span th:text="${conference.title}"></span>
-                                                            </a>
-                                                        </li>
-                                                    </div>
-                                                </div>
-                                                -->
+                                                <div th:replace="papers/fragments/paperLineFragment :: paperLine(paper=${paper})"/>
                                             </div>
                                         </div>
                                     </div>
diff --git a/src/main/resources/templates/papers/fragments/paperLineFragment.html b/src/main/resources/templates/papers/fragments/paperLineFragment.html
index b703859..40d9c34 100644
--- a/src/main/resources/templates/papers/fragments/paperLineFragment.html
+++ b/src/main/resources/templates/papers/fragments/paperLineFragment.html
@@ -8,7 +8,8 @@
     <div class="col">
         <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status})"/>
         <a th:href="@{'paper?id='+${paper.id}}">
-            <span class="h6" th:text="${paper.title}"/>
+            <span class="h6" th:if="${#strings.length(paper.title)} > 50" th:text="${#strings.substring(paper.title, 0, 50) + '...'}" th:title="${paper.title}"/>
+            <span class="h6" th:if="${#strings.length(paper.title) le 50}" th:text="${paper.title}" th:title="${paper.title}"/>
             <span class="text-muted" th:text="${paper.authorsString}"/>
         </a>
         <input class="id-class" type="hidden" th:value="${paper.id}"/>

From 4eeb79ab80fedec0b8d69dc901cb5d9cb326e312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 27 May 2019 09:19:52 +0300
Subject: [PATCH 46/74] #98 changelog edited

---
 .../java/ru/ulstu/deadline/model/Deadline.java     | 10 +++++-----
 .../db/changelog-20190517_000001-schema.xml        | 14 ++++++++++++++
 src/main/resources/db/changelog-master.xml         |  1 +
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20190517_000001-schema.xml

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 5ab9f47..4dfebef 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -20,7 +20,7 @@ public class Deadline extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
-    private String executor;
+    private Integer executor;
     private Boolean done;
 
     public Deadline() {
@@ -31,7 +31,7 @@ public class Deadline extends BaseEntity {
         this.description = description;
     }
 
-    public Deadline(Date deadlineDate, String description, String executor, Boolean done) {
+    public Deadline(Date deadlineDate, String description, Integer executor, Boolean done) {
         this.date = deadlineDate;
         this.description = description;
         this.executor = executor;
@@ -42,7 +42,7 @@ public class Deadline extends BaseEntity {
     public Deadline(@JsonProperty("id") Integer id,
                     @JsonProperty("description") String description,
                     @JsonProperty("date") Date date,
-                    @JsonProperty("executor") String executor,
+                    @JsonProperty("executor") Integer executor,
                     @JsonProperty("done") Boolean done) {
         this.setId(id);
         this.description = description;
@@ -67,11 +67,11 @@ public class Deadline extends BaseEntity {
         this.date = date;
     }
 
-    public String getExecutor() {
+    public Integer getExecutor() {
         return executor;
     }
 
-    public void setExecutor(String executor) {
+    public void setExecutor(Integer executor) {
         this.executor = executor;
     }
 
diff --git a/src/main/resources/db/changelog-20190517_000001-schema.xml b/src/main/resources/db/changelog-20190517_000001-schema.xml
new file mode 100644
index 0000000..73c6435
--- /dev/null
+++ b/src/main/resources/db/changelog-20190517_000001-schema.xml
@@ -0,0 +1,14 @@
+<?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="anton" id="20190517_000001-1">
+        <modifyDataType tableName="deadline"
+                        columnName="executor"
+                        newDataType="integer"
+                        schemaName="public"/>
+        <addForeignKeyConstraint baseTableName="deadline" baseColumnNames="executor"
+                                 constraintName="fk_deadline_executor" referencedTableName="users"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 1cab67b..d81f1cb 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -44,4 +44,5 @@
     <include file="db/changelog-20190507_000000-schema.xml"/>
     <include file="db/changelog-20190507_000001-schema.xml"/>
     <include file="db/changelog-20190511_000000-schema.xml"/>
+    <include file="db/changelog-20190517_000001-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file

From 7388e12e3f5d50ab6278f99e96ff0d49046b9ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 27 May 2019 18:19:31 +0300
Subject: [PATCH 47/74] #98 edited project executors

---
 .../project/controller/ProjectController.java |  6 +++++
 .../java/ru/ulstu/project/model/Project.java  |  9 ++++++-
 .../ru/ulstu/project/model/ProjectDto.java    | 24 ++++++++++++++++++-
 .../ulstu/project/service/ProjectService.java | 13 +++++++++-
 .../resources/templates/projects/project.html |  9 +++++--
 5 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ru/ulstu/project/controller/ProjectController.java b/src/main/java/ru/ulstu/project/controller/ProjectController.java
index 14b8736..88f0c7a 100644
--- a/src/main/java/ru/ulstu/project/controller/ProjectController.java
+++ b/src/main/java/ru/ulstu/project/controller/ProjectController.java
@@ -13,6 +13,7 @@ import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.project.service.ProjectService;
+import ru.ulstu.user.model.User;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
@@ -92,6 +93,11 @@ public class ProjectController {
         return String.format("redirect:%s", "/projects/projects");
     }
 
+    @ModelAttribute("allExecutors")
+    public List<User> getAllExecutors(ProjectDto projectDto) {
+        return projectService.getProjectExecutors(projectDto);
+    }
+
     private void filterEmptyDeadlines(ProjectDto projectDto) {
         projectDto.setDeadlines(projectDto.getDeadlines().stream()
                 .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java
index acf0d0f..f061221 100644
--- a/src/main/java/ru/ulstu/project/model/Project.java
+++ b/src/main/java/ru/ulstu/project/model/Project.java
@@ -2,6 +2,7 @@ package ru.ulstu.project.model;
 
 import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.UserContainer;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
 import ru.ulstu.grant.model.Grant;
@@ -23,7 +24,8 @@ import java.util.List;
 import java.util.Set;
 
 @Entity
-public class Project extends BaseEntity {
+public class Project extends BaseEntity implements UserContainer {
+
     public enum ProjectStatus {
         APPLICATION("Заявка"),
         ON_COMPETITION("Отправлен на конкурс"),
@@ -133,4 +135,9 @@ public class Project extends BaseEntity {
     public void setExecutors(Set<User> executors) {
         this.executors = executors;
     }
+
+    @Override
+    public Set<User> getUsers() {
+        return getExecutors();
+    }
 }
diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index 0f86e1a..0292f1f 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -29,6 +29,8 @@ public class ProjectDto {
     private List<Integer> removedDeadlineIds = new ArrayList<>();
     private Set<Integer> executorIds;
     private Set<UserDto> executors;
+    private boolean hasAge;
+    private boolean hasDegree;
 
     private final static int MAX_EXECUTORS_LENGTH = 40;
 
@@ -48,7 +50,9 @@ public class ProjectDto {
                       @JsonProperty("repository") String repository,
                       @JsonProperty("deadlines") List<Deadline> deadlines,
                       @JsonProperty("executorIds") Set<Integer> executorIds,
-                      @JsonProperty("executors") Set<UserDto> executors) {
+                      @JsonProperty("executors") Set<UserDto> executors,
+                      @JsonProperty("hasAge") boolean hasAge,
+                      @JsonProperty("hasDegree") boolean hasDegree) {
         this.id = id;
         this.title = title;
         this.status = status;
@@ -59,6 +63,8 @@ public class ProjectDto {
         this.applicationFileName = null;
         this.executorIds = executorIds;
         this.executors = executors;
+        this.hasAge = hasAge;
+        this.hasDegree = hasDegree;
     }
 
 
@@ -163,6 +169,22 @@ public class ProjectDto {
         this.executors = executors;
     }
 
+    public boolean isHasAge() {
+        return hasAge;
+    }
+
+    public void setHasAge(boolean hasAge) {
+        this.hasAge = hasAge;
+    }
+
+    public boolean isHasDegree() {
+        return hasDegree;
+    }
+
+    public void setHasDegree(boolean hasDegree) {
+        this.hasDegree = hasDegree;
+    }
+
     public String getExecutorsString() {
         return StringUtils.abbreviate(executors
                 .stream()
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index 4a79e6c..2f6473b 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -5,10 +5,13 @@ import org.springframework.transaction.annotation.Transactional;
 import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.file.service.FileService;
+import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.repository.GrantRepository;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.project.repository.ProjectRepository;
+import ru.ulstu.user.model.User;
+import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -26,15 +29,18 @@ public class ProjectService {
     private final DeadlineService deadlineService;
     private final GrantRepository grantRepository;
     private final FileService fileService;
+    private final UserService userService;
 
     public ProjectService(ProjectRepository projectRepository,
                           DeadlineService deadlineService,
                           GrantRepository grantRepository,
-                          FileService fileService) {
+                          FileService fileService,
+                          UserService userService) {
         this.projectRepository = projectRepository;
         this.deadlineService = deadlineService;
         this.grantRepository = grantRepository;
         this.fileService = fileService;
+        this.userService = userService;
     }
 
     public List<Project> findAll() {
@@ -115,4 +121,9 @@ public class ProjectService {
         return projectRepository.findOne(id);
     }
 
+    public List<User> getProjectExecutors(ProjectDto projectDto) {
+        List<User> filteredUsers = userService.filterByAgeAndDegree(projectDto.isHasAge(), projectDto.isHasDegree());
+        return filteredUsers;
+    }
+
 }
diff --git a/src/main/resources/templates/projects/project.html b/src/main/resources/templates/projects/project.html
index 8385694..304fed0 100644
--- a/src/main/resources/templates/projects/project.html
+++ b/src/main/resources/templates/projects/project.html
@@ -92,8 +92,13 @@
                                         </div>
                                         <div class="col-12" style="margin-bottom: 15px;"></div>
                                         <div class="col-10 div-deadline-executor">
-                                            <input class="form-control" type="text" placeholder="Исполнитель"
-                                                   th:field="*{deadlines[__${rowStat.index}__].executor}"/>
+                                            <select class="selectpicker form-control" data-live-search="true"
+                                                    title="-- Выберите исполнителя --" id="executors"
+                                                    th:field="*{deadlines[__${rowStat.index}__].executor}" data-size="5">
+                                                <option th:each="executor : ${allExecutors}" th:value="${executor.id}"
+                                                        th:text="${executor.lastName}"> Участник
+                                                </option>
+                                            </select>
                                         </div>
                                         <div class="col-2">
                                             <input class="form-control div-deadline-done" type="checkbox"

From eb87c6d52ffb8de49290699056960c904fd93c2f Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Tue, 28 May 2019 00:40:36 +0400
Subject: [PATCH 48/74] #98 project statuses edited

---
 src/main/java/ru/ulstu/project/model/Project.java      | 10 +++++-----
 .../java/ru/ulstu/project/service/ProjectService.java  |  4 ++--
 .../projects/fragments/projectStatusFragment.html      | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java
index f061221..cf0de14 100644
--- a/src/main/java/ru/ulstu/project/model/Project.java
+++ b/src/main/java/ru/ulstu/project/model/Project.java
@@ -27,11 +27,11 @@ import java.util.Set;
 public class Project extends BaseEntity implements UserContainer {
 
     public enum ProjectStatus {
-        APPLICATION("Заявка"),
-        ON_COMPETITION("Отправлен на конкурс"),
-        SUCCESSFUL_PASSAGE("Успешное прохождение"),
+        TT("ТЗ"),
+        OPEN("Открыт"),
         IN_WORK("В работе"),
-        COMPLETED("Завершен"),
+        CERTIFICATE_ISSUED("Оформление свидетельства"),
+        CLOSED("Закрыт"),
         FAILED("Провалены сроки");
 
         private String statusName;
@@ -49,7 +49,7 @@ public class Project extends BaseEntity implements UserContainer {
     private String title;
 
     @Enumerated(value = EnumType.STRING)
-    private ProjectStatus status = ProjectStatus.APPLICATION;
+    private ProjectStatus status = ProjectStatus.TT;
 
     @NotNull
     private String description;
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index 2f6473b..2b9e82b 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -19,7 +19,7 @@ import java.util.List;
 
 import static org.springframework.util.ObjectUtils.isEmpty;
 import static ru.ulstu.core.util.StreamApiUtils.convert;
-import static ru.ulstu.project.model.Project.ProjectStatus.APPLICATION;
+import static ru.ulstu.project.model.Project.ProjectStatus.TT;
 
 @Service
 public class ProjectService {
@@ -89,7 +89,7 @@ public class ProjectService {
 
     private Project copyFromDto(Project project, ProjectDto projectDto) throws IOException {
         project.setDescription(projectDto.getDescription());
-        project.setStatus(projectDto.getStatus() == null ? APPLICATION : projectDto.getStatus());
+        project.setStatus(projectDto.getStatus() == null ? TT : projectDto.getStatus());
         project.setTitle(projectDto.getTitle());
         if (projectDto.getGrant() != null && projectDto.getGrant().getId() != null) {
             project.setGrant(grantRepository.findOne(projectDto.getGrant().getId()));
diff --git a/src/main/resources/templates/projects/fragments/projectStatusFragment.html b/src/main/resources/templates/projects/fragments/projectStatusFragment.html
index d8f29cc..c56958e 100644
--- a/src/main/resources/templates/projects/fragments/projectStatusFragment.html
+++ b/src/main/resources/templates/projects/fragments/projectStatusFragment.html
@@ -6,19 +6,19 @@
 <body>
 <span th:fragment="projectStatus (projectStatus)" class="fa-stack fa-1x">
     <th:block th:switch="${projectStatus.name()}">
-        <div th:case="'APPLICATION'">
+        <div th:case="'TT'">
             <i class="fa fa-circle fa-stack-2x text-draft"></i>
         </div>
-        <div th:case="'ON_COMPETITION'">
+        <div th:case="'OPEN'">
             <i class="fa fa-circle fa-stack-2x text-review"></i>
         </div>
-        <div th:case="'SUCCESSFUL_PASSAGE'">
+        <div th:case="'IN_WORK'">
             <i class="fa fa-circle fa-stack-2x text-accepted"></i>
         </div>
-        <div th:case="'IN_WORK'">
+        <div th:case="'CERTIFICATE_ISSUED'">
             <i class="fa fa-circle fa-stack-2x text-primary"></i>
         </div>
-        <div th:case="'COMPLETED'">
+        <div th:case="'CLOSED'">
             <i class="fa fa-circle fa-stack-2x text-success"></i>
         </div>
         <div th:case="'FAILED'">

From 3b0a2dd964c60fc53c4ec9ac64fedcedb4dc7594 Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Tue, 28 May 2019 11:12:27 +0400
Subject: [PATCH 49/74] #98 executors list added

---
 .../ru/ulstu/deadline/model/Deadline.java     | 30 ++++++++++---------
 .../deadline/service/DeadlineService.java     |  4 +--
 .../java/ru/ulstu/project/model/Project.java  | 15 +++++-----
 .../ru/ulstu/project/model/ProjectDto.java    | 13 ++++----
 .../ulstu/project/service/ProjectService.java |  5 ++--
 .../db/changelog-20190528_000000-schema.xml   | 11 +++++++
 .../db/changelog-20190528_000001-schema.xml   | 17 +++++++++++
 src/main/resources/db/changelog-master.xml    |  2 ++
 .../fragments/projectStatusFragment.html      |  2 +-
 9 files changed, 67 insertions(+), 32 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20190528_000000-schema.xml
 create mode 100644 src/main/resources/db/changelog-20190528_000001-schema.xml

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 3a54bec..97b6441 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -4,11 +4,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.user.model.User;
 
-import javax.persistence.Entity;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import javax.persistence.*;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 @Entity
@@ -20,7 +20,9 @@ public class Deadline extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
-    private Integer executor;
+    @OneToMany(targetEntity=User.class, fetch=FetchType.EAGER)
+    private List<User> executors;
+
     private Boolean done;
 
     public Deadline() {
@@ -31,10 +33,10 @@ public class Deadline extends BaseEntity {
         this.description = description;
     }
 
-    public Deadline(Date deadlineDate, String description, Integer executor, Boolean done) {
+    public Deadline(Date deadlineDate, String description, List<User> executors, Boolean done) {
         this.date = deadlineDate;
         this.description = description;
-        this.executor = executor;
+        this.executors = executors;
         this.done = done;
     }
 
@@ -42,12 +44,12 @@ public class Deadline extends BaseEntity {
     public Deadline(@JsonProperty("id") Integer id,
                     @JsonProperty("description") String description,
                     @JsonProperty("date") Date date,
-                    @JsonProperty("executor") Integer executor,
+                    @JsonProperty("executors") List<User> executors,
                     @JsonProperty("done") Boolean done) {
         this.setId(id);
         this.description = description;
         this.date = date;
-        this.executor = executor;
+        this.executors = executors;
         this.done = done;
     }
 
@@ -67,12 +69,12 @@ public class Deadline extends BaseEntity {
         this.date = date;
     }
 
-    public Integer getExecutor() {
-        return executor;
+    public List<User> getExecutors() {
+        return executors;
     }
 
-    public void setExecutor(Integer executor) {
-        this.executor = executor;
+    public void setExecutors(List<User> executors) {
+        this.executors = executors;
     }
 
     public Boolean getDone() {
@@ -103,12 +105,12 @@ public class Deadline extends BaseEntity {
         return getId().equals(deadline.getId()) &&
                 description.equals(deadline.description) &&
                 date.equals(deadline.date) &&
-                executor.equals(deadline.executor) &&
+                executors.equals(deadline.executors) &&
                 done.equals(deadline.done);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), description, date, executor, done);
+        return Objects.hash(super.hashCode(), description, date, executors, done);
     }
 }
diff --git a/src/main/java/ru/ulstu/deadline/service/DeadlineService.java b/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
index 83f1afb..9c45537 100644
--- a/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
+++ b/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
@@ -30,7 +30,7 @@ public class DeadlineService {
         Deadline updateDeadline = deadlineRepository.findOne(deadline.getId());
         updateDeadline.setDate(deadline.getDate());
         updateDeadline.setDescription(deadline.getDescription());
-        updateDeadline.setExecutor(deadline.getExecutor());
+        updateDeadline.setExecutors(deadline.getExecutors());
         updateDeadline.setDone(deadline.getDone());
         deadlineRepository.save(updateDeadline);
         return updateDeadline;
@@ -41,7 +41,7 @@ public class DeadlineService {
         Deadline newDeadline = new Deadline();
         newDeadline.setDate(deadline.getDate());
         newDeadline.setDescription(deadline.getDescription());
-        newDeadline.setExecutor(deadline.getExecutor());
+        newDeadline.setExecutors(deadline.getExecutors());
         newDeadline.setDone(deadline.getDone());
         newDeadline = deadlineRepository.save(newDeadline);
         return newDeadline;
diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java
index cf0de14..3d11583 100644
--- a/src/main/java/ru/ulstu/project/model/Project.java
+++ b/src/main/java/ru/ulstu/project/model/Project.java
@@ -27,7 +27,7 @@ import java.util.Set;
 public class Project extends BaseEntity implements UserContainer {
 
     public enum ProjectStatus {
-        TT("ТЗ"),
+        TECHNICAL_TASK("Техническое задание"),
         OPEN("Открыт"),
         IN_WORK("В работе"),
         CERTIFICATE_ISSUED("Оформление свидетельства"),
@@ -49,7 +49,7 @@ public class Project extends BaseEntity implements UserContainer {
     private String title;
 
     @Enumerated(value = EnumType.STRING)
-    private ProjectStatus status = ProjectStatus.TT;
+    private ProjectStatus status = ProjectStatus.TECHNICAL_TASK;
 
     @NotNull
     private String description;
@@ -69,8 +69,8 @@ public class Project extends BaseEntity implements UserContainer {
     @JoinColumn(name = "file_id")
     private FileData application;
 
-    @ManyToMany(fetch = FetchType.EAGER)
-    private Set<User> executors = new HashSet<>();
+    @ManyToMany(fetch = FetchType.LAZY)
+    private List<User> executors = new ArrayList<>();
 
     public String getTitle() {
         return title;
@@ -128,16 +128,17 @@ public class Project extends BaseEntity implements UserContainer {
         this.application = application;
     }
 
-    public Set<User> getExecutors() {
+    public List<User> getExecutors() {
         return executors;
     }
 
-    public void setExecutors(Set<User> executors) {
+    public void setExecutors(List<User> executors) {
         this.executors = executors;
     }
 
     @Override
     public Set<User> getUsers() {
-        return getExecutors();
+        Set<User> users = new HashSet<User>(getExecutors());
+        return users;
     }
 }
diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index 0292f1f..f6ee831 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -6,9 +6,11 @@ import org.hibernate.validator.constraints.NotEmpty;
 import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.grant.model.GrantDto;
+import ru.ulstu.user.model.User;
 import ru.ulstu.user.model.UserDto;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -28,7 +30,7 @@ public class ProjectDto {
     private String applicationFileName;
     private List<Integer> removedDeadlineIds = new ArrayList<>();
     private Set<Integer> executorIds;
-    private Set<UserDto> executors;
+    private List<UserDto> executors;
     private boolean hasAge;
     private boolean hasDegree;
 
@@ -50,7 +52,7 @@ public class ProjectDto {
                       @JsonProperty("repository") String repository,
                       @JsonProperty("deadlines") List<Deadline> deadlines,
                       @JsonProperty("executorIds") Set<Integer> executorIds,
-                      @JsonProperty("executors") Set<UserDto> executors,
+                      @JsonProperty("executors") List<UserDto> executors,
                       @JsonProperty("hasAge") boolean hasAge,
                       @JsonProperty("hasDegree") boolean hasDegree) {
         this.id = id;
@@ -69,6 +71,7 @@ public class ProjectDto {
 
 
     public ProjectDto(Project project) {
+        Set<User> users = new HashSet<User>(project.getExecutors());
         this.id = project.getId();
         this.title = project.getTitle();
         this.status = project.getStatus();
@@ -77,7 +80,7 @@ public class ProjectDto {
         this.grant = project.getGrant() == null ? null : new GrantDto(project.getGrant());
         this.repository = project.getRepository();
         this.deadlines = project.getDeadlines();
-        this.executorIds = convert(project.getExecutors(), user -> user.getId());
+        this.executorIds = convert(users, user -> user.getId());
         this.executors = convert(project.getExecutors(), UserDto::new);
     }
 
@@ -161,11 +164,11 @@ public class ProjectDto {
         this.executorIds = executorIds;
     }
 
-    public Set<UserDto> getExecutors() {
+    public List<UserDto> getExecutors() {
         return executors;
     }
 
-    public void setExecutors(Set<UserDto> executors) {
+    public void setExecutors(List<UserDto> executors) {
         this.executors = executors;
     }
 
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index 2b9e82b..ab2fa91 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -5,7 +5,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.file.service.FileService;
-import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.repository.GrantRepository;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
@@ -19,7 +18,7 @@ import java.util.List;
 
 import static org.springframework.util.ObjectUtils.isEmpty;
 import static ru.ulstu.core.util.StreamApiUtils.convert;
-import static ru.ulstu.project.model.Project.ProjectStatus.TT;
+import static ru.ulstu.project.model.Project.ProjectStatus.TECHNICAL_TASK;
 
 @Service
 public class ProjectService {
@@ -89,7 +88,7 @@ public class ProjectService {
 
     private Project copyFromDto(Project project, ProjectDto projectDto) throws IOException {
         project.setDescription(projectDto.getDescription());
-        project.setStatus(projectDto.getStatus() == null ? TT : projectDto.getStatus());
+        project.setStatus(projectDto.getStatus() == null ? TECHNICAL_TASK : projectDto.getStatus());
         project.setTitle(projectDto.getTitle());
         if (projectDto.getGrant() != null && projectDto.getGrant().getId() != null) {
             project.setGrant(grantRepository.findOne(projectDto.getGrant().getId()));
diff --git a/src/main/resources/db/changelog-20190528_000000-schema.xml b/src/main/resources/db/changelog-20190528_000000-schema.xml
new file mode 100644
index 0000000..02ba642
--- /dev/null
+++ b/src/main/resources/db/changelog-20190528_000000-schema.xml
@@ -0,0 +1,11 @@
+<?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="anton" id="20190528_000000-1">
+        <renameColumn tableName="deadline"
+                      columnDataType="integer"
+                      newColumnName="executors"
+                      oldColumnName="executor"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-20190528_000001-schema.xml b/src/main/resources/db/changelog-20190528_000001-schema.xml
new file mode 100644
index 0000000..0605b48
--- /dev/null
+++ b/src/main/resources/db/changelog-20190528_000001-schema.xml
@@ -0,0 +1,17 @@
+<?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="anton" id="20190528_000000-1">
+        <createTable tableName="deadline_executors">
+            <column name="deadline_id" type="integer"/>
+            <column name="executors" type="integer"/>
+        </createTable>
+        <addForeignKeyConstraint baseTableName="deadline_executors" baseColumnNames="deadline_id"
+                                 constraintName="fk_deadline_deadline_executors" referencedTableName="deadline"
+                                 referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="deadline_executors" baseColumnNames="executors"
+                                 constraintName="fk_user_deadline_executors" referencedTableName="users"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index b4ce865..fbc1ec3 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -47,4 +47,6 @@
     <include file="db/changelog-20190517_000001-schema.xml"/>
     <include file="db/changelog-20190520_000000-schema.xml"/>
     <include file="db/changelog-20190523_000000-schema.xml"/>
+    <include file="db/changelog-20190528_000000-schema.xml"/>
+    <include file="db/changelog-20190528_000001-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/fragments/projectStatusFragment.html b/src/main/resources/templates/projects/fragments/projectStatusFragment.html
index c56958e..bf0d3f6 100644
--- a/src/main/resources/templates/projects/fragments/projectStatusFragment.html
+++ b/src/main/resources/templates/projects/fragments/projectStatusFragment.html
@@ -6,7 +6,7 @@
 <body>
 <span th:fragment="projectStatus (projectStatus)" class="fa-stack fa-1x">
     <th:block th:switch="${projectStatus.name()}">
-        <div th:case="'TT'">
+        <div th:case="'TECHNICAL_TASK'">
             <i class="fa fa-circle fa-stack-2x text-draft"></i>
         </div>
         <div th:case="'OPEN'">

From c25392337a3ababebf34e4c3404f277ab945b184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Tue, 28 May 2019 16:16:41 +0300
Subject: [PATCH 50/74] #98 project deadlines edited

---
 .../ru/ulstu/project/model/ProjectDto.java    | 24 +------------------
 .../ulstu/project/service/ProjectService.java |  8 +++----
 ...l => changelog-20190528_000002-schema.xml} |  6 ++---
 src/main/resources/db/changelog-master.xml    |  2 +-
 .../resources/templates/projects/project.html |  8 +++----
 5 files changed, 13 insertions(+), 35 deletions(-)
 rename src/main/resources/db/{changelog-20190528_000001-schema.xml => changelog-20190528_000002-schema.xml} (87%)

diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index f6ee831..affee4e 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -31,8 +31,6 @@ public class ProjectDto {
     private List<Integer> removedDeadlineIds = new ArrayList<>();
     private Set<Integer> executorIds;
     private List<UserDto> executors;
-    private boolean hasAge;
-    private boolean hasDegree;
 
     private final static int MAX_EXECUTORS_LENGTH = 40;
 
@@ -52,9 +50,7 @@ public class ProjectDto {
                       @JsonProperty("repository") String repository,
                       @JsonProperty("deadlines") List<Deadline> deadlines,
                       @JsonProperty("executorIds") Set<Integer> executorIds,
-                      @JsonProperty("executors") List<UserDto> executors,
-                      @JsonProperty("hasAge") boolean hasAge,
-                      @JsonProperty("hasDegree") boolean hasDegree) {
+                      @JsonProperty("executors") List<UserDto> executors) {
         this.id = id;
         this.title = title;
         this.status = status;
@@ -65,8 +61,6 @@ public class ProjectDto {
         this.applicationFileName = null;
         this.executorIds = executorIds;
         this.executors = executors;
-        this.hasAge = hasAge;
-        this.hasDegree = hasDegree;
     }
 
 
@@ -172,22 +166,6 @@ public class ProjectDto {
         this.executors = executors;
     }
 
-    public boolean isHasAge() {
-        return hasAge;
-    }
-
-    public void setHasAge(boolean hasAge) {
-        this.hasAge = hasAge;
-    }
-
-    public boolean isHasDegree() {
-        return hasDegree;
-    }
-
-    public void setHasDegree(boolean hasDegree) {
-        this.hasDegree = hasDegree;
-    }
-
     public String getExecutorsString() {
         return StringUtils.abbreviate(executors
                 .stream()
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index ab2fa91..fe8813c 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -110,8 +110,8 @@ public class ProjectService {
     }
 
     public void removeDeadline(ProjectDto projectDto, Integer deadlineId) {
-        if (projectDto.getDeadlines().get(deadlineId).getId() != null) {
-            projectDto.getRemovedDeadlineIds().add(projectDto.getDeadlines().get(deadlineId).getId());
+        if (deadlineId != null) {
+            projectDto.getRemovedDeadlineIds().add(deadlineId);
         }
         projectDto.getDeadlines().remove((int) deadlineId);
     }
@@ -121,8 +121,8 @@ public class ProjectService {
     }
 
     public List<User> getProjectExecutors(ProjectDto projectDto) {
-        List<User> filteredUsers = userService.filterByAgeAndDegree(projectDto.isHasAge(), projectDto.isHasDegree());
-        return filteredUsers;
+        List<User> users = userService.findAll();
+        return users;
     }
 
 }
diff --git a/src/main/resources/db/changelog-20190528_000001-schema.xml b/src/main/resources/db/changelog-20190528_000002-schema.xml
similarity index 87%
rename from src/main/resources/db/changelog-20190528_000001-schema.xml
rename to src/main/resources/db/changelog-20190528_000002-schema.xml
index 0605b48..7df707c 100644
--- a/src/main/resources/db/changelog-20190528_000001-schema.xml
+++ b/src/main/resources/db/changelog-20190528_000002-schema.xml
@@ -2,15 +2,15 @@
 <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="anton" id="20190528_000000-1">
+    <changeSet author="anton" id="20190528_000000-3">
         <createTable tableName="deadline_executors">
             <column name="deadline_id" type="integer"/>
-            <column name="executors" type="integer"/>
+            <column name="executors_id" type="integer"/>
         </createTable>
         <addForeignKeyConstraint baseTableName="deadline_executors" baseColumnNames="deadline_id"
                                  constraintName="fk_deadline_deadline_executors" referencedTableName="deadline"
                                  referencedColumnNames="id"/>
-        <addForeignKeyConstraint baseTableName="deadline_executors" baseColumnNames="executors"
+        <addForeignKeyConstraint baseTableName="deadline_executors" baseColumnNames="executors_id"
                                  constraintName="fk_user_deadline_executors" referencedTableName="users"
                                  referencedColumnNames="id"/>
     </changeSet>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index fbc1ec3..c8a6e63 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -48,5 +48,5 @@
     <include file="db/changelog-20190520_000000-schema.xml"/>
     <include file="db/changelog-20190523_000000-schema.xml"/>
     <include file="db/changelog-20190528_000000-schema.xml"/>
-    <include file="db/changelog-20190528_000001-schema.xml"/>
+    <include file="db/changelog-20190528_000002-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/project.html b/src/main/resources/templates/projects/project.html
index 304fed0..2c4a67b 100644
--- a/src/main/resources/templates/projects/project.html
+++ b/src/main/resources/templates/projects/project.html
@@ -92,11 +92,11 @@
                                         </div>
                                         <div class="col-12" style="margin-bottom: 15px;"></div>
                                         <div class="col-10 div-deadline-executor">
-                                            <select class="selectpicker form-control" data-live-search="true"
+                                            <select class="selectpicker form-control" multiple="true" data-live-search="true"
                                                     title="-- Выберите исполнителя --" id="executors"
-                                                    th:field="*{deadlines[__${rowStat.index}__].executor}" data-size="5">
-                                                <option th:each="executor : ${allExecutors}" th:value="${executor.id}"
-                                                        th:text="${executor.lastName}"> Участник
+                                                    th:field="*{deadlines[__${rowStat.index}__].executors}" data-size="5">
+                                                <option th:each="executors : ${allExecutors}" th:value="${executors.id}"
+                                                        th:text="${executors.lastName}"> Участник
                                                 </option>
                                             </select>
                                         </div>

From 8ffafd669328c16d759e37d91fb04cfe32cb07ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Tue, 28 May 2019 16:46:12 +0300
Subject: [PATCH 51/74] #98 deadline imports edited

---
 src/main/java/ru/ulstu/deadline/model/Deadline.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 97b6441..d9f2373 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -6,7 +6,11 @@ import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.user.model.User;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -20,7 +24,7 @@ public class Deadline extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
-    @OneToMany(targetEntity=User.class, fetch=FetchType.EAGER)
+    @OneToMany(targetEntity=User.class, fetch= FetchType.EAGER)
     private List<User> executors;
 
     private Boolean done;

From 77ce908d584caf5d4346c0929b22744037319c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Tue, 28 May 2019 16:55:08 +0300
Subject: [PATCH 52/74] #98 deadline edited

---
 src/main/java/ru/ulstu/deadline/model/Deadline.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index d9f2373..17287a8 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -24,7 +24,7 @@ public class Deadline extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
-    @OneToMany(targetEntity=User.class, fetch= FetchType.EAGER)
+    @OneToMany(targetEntity = User.class, fetch = FetchType.EAGER)
     private List<User> executors;
 
     private Boolean done;

From eb30d07d10f9d8072832e1077fcac22e481e3cbd Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Wed, 29 May 2019 18:27:34 +0400
Subject: [PATCH 53/74] #101 project deadlines on timeline

---
 .../ulstu/project/service/ProjectService.java |  6 ++++
 .../java/ru/ulstu/timeline/model/Event.java   | 13 +++++++
 .../ru/ulstu/timeline/model/EventDto.java     | 15 ++++++++
 .../timeline/repository/EventRepository.java  |  3 ++
 .../ulstu/timeline/service/EventService.java  | 34 +++++++++++++++++++
 5 files changed, 71 insertions(+)

diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index fe8813c..30b5f01 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -9,6 +9,7 @@ import ru.ulstu.grant.repository.GrantRepository;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.project.repository.ProjectRepository;
+import ru.ulstu.timeline.service.EventService;
 import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
 
@@ -28,17 +29,20 @@ public class ProjectService {
     private final DeadlineService deadlineService;
     private final GrantRepository grantRepository;
     private final FileService fileService;
+    private final EventService eventService;
     private final UserService userService;
 
     public ProjectService(ProjectRepository projectRepository,
                           DeadlineService deadlineService,
                           GrantRepository grantRepository,
                           FileService fileService,
+                          EventService eventService,
                           UserService userService) {
         this.projectRepository = projectRepository;
         this.deadlineService = deadlineService;
         this.grantRepository = grantRepository;
         this.fileService = fileService;
+        this.eventService = eventService;
         this.userService = userService;
     }
 
@@ -64,6 +68,7 @@ public class ProjectService {
     public Project create(ProjectDto projectDto) throws IOException {
         Project newProject = copyFromDto(new Project(), projectDto);
         newProject = projectRepository.save(newProject);
+        eventService.createFromProject(newProject);
         return newProject;
     }
 
@@ -74,6 +79,7 @@ public class ProjectService {
             fileService.deleteFile(project.getApplication());
         }
         projectRepository.save(copyFromDto(project, projectDto));
+        eventService.updateProjectDeadlines(project);
         return project;
     }
 
diff --git a/src/main/java/ru/ulstu/timeline/model/Event.java b/src/main/java/ru/ulstu/timeline/model/Event.java
index 8038f0b..a8b4571 100644
--- a/src/main/java/ru/ulstu/timeline/model/Event.java
+++ b/src/main/java/ru/ulstu/timeline/model/Event.java
@@ -5,6 +5,7 @@ import ru.ulstu.conference.model.Conference;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.paper.model.Paper;
+import ru.ulstu.project.model.Project;
 import ru.ulstu.students.model.Task;
 import ru.ulstu.user.model.User;
 
@@ -88,6 +89,10 @@ public class Event extends BaseEntity {
     @JoinColumn(name = "grant_id")
     private Grant grant;
 
+    @ManyToOne
+    @JoinColumn(name = "project_id")
+    private Project project;
+
     @ManyToOne
     @JoinColumn(name = "task_id")
     private Task task;
@@ -196,6 +201,14 @@ public class Event extends BaseEntity {
         this.grant = grant;
     }
 
+    public Project getProject() {
+        return project;
+    }
+
+    public void setProject(Project project) {
+        this.project = project;
+    }
+
     public Task getTask() {
         return task;
     }
diff --git a/src/main/java/ru/ulstu/timeline/model/EventDto.java b/src/main/java/ru/ulstu/timeline/model/EventDto.java
index ccf0f0a..1f0076b 100644
--- a/src/main/java/ru/ulstu/timeline/model/EventDto.java
+++ b/src/main/java/ru/ulstu/timeline/model/EventDto.java
@@ -6,6 +6,7 @@ import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.conference.model.ConferenceDto;
 import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.paper.model.PaperDto;
+import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.students.model.TaskDto;
 import ru.ulstu.user.model.UserDto;
 
@@ -30,6 +31,7 @@ public class EventDto {
     private PaperDto paperDto;
     private ConferenceDto conferenceDto;
     private GrantDto grantDto;
+    private ProjectDto projectDto;
     private TaskDto taskDto;
 
     @JsonCreator
@@ -45,6 +47,7 @@ public class EventDto {
                     @JsonProperty("recipients") List<UserDto> recipients,
                     @JsonProperty("conferenceDto") ConferenceDto conferenceDto,
                     @JsonProperty("grantDto") GrantDto grantDto,
+                    @JsonProperty("projectDto") ProjectDto projectDto,
                     @JsonProperty("taskDto") TaskDto taskDto) {
         this.id = id;
         this.title = title;
@@ -58,6 +61,7 @@ public class EventDto {
         this.paperDto = paperDto;
         this.conferenceDto = conferenceDto;
         this.grantDto = grantDto;
+        this.projectDto = projectDto;
         this.taskDto = taskDto;
     }
 
@@ -80,6 +84,9 @@ public class EventDto {
         if (grantDto != null) {
             this.grantDto = new GrantDto(event.getGrant());
         }
+        if (projectDto != null) {
+            this.projectDto = new ProjectDto(event.getProject());
+        }
         if (taskDto != null) {
             this.taskDto = new TaskDto(event.getTask());
         }
@@ -145,6 +152,14 @@ public class EventDto {
         this.grantDto = grantDto;
     }
 
+    public ProjectDto getProjectDto() {
+        return projectDto;
+    }
+
+    public void setProjectDto(ProjectDto projectDto) {
+        this.projectDto = projectDto;
+    }
+
     public TaskDto getTaskDto() {
         return taskDto;
     }
diff --git a/src/main/java/ru/ulstu/timeline/repository/EventRepository.java b/src/main/java/ru/ulstu/timeline/repository/EventRepository.java
index 7ebd3c9..15e1355 100644
--- a/src/main/java/ru/ulstu/timeline/repository/EventRepository.java
+++ b/src/main/java/ru/ulstu/timeline/repository/EventRepository.java
@@ -5,6 +5,7 @@ import org.springframework.data.jpa.repository.Query;
 import ru.ulstu.conference.model.Conference;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.paper.model.Paper;
+import ru.ulstu.project.model.Project;
 import ru.ulstu.students.model.Task;
 import ru.ulstu.timeline.model.Event;
 
@@ -23,5 +24,7 @@ public interface EventRepository extends JpaRepository<Event, Integer> {
 
     List<Event> findAllByGrant(Grant grant);
 
+    List<Event> findAllByProject(Project project);
+
     List<Event> findAllByTask(Task task);
 }
diff --git a/src/main/java/ru/ulstu/timeline/service/EventService.java b/src/main/java/ru/ulstu/timeline/service/EventService.java
index 8c68291..eef38eb 100644
--- a/src/main/java/ru/ulstu/timeline/service/EventService.java
+++ b/src/main/java/ru/ulstu/timeline/service/EventService.java
@@ -8,11 +8,13 @@ import ru.ulstu.conference.model.Conference;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.paper.model.Paper;
+import ru.ulstu.project.model.Project;
 import ru.ulstu.students.model.Task;
 import ru.ulstu.timeline.model.Event;
 import ru.ulstu.timeline.model.EventDto;
 import ru.ulstu.timeline.model.Timeline;
 import ru.ulstu.timeline.repository.EventRepository;
+import ru.ulstu.user.model.User;
 import ru.ulstu.user.model.UserDto;
 import ru.ulstu.user.service.UserService;
 
@@ -205,6 +207,38 @@ public class EventService {
         createFromGrant(grant);
     }
 
+    public void createFromProject(Project newProject) {
+        List<Timeline> timelines = timelineService.findAll();
+        Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0);
+
+        for (Deadline deadline : newProject.getDeadlines()
+                .stream()
+                .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
+                .collect(Collectors.toList())) {
+            Event newEvent = new Event();
+            newEvent.setTitle("Дедлайн проекта");
+            newEvent.setStatus(Event.EventStatus.NEW);
+            newEvent.setExecuteDate(deadline.getDate());
+            newEvent.setCreateDate(new Date());
+            newEvent.setUpdateDate(new Date());
+            newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' проекта '" + newProject.getTitle() + "'");
+            if (newProject.getExecutors() != null) {
+                newEvent.setRecipients(new ArrayList(newProject.getExecutors()));
+            }
+            newEvent.getRecipients().add((User) newProject.getExecutors());
+            newEvent.setProject(newProject);
+            eventRepository.save(newEvent);
+
+            timeline.getEvents().add(newEvent);
+            timelineService.save(timeline);
+        }
+    }
+
+    public void updateProjectDeadlines(Project project) {
+        eventRepository.delete(eventRepository.findAllByProject(project));
+        createFromProject(project);
+    }
+
     public void removeConferencesEvent(Conference conference) {
         List<Event> eventList = eventRepository.findAllByConference(conference);
         eventList.forEach(event -> eventRepository.delete(event.getId()));

From 192adbfa0b73a539c1b2b241cf3f21f57643d2bc Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Wed, 29 May 2019 18:40:14 +0400
Subject: [PATCH 54/74] #101 no projects message

---
 src/main/resources/templates/projects/dashboard.html | 1 +
 src/main/resources/templates/projects/projects.html  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/resources/templates/projects/dashboard.html b/src/main/resources/templates/projects/dashboard.html
index c48b035..0eafb4a 100644
--- a/src/main/resources/templates/projects/dashboard.html
+++ b/src/main/resources/templates/projects/dashboard.html
@@ -17,6 +17,7 @@
                     <div th:replace="projects/fragments/projectDashboardFragment :: projectDashboard(project=${project})"/>
                 </th:block>
             </div>
+            <div th:replace="fragments/noRecordsFragment :: noRecords(entities=${projects}, noRecordsMessage=' одного проекта', url='project')"/>
         </div>
     </section>
 </div>
diff --git a/src/main/resources/templates/projects/projects.html b/src/main/resources/templates/projects/projects.html
index e70b910..de334f8 100644
--- a/src/main/resources/templates/projects/projects.html
+++ b/src/main/resources/templates/projects/projects.html
@@ -24,6 +24,7 @@
                     </div>
                     <div class="col-md-3 col-sm-12">
                     </div>
+                    <div th:replace="fragments/noRecordsFragment :: noRecords(entities=${projects}, noRecordsMessage=' одного проекта', url='project')"/>
                 </div>
             </div>
         </section>

From 9013d79228d5688bc308a821440d39a62de8d21c Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Wed, 29 May 2019 23:40:30 +0400
Subject: [PATCH 55/74] #101 grant attach

---
 .../grant/repository/GrantRepository.java     |  2 ++
 .../ru/ulstu/grant/service/GrantService.java  |  4 +++
 .../project/controller/ProjectController.java | 15 ++++++++++
 .../java/ru/ulstu/project/model/Project.java  | 29 +++++++++++++++----
 .../ru/ulstu/project/model/ProjectDto.java    | 27 ++++++++++++++++-
 .../ulstu/project/service/ProjectService.java | 24 +++++++++++++++
 .../ulstu/timeline/service/EventService.java  |  2 +-
 .../db/changelog-20190529_000000-schema.xml   | 17 +++++++++++
 src/main/resources/db/changelog-master.xml    |  1 +
 .../resources/templates/projects/project.html | 16 ++++++----
 10 files changed, 125 insertions(+), 12 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20190529_000000-schema.xml

diff --git a/src/main/java/ru/ulstu/grant/repository/GrantRepository.java b/src/main/java/ru/ulstu/grant/repository/GrantRepository.java
index 876a8c1..50fad13 100644
--- a/src/main/java/ru/ulstu/grant/repository/GrantRepository.java
+++ b/src/main/java/ru/ulstu/grant/repository/GrantRepository.java
@@ -14,6 +14,8 @@ public interface GrantRepository extends JpaRepository<Grant, Integer>, BaseRepo
 
     Grant findByTitle(String title);
 
+    Grant findGrantById(Integer grantId);
+
     @Override
     @Query("SELECT title FROM Grant g WHERE (g.title = :name) AND (:id IS NULL OR g.id != :id) ")
     String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index 86f8f1b..09da77f 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -336,4 +336,8 @@ public class GrantService extends BaseService {
     private List<Grant> findAllActive() {
         return grantRepository.findAllActive();
     }
+
+    public Grant findGrantById(Integer grantId) {
+        return grantRepository.findOne(grantId);
+    }
 }
diff --git a/src/main/java/ru/ulstu/project/controller/ProjectController.java b/src/main/java/ru/ulstu/project/controller/ProjectController.java
index 88f0c7a..87ae8df 100644
--- a/src/main/java/ru/ulstu/project/controller/ProjectController.java
+++ b/src/main/java/ru/ulstu/project/controller/ProjectController.java
@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.grant.model.Grant;
+import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.project.service.ProjectService;
@@ -46,6 +48,8 @@ public class ProjectController {
     @GetMapping("/project")
     public void getProject(ModelMap modelMap, @RequestParam(value = "id") Integer id) {
         if (id != null && id > 0) {
+            ProjectDto projectDto = projectService.findOneDto(id);
+            attachGrant(projectDto);
             modelMap.put("projectDto", projectService.findOneDto(id));
         } else {
             modelMap.put("projectDto", new ProjectDto());
@@ -70,6 +74,12 @@ public class ProjectController {
         return String.format("redirect:%s", "/projects/projects");
     }
 
+    @PostMapping(value = "/project", params = "attachGrant")
+    public String attachGrant(ProjectDto projectDto) {
+        projectService.attachGrant(projectDto);
+        return "/projects/project";
+    }
+
     @PostMapping(value = "/project", params = "addDeadline")
     public String addDeadline(@Valid ProjectDto projectDto, Errors errors) {
         filterEmptyDeadlines(projectDto);
@@ -98,6 +108,11 @@ public class ProjectController {
         return projectService.getProjectExecutors(projectDto);
     }
 
+    @ModelAttribute("allGrants")
+    public List<GrantDto> getAllGrants() {
+        return projectService.getAllGrants();
+    }
+
     private void filterEmptyDeadlines(ProjectDto projectDto) {
         projectDto.setDeadlines(projectDto.getDeadlines().stream()
                 .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java
index cb53645..27a4ae6 100644
--- a/src/main/java/ru/ulstu/project/model/Project.java
+++ b/src/main/java/ru/ulstu/project/model/Project.java
@@ -1,5 +1,7 @@
 package ru.ulstu.project.model;
 
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
 import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.core.model.UserContainer;
@@ -8,15 +10,17 @@ import ru.ulstu.file.model.FileData;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.timeline.model.Event;
 import ru.ulstu.user.model.User;
-import javax.persistence.CascadeType;
+
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+import javax.persistence.CascadeType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.FetchType;
+import javax.persistence.ManyToMany;
+import javax.persistence.JoinTable;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -76,6 +80,13 @@ public class Project extends BaseEntity implements UserContainer {
     @ManyToMany(fetch = FetchType.LAZY)
     private List<User> executors = new ArrayList<>();
 
+    @ManyToMany(fetch = FetchType.LAZY)
+    @JoinTable(name = "project_grants",
+            joinColumns = {@JoinColumn(name = "project_id")},
+            inverseJoinColumns = {@JoinColumn(name = "grants_id")})
+    @Fetch(FetchMode.SUBSELECT)
+    private List<Grant> grants = new ArrayList<>();
+
     public String getTitle() {
         return title;
     }
@@ -153,4 +164,12 @@ public class Project extends BaseEntity implements UserContainer {
         Set<User> users = new HashSet<User>(getExecutors());
         return users;
     }
+
+    public List<Grant> getGrants() {
+        return grants;
+    }
+
+    public void setGrants(List<Grant> grants) {
+        this.grants = grants;
+    }
 }
diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index affee4e..7da4ac4 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.grant.model.Grant;
 import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.user.model.User;
 import ru.ulstu.user.model.UserDto;
@@ -31,6 +32,8 @@ public class ProjectDto {
     private List<Integer> removedDeadlineIds = new ArrayList<>();
     private Set<Integer> executorIds;
     private List<UserDto> executors;
+    private List<Integer> grantIds;
+    private List<GrantDto> grants;
 
     private final static int MAX_EXECUTORS_LENGTH = 40;
 
@@ -50,7 +53,9 @@ public class ProjectDto {
                       @JsonProperty("repository") String repository,
                       @JsonProperty("deadlines") List<Deadline> deadlines,
                       @JsonProperty("executorIds") Set<Integer> executorIds,
-                      @JsonProperty("executors") List<UserDto> executors) {
+                      @JsonProperty("executors") List<UserDto> executors,
+                      @JsonProperty("grantIds") List<Integer> grantIds,
+                      @JsonProperty("grants") List<GrantDto> grants) {
         this.id = id;
         this.title = title;
         this.status = status;
@@ -61,6 +66,8 @@ public class ProjectDto {
         this.applicationFileName = null;
         this.executorIds = executorIds;
         this.executors = executors;
+        this.grantIds = grantIds;
+        this.grants = grants;
     }
 
 
@@ -76,6 +83,8 @@ public class ProjectDto {
         this.deadlines = project.getDeadlines();
         this.executorIds = convert(users, user -> user.getId());
         this.executors = convert(project.getExecutors(), UserDto::new);
+        this.grantIds = convert(project.getGrants(), grant -> grant.getId());
+        this.grants = convert(project.getGrants(), GrantDto::new);
     }
 
     public Integer getId() {
@@ -172,4 +181,20 @@ public class ProjectDto {
                 .map(executor -> executor.getLastName())
                 .collect(Collectors.joining(", ")), MAX_EXECUTORS_LENGTH);
     }
+
+    public List<Integer> getGrantIds() {
+        return grantIds;
+    }
+
+    public void setGrantIds(List<Integer> grantIds) {
+        this.grantIds = grantIds;
+    }
+
+    public List<GrantDto> getGrants() {
+        return grants;
+    }
+
+    public void setGrants(List<GrantDto> grants) {
+        this.grants = grants;
+    }
 }
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index 30b5f01..fe0671c 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -5,6 +5,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.file.service.FileService;
+import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.repository.GrantRepository;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
@@ -16,6 +17,7 @@ import ru.ulstu.user.service.UserService;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 import static org.springframework.util.ObjectUtils.isEmpty;
 import static ru.ulstu.core.util.StreamApiUtils.convert;
@@ -104,6 +106,10 @@ public class ProjectService {
         if (projectDto.getApplicationFileName() != null) {
             project.setApplication(fileService.createFileFromTmp(projectDto.getApplicationFileName()));
         }
+        project.getGrants().clear();
+        if (projectDto.getGrantIds() != null && !projectDto.getGrantIds().isEmpty()) {
+            projectDto.getGrantIds().forEach(grantIds -> project.getGrants().add(grantRepository.findGrantById(grantIds)));
+        }
         return project;
     }
 
@@ -131,4 +137,22 @@ public class ProjectService {
         return users;
     }
 
+    public List<GrantDto> getAllGrants() {
+        List<GrantDto> grants = convert(grantRepository.findAll(), GrantDto::new);
+        return grants;
+    }
+
+    public List<GrantDto> getProjectGrants(List<Integer> grantIds) {
+        return convert(grantRepository.findAll(grantIds), GrantDto::new);
+    }
+
+    public void attachGrant(ProjectDto projectDto) {
+        if (!projectDto.getGrantIds().isEmpty()) {
+            projectDto.getGrants().clear();
+            projectDto.setGrants(getProjectGrants(projectDto.getGrantIds()));
+        } else {
+            projectDto.getGrants().clear();
+        }
+    }
+
 }
diff --git a/src/main/java/ru/ulstu/timeline/service/EventService.java b/src/main/java/ru/ulstu/timeline/service/EventService.java
index eef38eb..8f5376e 100644
--- a/src/main/java/ru/ulstu/timeline/service/EventService.java
+++ b/src/main/java/ru/ulstu/timeline/service/EventService.java
@@ -225,7 +225,7 @@ public class EventService {
             if (newProject.getExecutors() != null) {
                 newEvent.setRecipients(new ArrayList(newProject.getExecutors()));
             }
-            newEvent.getRecipients().add((User) newProject.getExecutors());
+//            newEvent.getRecipients().add((User) newProject.getExecutors());
             newEvent.setProject(newProject);
             eventRepository.save(newEvent);
 
diff --git a/src/main/resources/db/changelog-20190529_000000-schema.xml b/src/main/resources/db/changelog-20190529_000000-schema.xml
new file mode 100644
index 0000000..40079ff
--- /dev/null
+++ b/src/main/resources/db/changelog-20190529_000000-schema.xml
@@ -0,0 +1,17 @@
+<?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="anton" id="20190528_000000-3">
+        <createTable tableName="project_grants">
+            <column name="project_id" type="integer"/>
+            <column name="grants_id" type="integer"/>
+        </createTable>
+        <addForeignKeyConstraint baseTableName="project_grants" baseColumnNames="project_id"
+                                 constraintName="fk_project_project_grants" referencedTableName="project"
+                                 referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="project_grants" baseColumnNames="grants_id"
+                                 constraintName="fk_grant_project_grants" referencedTableName="grants"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 1cede5f..6dadded 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -50,4 +50,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-20190529_000000-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/project.html b/src/main/resources/templates/projects/project.html
index 2c4a67b..67dac69 100644
--- a/src/main/resources/templates/projects/project.html
+++ b/src/main/resources/templates/projects/project.html
@@ -51,12 +51,18 @@
                                 </div>
 
                                 <div class="form-group">
-                                    <label for="createGrant">Добавить грант:</label>
-                                    <div th:if="*{grant} == null">
-                                        <input type="submit" id="createGrant" name="createGrant" class="btn btn-primary"
-                                               value="Добавить грант"/>
+                                    <label>Добавить грант:</label>
+                                    <div class="row">
+                                        <div class="col-10">
+                                            <select class="selectpicker form-control" data-live-search="true"
+                                                    title="-- Прикрепить грант --" id="allGrants"
+                                                    th:field="*{grantIds}" data-size="5">
+                                                <option th:each="grant : ${allGrants}" th:value="${grant.id}"
+                                                        th:text="${grant.title}"> Грант для прикрепления
+                                                </option>
+                                            </select>
+                                        </div>
                                     </div>
-                                    <input type="hidden" th:field="*{grant.id}"/>
                                 </div>
 
                                 <div class="form-group">

From 632c6299b776664dd0ca15def3496739c5ecf5a8 Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Thu, 30 May 2019 00:08:13 +0400
Subject: [PATCH 56/74] #101 files attach modified

---
 .../java/ru/ulstu/project/model/Project.java  | 15 +--
 .../ru/ulstu/project/model/ProjectDto.java    | 17 ++--
 .../ulstu/project/service/ProjectService.java | 19 ++--
 .../db/changelog-20190529_000001-schema.xml   | 13 +++
 src/main/resources/db/changelog-master.xml    |  1 +
 .../fragments/projectFilesListFragment.html   | 40 ++++++++
 .../resources/templates/projects/project.html | 97 ++++++++++++++++++-
 7 files changed, 176 insertions(+), 26 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20190529_000001-schema.xml
 create mode 100644 src/main/resources/templates/projects/fragments/projectFilesListFragment.html

diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java
index 27a4ae6..0c0af94 100644
--- a/src/main/java/ru/ulstu/project/model/Project.java
+++ b/src/main/java/ru/ulstu/project/model/Project.java
@@ -69,9 +69,10 @@ public class Project extends BaseEntity implements UserContainer {
     @NotNull
     private String repository;
 
-    @ManyToOne
-    @JoinColumn(name = "file_id")
-    private FileData application;
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @JoinColumn(name = "project_id", unique = true)
+    @Fetch(FetchMode.SUBSELECT)
+    private List<FileData> files = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     @JoinColumn(name = "project_id")
@@ -135,12 +136,12 @@ public class Project extends BaseEntity implements UserContainer {
         this.deadlines = deadlines;
     }
 
-    public FileData getApplication() {
-        return application;
+    public List<FileData> getFiles() {
+        return files;
     }
 
-    public void setApplication(FileData application) {
-        this.application = application;
+    public void setFiles(List<FileData> files) {
+        this.files = files;
     }
 
     public List<Event> getEvents() {
diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index 7da4ac4..fb60703 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.model.Deadline;
-import ru.ulstu.grant.model.Grant;
+import ru.ulstu.file.model.FileDataDto;
 import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.user.model.User;
 import ru.ulstu.user.model.UserDto;
@@ -28,7 +28,7 @@ public class ProjectDto {
     private List<Deadline> deadlines = new ArrayList<>();
     private GrantDto grant;
     private String repository;
-    private String applicationFileName;
+    private List<FileDataDto> files = new ArrayList<>();
     private List<Integer> removedDeadlineIds = new ArrayList<>();
     private Set<Integer> executorIds;
     private List<UserDto> executors;
@@ -51,6 +51,7 @@ public class ProjectDto {
                       @JsonProperty("description") String description,
                       @JsonProperty("grant") GrantDto grant,
                       @JsonProperty("repository") String repository,
+                      @JsonProperty("files") List<FileDataDto> files,
                       @JsonProperty("deadlines") List<Deadline> deadlines,
                       @JsonProperty("executorIds") Set<Integer> executorIds,
                       @JsonProperty("executors") List<UserDto> executors,
@@ -63,7 +64,7 @@ public class ProjectDto {
         this.grant = grant;
         this.repository = repository;
         this.deadlines = deadlines;
-        this.applicationFileName = null;
+        this.files = files;
         this.executorIds = executorIds;
         this.executors = executors;
         this.grantIds = grantIds;
@@ -77,7 +78,7 @@ public class ProjectDto {
         this.title = project.getTitle();
         this.status = project.getStatus();
         this.description = project.getDescription();
-        this.applicationFileName = project.getApplication() == null ? null : project.getApplication().getName();
+        this.files = convert(project.getFiles(), FileDataDto::new);
         this.grant = project.getGrant() == null ? null : new GrantDto(project.getGrant());
         this.repository = project.getRepository();
         this.deadlines = project.getDeadlines();
@@ -143,12 +144,12 @@ public class ProjectDto {
         this.deadlines = deadlines;
     }
 
-    public String getApplicationFileName() {
-        return applicationFileName;
+    public List<FileDataDto> getFiles() {
+        return files;
     }
 
-    public void setApplicationFileName(String applicationFileName) {
-        this.applicationFileName = applicationFileName;
+    public void setFiles(List<FileDataDto> files) {
+        this.files = files;
     }
 
     public List<Integer> getRemovedDeadlineIds() {
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index fe0671c..e77cc88 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -4,6 +4,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.service.DeadlineService;
+import ru.ulstu.file.model.FileDataDto;
 import ru.ulstu.file.service.FileService;
 import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.repository.GrantRepository;
@@ -19,6 +20,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
+import static java.util.stream.Collectors.toList;
 import static org.springframework.util.ObjectUtils.isEmpty;
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 import static ru.ulstu.project.model.Project.ProjectStatus.TECHNICAL_TASK;
@@ -77,20 +79,19 @@ public class ProjectService {
     @Transactional
     public Project update(ProjectDto projectDto) throws IOException {
         Project project = projectRepository.findOne(projectDto.getId());
-        if (projectDto.getApplicationFileName() != null && project.getApplication() != null) {
-            fileService.deleteFile(project.getApplication());
-        }
         projectRepository.save(copyFromDto(project, projectDto));
         eventService.updateProjectDeadlines(project);
+        for (FileDataDto file : projectDto.getFiles().stream()
+                .filter(f -> f.isDeleted() && f.getId() != null)
+                .collect(toList())) {
+            fileService.delete(file.getId());
+        }
         return project;
     }
 
     @Transactional
     public void delete(Integer projectId) throws IOException {
         Project project = projectRepository.findOne(projectId);
-        if (project.getApplication() != null) {
-            fileService.deleteFile(project.getApplication());
-        }
         projectRepository.delete(project);
     }
 
@@ -103,9 +104,9 @@ public class ProjectService {
         }
         project.setRepository(projectDto.getRepository());
         project.setDeadlines(deadlineService.saveOrCreate(projectDto.getDeadlines()));
-        if (projectDto.getApplicationFileName() != null) {
-            project.setApplication(fileService.createFileFromTmp(projectDto.getApplicationFileName()));
-        }
+        project.setFiles(fileService.saveOrCreate(projectDto.getFiles().stream()
+                .filter(f -> !f.isDeleted())
+                .collect(toList())));
         project.getGrants().clear();
         if (projectDto.getGrantIds() != null && !projectDto.getGrantIds().isEmpty()) {
             projectDto.getGrantIds().forEach(grantIds -> project.getGrants().add(grantRepository.findGrantById(grantIds)));
diff --git a/src/main/resources/db/changelog-20190529_000001-schema.xml b/src/main/resources/db/changelog-20190529_000001-schema.xml
new file mode 100644
index 0000000..0b6548b
--- /dev/null
+++ b/src/main/resources/db/changelog-20190529_000001-schema.xml
@@ -0,0 +1,13 @@
+<?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="anton" id="20190529_000001-1">
+        <addColumn tableName="file">
+            <column name="project_id" type="integer"/>
+        </addColumn>
+        <addForeignKeyConstraint baseTableName="file" baseColumnNames="project_id"
+                                 constraintName="fk_file_project" referencedTableName="project"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 6dadded..529b597 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -51,4 +51,5 @@
     <include file="db/changelog-20190528_000000-schema.xml"/>
     <include file="db/changelog-20190528_000002-schema.xml"/>
     <include file="db/changelog-20190529_000000-schema.xml"/>
+    <include file="db/changelog-20190529_000001-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/fragments/projectFilesListFragment.html b/src/main/resources/templates/projects/fragments/projectFilesListFragment.html
new file mode 100644
index 0000000..0e803d9
--- /dev/null
+++ b/src/main/resources/templates/projects/fragments/projectFilesListFragment.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8"/>
+</head>
+<body>
+<body>
+<div th:fragment="filesList">
+    <th:block th:each="file, rowStat : *{files}">
+
+        <div class="row" th:id="|files${rowStat.index}|"
+             th:style="${file.deleted} ? 'display: none;' :''">
+            <input type="hidden" th:field="*{files[__${rowStat.index}__].id}"/>
+            <input type="hidden"
+                   th:field="*{files[__${rowStat.index}__].deleted}"/>
+            <input type="hidden"
+                   th:field="*{files[__${rowStat.index}__].name}"/>
+            <input type="hidden"
+                   th:field="*{files[__${rowStat.index}__].tmpFileName}"/>
+            <div class="col-2">
+                <a class="btn btn-danger float-right"
+                   th:onclick="|$('#files${rowStat.index}\\.deleted').val('true'); $('#files${rowStat.index}').hide(); |">
+                    <span aria-hidden="true"><i class="fa fa-times"/></span>
+                </a>
+            </div>
+            <div class="col-10">
+                <a th:onclick="${file.id==null} ?  'downloadFile('+${file.tmpFileName}+',null,\''+${file.name}+'\')':
+                                                    'downloadFile(null,'+${file.id}+',\''+${file.name}+'\')' "
+                   href="javascript:void(0)"
+                   th:text="*{files[__${rowStat.index}__].name}">
+                </a>
+            </div>
+        </div>
+    </th:block>
+</div>
+</body>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/project.html b/src/main/resources/templates/projects/project.html
index 67dac69..0d132e9 100644
--- a/src/main/resources/templates/projects/project.html
+++ b/src/main/resources/templates/projects/project.html
@@ -119,6 +119,13 @@
                                            value="Добавить дедлайн"/>
                                 </div>
 
+                                <div class="form-group files-list" id="files-list">
+                                    <label>Файлы:</label>
+
+                                    <div th:replace="projects/fragments/projectFilesListFragment"/>
+
+                                </div>
+
                                 <div class="form-group">
                                     <label for="loader">Загрузить файл:</label>
                                     <div id="loader">
@@ -154,17 +161,103 @@
             new FileLoader({
                 div: "loader",
                 url: urlFileUpload,
-                maxSize: 2,
-                extensions: ["doc", "docx", "xls", "jpg", "png", "pdf", "txt"],
+                maxSize: -1,
+                extensions: [],
                 callback: function (response) {
                     showFeedbackMessage("Файл успешно загружен");
                     console.debug(response);
+
+                    addNewFile(response, $("#files-list"));
                 }
             });
             $('.selectpicker').selectpicker();
         });
         /*]]>*/
+        function addNewFile(fileDto, listElement) {
+            var fileNumber = $('.files-list div.row').length;
 
+            var newFileRow = $("<div/>")
+                .attr("id", 'files' + fileNumber)
+                .addClass("row");
+
+            var idInput = $("<input/>")
+                .attr("type", "hidden")
+                .attr("id", "files" + fileNumber + ".id")
+                .attr("value", '')
+                .attr("name", "files[" + fileNumber + "].id");
+            newFileRow.append(idInput);
+
+            var flagInput = $("<input/>")
+                .attr("type", "hidden")
+                .attr("id", "files" + fileNumber + ".deleted")
+                .attr("value", "false")
+                .attr("name", "files[" + fileNumber + "].deleted");
+            newFileRow.append(flagInput);
+
+            var nameInput = $("<input/>")
+                .attr("type", "hidden")
+                .attr("id", "files" + fileNumber + ".name")
+                .attr("value", fileDto.fileName)
+                .attr("name", "files[" + fileNumber + "].name");
+            newFileRow.append(nameInput);
+
+            var tmpFileNameInput = $("<input/>")
+                .attr("type", "hidden")
+                .attr("id", "files" + fileNumber + ".tmpFileName")
+                .attr("value", fileDto.tmpFileName)
+                .attr("name", "files[" + fileNumber + "].tmpFileName");
+            newFileRow.append(tmpFileNameInput);
+
+            var nextDiv = $("<div/>")
+                .addClass("col-2");
+
+            var nextA = $("<a/>")
+                .addClass("btn btn-danger float-right")
+                .attr("onclick", "$('#files" + fileNumber + "\\\\.deleted').val('true'); $('#files" + fileNumber + "').hide();")
+                .append(($("<span/>").attr("aria-hidden", "true")).append($("<i/>").addClass("fa fa-times")))
+            ;
+            nextDiv.append(nextA)
+            newFileRow.append(nextDiv);
+
+            var nameDiv = $("<div/>")
+                .addClass("col-10")
+                .append($("<a/>").text(fileDto.fileName)
+                    .attr("href", 'javascript:void(0)')
+                    .attr("onclick", "downloadFile('" + fileDto.tmpFileName + "',null,'" + fileDto.fileName + "')"));
+            newFileRow.append(nameDiv);
+
+            listElement.append(newFileRow);
+
+        }
+
+        function downloadFile(tmpName, fileId, downloadName) {
+            let xhr = new XMLHttpRequest();
+            if (fileId != null) xhr.open('GET', urlFileDownload + fileId);
+            if (tmpName != null) xhr.open('GET', urlFileDownloadTmp + tmpName);
+            xhr.responseType = 'blob';
+
+            var formData = new FormData();
+            if (fileId != null) formData.append("file-id", fileId);
+            if (tmpName != null) formData.append("tmp-file-name", tmpName);
+
+            xhr.send(formData);
+
+            xhr.onload = function () {
+                if (this.status == 200) {
+                    console.debug(this.response);
+                    var blob = new Blob([this.response], {type: '*'});
+                    let a = document.createElement("a");
+                    a.style = "display: none";
+                    document.body.appendChild(a);
+                    let url = window.URL.createObjectURL(blob);
+                    a.href = url;
+                    a.download = downloadName;
+                    a.click();
+                    window.URL.revokeObjectURL(url);
+                } else {
+                }
+            }
+        }
 
     </script>
 </div>

From 4498b712595a72b8ff82799f5f4dc0c737b72abd Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Thu, 30 May 2019 09:53:27 +0400
Subject: [PATCH 57/74] #101 project tests

---
 src/test/java/ProjectTest.java              |  37 +++++++
 src/test/java/project/ProjectDashboard.java |  11 ++
 src/test/java/project/ProjectPage.java      | 107 ++++++++++++++++++++
 src/test/java/project/ProjectsPage.java     |  41 ++++++++
 4 files changed, 196 insertions(+)
 create mode 100644 src/test/java/ProjectTest.java
 create mode 100644 src/test/java/project/ProjectDashboard.java
 create mode 100644 src/test/java/project/ProjectPage.java
 create mode 100644 src/test/java/project/ProjectsPage.java

diff --git a/src/test/java/ProjectTest.java b/src/test/java/ProjectTest.java
new file mode 100644
index 0000000..5791b07
--- /dev/null
+++ b/src/test/java/ProjectTest.java
@@ -0,0 +1,37 @@
+import com.google.common.collect.ImmutableMap;
+import core.PageObject;
+import core.TestTemplate;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import project.ProjectDashboard;
+import project.ProjectPage;
+import project.ProjectsPage;
+import ru.ulstu.NgTrackerApplication;
+import ru.ulstu.configuration.ApplicationProperties;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(SpringRunner.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+public class ProjectTest extends TestTemplate {
+    private final Map<PageObject, List<String>> navigationHolder = ImmutableMap.of(
+            new ProjectPage(), Arrays.asList("ПРОЕКТЫ", "/projects/projects"),
+            new ProjectsPage(), Arrays.asList("РЕДАКТИРОВАНИЕ ПРОЕКТА", "/projects/project?id=0"),
+            new ProjectDashboard(), Arrays.asList("ПРОЕКТЫ", "/projects/dashboard")
+    );
+
+    @Autowired
+    private ApplicationProperties applicationProperties;
+
+    @Test
+    public void testACreateNewProject() {
+    }
+}
diff --git a/src/test/java/project/ProjectDashboard.java b/src/test/java/project/ProjectDashboard.java
new file mode 100644
index 0000000..0b36204
--- /dev/null
+++ b/src/test/java/project/ProjectDashboard.java
@@ -0,0 +1,11 @@
+package project;
+
+import core.PageObject;
+import org.openqa.selenium.By;
+
+public class ProjectDashboard extends PageObject {
+
+    public String getSubTitle() {
+        return driver.findElement(By.tagName("h2")).getText();
+    }
+}
diff --git a/src/test/java/project/ProjectPage.java b/src/test/java/project/ProjectPage.java
new file mode 100644
index 0000000..b392099
--- /dev/null
+++ b/src/test/java/project/ProjectPage.java
@@ -0,0 +1,107 @@
+package project;
+
+import core.PageObject;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+
+public class ProjectPage extends PageObject {
+
+    public String getSubTitle() {
+        return driver.findElement(By.tagName("h3")).getText();
+    }
+
+    public String getId() {
+        return driver.findElement(By.id("id")).getAttribute("value");
+    }
+
+    public void setName(String name) {
+        driver.findElement(By.id("title")).sendKeys(name);
+    }
+
+    public String getName() {
+        return driver.findElement(By.id("title")).getAttribute("value");
+    }
+
+    public void clearName() {
+        driver.findElement(By.id("title")).clear();
+    }
+
+    public void clickSaveBut() {
+        driver.findElement(By.id("send-message-button")).click();
+    }
+
+    public void clickAddDeadlineBut() {
+        driver.findElement(By.id("addDeadline")).click();
+    }
+
+    public List<WebElement> getDeadlineList() {
+        return driver.findElements(By.className("deadline"));
+    }
+
+    public Integer getDeadlineCount() {
+        return driver.findElements(By.className("deadline")).size();
+    }
+
+    public void setDeadlineDescription(String description, Integer i) {
+        driver.findElement(By.id(String.format("deadlines%d.description", i))).sendKeys(description);
+    }
+
+    public void setDeadlineDate(String date, Integer i) {
+        driver.findElement(By.id(String.format("deadlines%d.date", i))).sendKeys(date);
+    }
+
+    public void clickTakePartBut() {
+        driver.findElement(By.id("take-part")).click();
+    }
+
+    public Boolean isTakePartButDisabledValueTrue() {
+        return driver.findElement(By.id("take-part")).getAttribute("disabled").equals("true");
+    }
+
+    public Integer getMemberCount() {
+        return driver.findElements(By.className("member")).size();
+    }
+
+    public void clickDeleteDeadlineBut() {
+        driver.findElement(By.xpath("//*[@id=\"deadlines\"]/div/input[4]")).click();
+    }
+
+    public void showAllowToAttachArticles() {
+        driver.findElement(By.cssSelector("button[data-id=\"paperIds\"]")).click();
+    }
+
+    public void clickAddPaperBut() {
+        driver.findElement(By.id("add-paper")).click();
+    }
+
+
+    public List<WebElement> getArticles() {
+        return driver.findElements(By.className("paper"));
+    }
+
+    public Integer getArticlesCount() {
+        return driver.findElements(By.className("paper")).size();
+    }
+
+    public WebElement selectArticle() {
+        WebElement webElement = driver.findElement(By.xpath("//*[@id=\"project-form\"]/div/div[2]/div[5]/div/div/div[2]/ul/li[1]/a"));
+        webElement.click();
+        return webElement;
+    }
+
+    public void clickUndockArticleBut() {
+        driver.findElement(By.name("removePaper")).click();
+    }
+
+    public boolean checkDeadline(String description, String dateValue) {
+        return getDeadlineList()
+                .stream()
+                .anyMatch(webElement -> {
+                    return webElement.findElement(By.className("deadline-text")).getAttribute("value").equals(description)
+                            && webElement.findElement(By.cssSelector("input[type=\"date\"]")).getAttribute("value").equals(dateValue);
+                });
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/project/ProjectsPage.java b/src/test/java/project/ProjectsPage.java
new file mode 100644
index 0000000..f0cc4a1
--- /dev/null
+++ b/src/test/java/project/ProjectsPage.java
@@ -0,0 +1,41 @@
+package project;
+
+import core.PageObject;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+
+public class ProjectsPage extends PageObject {
+
+    public String getSubTitle() {
+        return driver.findElement(By.tagName("h2")).getText();
+    }
+
+    public List<WebElement> getProjectsList() {
+        return driver.findElements(By.cssSelector("span.h6"));
+    }
+
+    public void getFirstProject() {
+        driver.findElement(By.xpath("//*[@id=\"projects\"]/div/div[2]/div[1]/div[1]/div/a")).click();
+    }
+
+    public void selectMember() {
+        driver.findElements(By.className("bootstrap-select")).get(0).findElement(By.className("btn")).click();
+        driver.findElements(By.className("bootstrap-select")).get(0).findElements(By.className("dropdown-item")).get(1).click();
+    }
+
+    public void deleteFirst() {
+        js.executeScript("$('input[data-confirm]').click();");
+    }
+
+    public void clickConfirm() {
+        driver.findElement(By.id("deleteProject")).click();
+    }
+
+    public boolean checkNameInList(String newProjectName) {
+        return getProjectsList()
+                .stream()
+                .anyMatch(webElement -> webElement.getText().equals(newProjectName));
+    }
+}
\ No newline at end of file

From 9388302a47c9548eb6fa4055c11f7ce6fc9cade4 Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Fri, 31 May 2019 01:08:40 +0400
Subject: [PATCH 58/74] #101 project tests

---
 src/main/resources/templates/index.html       |   2 +-
 src/test/java/ProjectTest.java                | 137 ++++++++++++++++++
 src/test/java/project/ProjectPage.java        |  52 +++++--
 src/test/java/project/ProjectsPage.java       |   4 +-
 .../project/service/ProjectServiceTest.java   |   1 +
 5 files changed, 184 insertions(+), 12 deletions(-)
 create mode 100644 src/test/java/ru/ulstu/project/service/ProjectServiceTest.java

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 6bb134e..f821549 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -40,7 +40,7 @@
                 </div>
             </div>
             <div class="col-md-4 col-sm-6 portfolio-item">
-                <a class="portfolio-link" href="./projects/dashboard">
+                <a class="portfolio-link" href="./projects/projects">
                     <div class="portfolio-hover">
                         <div class="portfolio-hover-content">
                             <i class="fa fa-arrow-right fa-3x"></i>
diff --git a/src/test/java/ProjectTest.java b/src/test/java/ProjectTest.java
index 5791b07..f2c6367 100644
--- a/src/test/java/ProjectTest.java
+++ b/src/test/java/ProjectTest.java
@@ -1,6 +1,8 @@
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
 import core.PageObject;
 import core.TestTemplate;
+import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -15,6 +17,7 @@ import ru.ulstu.NgTrackerApplication;
 import ru.ulstu.configuration.ApplicationProperties;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -33,5 +36,139 @@ public class ProjectTest extends TestTemplate {
 
     @Test
     public void testACreateNewProject() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 1);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(page.getKey());
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 0).getKey());
+        String name = "Project " + (new Date()).getTime();
+        String date = "01.01.2019";
+        Integer deadNum = projectPage.getDeadlineCount();
+        projectPage.setName(name);
+        projectPage.clickAddDeadline();
+        projectPage.addDeadlineDate(date, deadNum);
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testBChangeNameAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = "Project " + (new Date()).getTime();
+        projectPage.clearName();
+        projectPage.setName(name);
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testCChangeDeadlineAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        String date = "01.01.2019";
+        Integer deadNum = projectPage.getDeadlineCount();
+        projectPage.addDeadlineDate(date, deadNum);
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testDSetStatusAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        projectPage.setStatus();
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testEAddDescriptionAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        String description = "Description " + (new Date()).getTime();
+        projectPage.addDescription(description);
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testFAddLinkAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        String link = "Link " + (new Date()).getTime();
+        projectPage.addLink(link);
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testGAddDeadlineDescriptionAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        String deadDesc = "Description " + (new Date()).getTime();
+        projectPage.addDeadlineDescription(deadDesc);
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testHSetDeadlineCompletionAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        projectPage.setDeadlineCompletion();
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testIDeleteDeadline() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        projectPage.clickDeleteDeadline();
+        Assert.assertTrue(projectPage.getDeadlineCount() == 0);
+    }
+
+    @Test
+    public void testJDeleteProject() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        projectPage.clickSave();
+        projectsPage.deleteFirst();
+        projectsPage.clickConfirm();
+        Assert.assertFalse(projectsPage.checkNameInList(name));
     }
 }
diff --git a/src/test/java/project/ProjectPage.java b/src/test/java/project/ProjectPage.java
index b392099..1bbad67 100644
--- a/src/test/java/project/ProjectPage.java
+++ b/src/test/java/project/ProjectPage.java
@@ -28,14 +28,43 @@ public class ProjectPage extends PageObject {
         driver.findElement(By.id("title")).clear();
     }
 
-    public void clickSaveBut() {
-        driver.findElement(By.id("send-message-button")).click();
+    public void clickSave() {
+        driver.findElement(By.id("sendMessageButton")).click();
     }
 
-    public void clickAddDeadlineBut() {
+    public void clickAddDeadline() {
         driver.findElement(By.id("addDeadline")).click();
     }
 
+    public void addDeadlineDate(String deadDate, Integer deadNum) {
+        driver.findElement(By.id(String.format("deadlines%d.date", deadNum))).sendKeys(deadDate);
+    }
+
+    public void addDeadlineDescription(String description) {
+        driver.findElement(By.id("deadlines0.description")).sendKeys(description);
+    }
+
+    public void setDeadlineCompletion() {
+        driver.findElement(By.id("deadlines0.done1")).click();
+    }
+
+    public void setStatus() {
+        driver.findElement(By.id("status")).click();
+        getFirstStatus();
+    }
+
+    public void getFirstStatus() {
+        driver.findElement(By.xpath("//*[@id=\"status\"]/option[1]")).click();
+    }
+
+    public void addDescription(String description) {
+        driver.findElement(By.id("description")).sendKeys(description);
+    }
+
+    public void addLink(String link) {
+        driver.findElement(By.id("repository")).sendKeys(link);
+    }
+
     public List<WebElement> getDeadlineList() {
         return driver.findElements(By.className("deadline"));
     }
@@ -44,6 +73,15 @@ public class ProjectPage extends PageObject {
         return driver.findElements(By.className("deadline")).size();
     }
 
+    public void setExecutors() {
+        driver.findElement(By.id("status")).click();
+        getFirstExecutor();
+    }
+
+    public void getFirstExecutor() {
+        driver.findElement(By.xpath("//*[@id=\"status\"]/option[1]")).click();
+    }
+
     public void setDeadlineDescription(String description, Integer i) {
         driver.findElement(By.id(String.format("deadlines%d.description", i))).sendKeys(description);
     }
@@ -52,10 +90,6 @@ public class ProjectPage extends PageObject {
         driver.findElement(By.id(String.format("deadlines%d.date", i))).sendKeys(date);
     }
 
-    public void clickTakePartBut() {
-        driver.findElement(By.id("take-part")).click();
-    }
-
     public Boolean isTakePartButDisabledValueTrue() {
         return driver.findElement(By.id("take-part")).getAttribute("disabled").equals("true");
     }
@@ -64,8 +98,8 @@ public class ProjectPage extends PageObject {
         return driver.findElements(By.className("member")).size();
     }
 
-    public void clickDeleteDeadlineBut() {
-        driver.findElement(By.xpath("//*[@id=\"deadlines\"]/div/input[4]")).click();
+    public void clickDeleteDeadline() {
+        driver.findElement(By.className("btn-danger")).click();
     }
 
     public void showAllowToAttachArticles() {
diff --git a/src/test/java/project/ProjectsPage.java b/src/test/java/project/ProjectsPage.java
index f0cc4a1..64c50b7 100644
--- a/src/test/java/project/ProjectsPage.java
+++ b/src/test/java/project/ProjectsPage.java
@@ -26,11 +26,11 @@ public class ProjectsPage extends PageObject {
     }
 
     public void deleteFirst() {
-        js.executeScript("$('input[data-confirm]').click();");
+        js.executeScript("$('a[data-confirm]').click();");
     }
 
     public void clickConfirm() {
-        driver.findElement(By.id("deleteProject")).click();
+        driver.findElement(By.id("dataConfirmOK")).click();
     }
 
     public boolean checkNameInList(String newProjectName) {
diff --git a/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java b/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java
new file mode 100644
index 0000000..1f2debe
--- /dev/null
+++ b/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java
@@ -0,0 +1 @@
+package ru.ulstu.project.service;
\ No newline at end of file

From a7b48e1534eb191a26f6543436209a0fd8bd8835 Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Fri, 31 May 2019 02:23:15 +0400
Subject: [PATCH 59/74] #101 project tests

---
 .../ulstu/project/service/ProjectService.java |  13 +-
 .../project/service/ProjectServiceTest.java   | 149 +++++++++++++++++-
 2 files changed, 157 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index e77cc88..80bd52f 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -90,9 +90,13 @@ public class ProjectService {
     }
 
     @Transactional
-    public void delete(Integer projectId) throws IOException {
-        Project project = projectRepository.findOne(projectId);
-        projectRepository.delete(project);
+    public boolean delete(Integer projectId) throws IOException {
+        if (projectRepository.exists(projectId)) {
+            Project project = projectRepository.findOne(projectId);
+            projectRepository.delete(project);
+            return true;
+        }
+        return false;
     }
 
     private Project copyFromDto(Project project, ProjectDto projectDto) throws IOException {
@@ -122,11 +126,12 @@ public class ProjectService {
         }
     }
 
-    public void removeDeadline(ProjectDto projectDto, Integer deadlineId) {
+    public ProjectDto removeDeadline(ProjectDto projectDto, Integer deadlineId) {
         if (deadlineId != null) {
             projectDto.getRemovedDeadlineIds().add(deadlineId);
         }
         projectDto.getDeadlines().remove((int) deadlineId);
+        return projectDto;
     }
 
     public Project findById(Integer id) {
diff --git a/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java b/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java
index 1f2debe..7c4f5fa 100644
--- a/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java
+++ b/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java
@@ -1 +1,148 @@
-package ru.ulstu.project.service;
\ No newline at end of file
+package ru.ulstu.project.service;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.deadline.service.DeadlineService;
+import ru.ulstu.file.model.FileData;
+import ru.ulstu.file.service.FileService;
+import ru.ulstu.grant.model.GrantDto;
+import ru.ulstu.grant.service.GrantService;
+import ru.ulstu.project.model.Project;
+import ru.ulstu.project.model.ProjectDto;
+import ru.ulstu.project.repository.ProjectRepository;
+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.*;
+
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ProjectServiceTest {
+
+    @Mock
+    ProjectRepository projectRepository;
+
+    @Mock
+    DeadlineService deadlineService;
+
+    @Mock
+    EventService eventService;
+
+    @Mock
+    FileService fileService;
+
+    @Mock
+    UserService userService;
+
+    @Mock
+    GrantService grantService;
+
+    @InjectMocks
+    ProjectService projectService;
+
+    private final static String TITLE = "title";
+    private final static String DESCR = "descr";
+    private final static Integer ID = 1;
+    private final static Integer INDEX = 0;
+    private final static String NAME = "name";
+
+    private List<Project> projects;
+    private Project project;
+    private ProjectDto projectDto;
+    private Deadline deadline;
+    private List<Deadline> deadlines;
+    private FileData file;
+    private List<FileData> files;
+    private User user;
+    private GrantDto grant;
+    private List<GrantDto> grants;
+
+    @Before
+    public void setUp() throws Exception {
+        projects = new ArrayList<>();
+        project = new Project();
+
+        projects.add(project);
+        projectDto = new ProjectDto(project);
+
+        deadlines = new ArrayList<>();
+        deadline = new Deadline(new Date(), DESCR);
+        deadline.setId(ID);
+        deadlines.add(deadline);
+
+        user = new User();
+        user.setFirstName(NAME);
+
+        grants = new ArrayList<>();
+        grant = new GrantDto();
+        grant.setId(ID);
+        grants.add(grant);
+    }
+
+    @Test
+    public void findAll() {
+        when(projectRepository.findAll()).thenReturn(projects);
+        assertEquals(projects, projectService.findAll());
+    }
+
+    @Test
+    public void create() throws IOException {
+        when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines);
+        when(projectRepository.save(new Project())).thenReturn(project);
+        eventService.createFromProject(new Project());
+
+        projectDto.setTitle(TITLE);
+        projectDto.setDeadlines(deadlines);
+
+        project.setId(ID);
+        project.setTitle(TITLE);
+        project.setDescription(DESCR);
+        project.setDeadlines(deadlines);
+        project.setFiles(files);
+
+        assertEquals(project.getId(), (projectService.create(projectDto)).getId());
+    }
+
+    @Test
+    public void delete() throws IOException {
+        when(projectRepository.exists(ID)).thenReturn(true);
+        when(projectRepository.findOne(ID)).thenReturn(project);
+
+        assertTrue(projectService.delete(ID));
+    }
+
+    @Test
+    public void getProjectExecutors() {
+        List<User> executors = Collections.singletonList(user);
+        when(userService.findAll()).thenReturn(executors);
+
+        assertEquals(executors, projectService.getProjectExecutors(projectDto));
+    }
+
+    @Test
+    public void findById() {
+        when(projectRepository.findOne(ID)).thenReturn(project);
+        assertEquals(project, projectService.findById(ID));
+    }
+
+    @Test
+    public void removeDeadline() throws IOException {
+        ProjectDto newProjectDto = new ProjectDto();
+        newProjectDto.getRemovedDeadlineIds().add(INDEX);
+        projectDto.getDeadlines().add(deadline);
+        ProjectDto result = projectService.removeDeadline(projectDto, INDEX);
+
+        assertEquals(newProjectDto.getDeadlines(), result.getDeadlines());
+        assertEquals(newProjectDto.getRemovedDeadlineIds(), result.getRemovedDeadlineIds());
+    }
+}
\ No newline at end of file

From b4b7b9087e024617a83e29fb6d62644bd6c4b2fc Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 31 May 2019 08:12:57 +0400
Subject: [PATCH 60/74] fix npe

---
 src/main/java/ru/ulstu/grant/service/GrantService.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index 86f8f1b..3243ace 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -232,10 +232,8 @@ public class GrantService extends BaseService {
 
     private boolean checkSameDeadline(GrantDto grantDto, Integer id) {
         Date date = grantDto.getDeadlines().get(0).getDate(); //дата с сайта киас
-        if (deadlineService.findByGrantIdAndDate(id, date).compareTo(date) == 0) { //если есть такая строка с датой
-            return true;
-        }
-        return false;
+        Date foundGrantDate = deadlineService.findByGrantIdAndDate(id, date);
+        return foundGrantDate != null && foundGrantDate.compareTo(date) == 0;
     }
 
     public List<User> getGrantAuthors(GrantDto grantDto) {

From d2ce6d604e4ef228a28be0fbe2ac865f0061bcda Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 31 May 2019 08:46:21 +0400
Subject: [PATCH 61/74] fix merging collection

---
 .../java/ru/ulstu/timeline/service/EventService.java     | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ru/ulstu/timeline/service/EventService.java b/src/main/java/ru/ulstu/timeline/service/EventService.java
index 8c68291..f9b88f3 100644
--- a/src/main/java/ru/ulstu/timeline/service/EventService.java
+++ b/src/main/java/ru/ulstu/timeline/service/EventService.java
@@ -105,7 +105,7 @@ public class EventService {
     public void createFromPaper(Paper newPaper) {
         List<Timeline> timelines = timelineService.findAll();
         Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0);
-
+        timeline.getEvents().removeAll(newPaper.getEvents());
         for (Deadline deadline : newPaper.getDeadlines()
                 .stream()
                 .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
@@ -119,16 +119,13 @@ public class EventService {
             newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' cтатьи '" + newPaper.getTitle() + "'");
             newEvent.setRecipients(new ArrayList(newPaper.getAuthors()));
             newEvent.setPaper(newPaper);
-            eventRepository.save(newEvent);
-
-            timeline.getEvents().add(newEvent);
-            timelineService.save(timeline);
+            timeline.getEvents().add(eventRepository.save(newEvent));
         }
+        timelineService.save(timeline);
     }
 
     public void updatePaperDeadlines(Paper paper) {
         eventRepository.delete(eventRepository.findAllByPaper(paper));
-
         createFromPaper(paper);
     }
 

From a878f8c22ca04636449f0d33feb99354cd213540 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 31 May 2019 09:06:21 +0400
Subject: [PATCH 62/74] fix remove older events

---
 .../ru/ulstu/timeline/service/EventService.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/ulstu/timeline/service/EventService.java b/src/main/java/ru/ulstu/timeline/service/EventService.java
index f9b88f3..328014a 100644
--- a/src/main/java/ru/ulstu/timeline/service/EventService.java
+++ b/src/main/java/ru/ulstu/timeline/service/EventService.java
@@ -17,6 +17,8 @@ import ru.ulstu.user.model.UserDto;
 import ru.ulstu.user.service.UserService;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -103,9 +105,13 @@ public class EventService {
     }
 
     public void createFromPaper(Paper newPaper) {
+        createFromPaper(newPaper, Collections.emptyList());
+    }
+
+    public void createFromPaper(Paper newPaper, List<Event> events) {
         List<Timeline> timelines = timelineService.findAll();
         Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0);
-        timeline.getEvents().removeAll(newPaper.getEvents());
+        timeline.getEvents().removeAll(events);
         for (Deadline deadline : newPaper.getDeadlines()
                 .stream()
                 .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
@@ -125,8 +131,9 @@ public class EventService {
     }
 
     public void updatePaperDeadlines(Paper paper) {
-        eventRepository.delete(eventRepository.findAllByPaper(paper));
-        createFromPaper(paper);
+        List<Event> foundEvents = eventRepository.findAllByPaper(paper);
+        eventRepository.delete(foundEvents);
+        createFromPaper(paper, foundEvents);
     }
 
     public List<Event> findByCurrentDate() {

From 291f4e1e33fcf45ab45390dc3be87c7cd219fe44 Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Sat, 1 Jun 2019 09:44:25 +0400
Subject: [PATCH 63/74] #101 db edited

---
 ...0000-schema.xml => changelog-20190601_000001-schema.xml} | 6 +++---
 src/main/resources/db/changelog-master.xml                  | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename src/main/resources/db/{changelog-20190428_000000-schema.xml => changelog-20190601_000001-schema.xml} (75%)

diff --git a/src/main/resources/db/changelog-20190428_000000-schema.xml b/src/main/resources/db/changelog-20190601_000001-schema.xml
similarity index 75%
rename from src/main/resources/db/changelog-20190428_000000-schema.xml
rename to src/main/resources/db/changelog-20190601_000001-schema.xml
index b44691d..409bde4 100644
--- a/src/main/resources/db/changelog-20190428_000000-schema.xml
+++ b/src/main/resources/db/changelog-20190601_000001-schema.xml
@@ -2,9 +2,9 @@
 <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="anton" id="20190428_000000-1">
+    <changeSet author="anton" id="20190601_000000-1">
         <update tableName="project">
-            <column name="status" value="APPLICATION"/>
+            <column name="status" value="TECHNICAL_TASK"/>
         </update>
     </changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 529b597..aed9997 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -35,7 +35,6 @@
     <include file="db/changelog-20190422_000000-schema.xml"/>
     <include file="db/changelog-20190424_000000-schema.xml"/>
     <include file="db/changelog-20190426_000000-schema.xml"/>
-    <include file="db/changelog-20190428_000000-schema.xml"/>
     <include file="db/changelog-20190430_000000-schema.xml"/>
     <include file="db/changelog-20190505_000000-schema.xml"/>
     <include file="db/changelog-20190505_000001-schema.xml"/>
@@ -51,5 +50,5 @@
     <include file="db/changelog-20190528_000000-schema.xml"/>
     <include file="db/changelog-20190528_000002-schema.xml"/>
     <include file="db/changelog-20190529_000000-schema.xml"/>
-    <include file="db/changelog-20190529_000001-schema.xml"/>
+    <include file="db/changelog-20190601_000001-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file

From 267bd5b0f37f0f257d08c6e4cc7766ced1264d8e Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Sat, 1 Jun 2019 11:44:41 +0400
Subject: [PATCH 64/74] #101 event service edited

---
 .../conference/service/ConferenceService.java |   3 +-
 .../ru/ulstu/grant/service/GrantService.java  |   4 +-
 .../ulstu/project/service/ProjectService.java |   4 +-
 .../ulstu/students/service/TaskService.java   |   9 +-
 .../ulstu/timeline/service/EventService.java  | 257 +++++++++---------
 src/main/resources/db/changelog-master.xml    |   2 +-
 6 files changed, 144 insertions(+), 135 deletions(-)

diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 1b8e67b..3b3bace 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Collections;
 import java.util.stream.Collectors;
 
 import static org.springframework.util.ObjectUtils.isEmpty;
@@ -116,7 +117,7 @@ public class ConferenceService extends BaseService {
         Conference newConference = copyFromDto(new Conference(), conferenceDto);
         newConference = conferenceRepository.save(newConference);
         conferenceNotificationService.sendCreateNotification(newConference);
-        eventService.createFromConference(newConference);
+        eventService.createFromObject(newConference, Collections.emptyList());
         return newConference;
     }
 
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index e5754eb..d8e4aad 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -90,7 +90,7 @@ public class GrantService extends BaseService {
     public Integer create(GrantDto grantDto) throws IOException {
         Grant newGrant = copyFromDto(new Grant(), grantDto);
         newGrant = grantRepository.save(newGrant);
-        eventService.createFromGrant(newGrant);
+        eventService.createFromObject(newGrant, Collections.emptyList());
         grantNotificationService.sendCreateNotification(newGrant);
         return newGrant.getId();
     }
@@ -178,7 +178,7 @@ public class GrantService extends BaseService {
         grant.getPapers().add(paper);
         grant = grantRepository.save(grant);
 
-        eventService.createFromGrant(grant);
+        eventService.createFromObject(grant, Collections.emptyList());
         grantNotificationService.sendCreateNotification(grant);
 
         return grant;
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index 80bd52f..de64c4c 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -17,8 +17,8 @@ import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 
 import static java.util.stream.Collectors.toList;
 import static org.springframework.util.ObjectUtils.isEmpty;
@@ -72,7 +72,7 @@ public class ProjectService {
     public Project create(ProjectDto projectDto) throws IOException {
         Project newProject = copyFromDto(new Project(), projectDto);
         newProject = projectRepository.save(newProject);
-        eventService.createFromProject(newProject);
+        eventService.createFromObject(newProject, Collections.emptyList());
         return newProject;
     }
 
diff --git a/src/main/java/ru/ulstu/students/service/TaskService.java b/src/main/java/ru/ulstu/students/service/TaskService.java
index e89aedf..0a4590a 100644
--- a/src/main/java/ru/ulstu/students/service/TaskService.java
+++ b/src/main/java/ru/ulstu/students/service/TaskService.java
@@ -18,14 +18,15 @@ import ru.ulstu.tags.service.TagService;
 import ru.ulstu.timeline.service.EventService;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
+import java.util.Map;
 import java.util.TreeMap;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.stream.Collectors;
 
 import static org.springframework.util.ObjectUtils.isEmpty;
@@ -83,7 +84,7 @@ public class TaskService {
     public Integer create(TaskDto taskDto) throws IOException {
         Task newTask = copyFromDto(new Task(), taskDto);
         newTask = taskRepository.save(newTask);
-        eventService.createFromTask(newTask);
+        eventService.createFromObject(newTask, Collections.emptyList());
         return newTask.getId();
     }
 
diff --git a/src/main/java/ru/ulstu/timeline/service/EventService.java b/src/main/java/ru/ulstu/timeline/service/EventService.java
index 906a5e6..01113c7 100644
--- a/src/main/java/ru/ulstu/timeline/service/EventService.java
+++ b/src/main/java/ru/ulstu/timeline/service/EventService.java
@@ -1,10 +1,12 @@
 package ru.ulstu.timeline.service;
 
+import com.sun.jna.platform.win32.COM.util.Convert;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.ulstu.conference.model.Conference;
+import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.paper.model.Paper;
@@ -34,6 +36,13 @@ public class EventService {
     private final TimelineService timelineService;
     private final UserService userService;
 
+    private String objectClassName = "";
+    private Paper newPaper = new Paper();
+    private Conference newConference = new Conference();
+    private Grant newGrant = new Grant();
+    private Project newProject = new Project();
+    private Task newTask = new Task();
+
     public EventService(EventRepository eventRepository,
                         @Lazy TimelineService timelineService,
                         UserService userService) {
@@ -107,35 +116,135 @@ public class EventService {
     }
 
     public void createFromPaper(Paper newPaper) {
-        createFromPaper(newPaper, Collections.emptyList());
+        createFromObject(newPaper, Collections.emptyList());
     }
 
-    public void createFromPaper(Paper newPaper, List<Event> events) {
+    public void createFromObject(Object newObject, List<Event> events) {
         List<Timeline> timelines = timelineService.findAll();
         Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0);
-        timeline.getEvents().removeAll(events);
-        for (Deadline deadline : newPaper.getDeadlines()
-                .stream()
-                .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
-                .collect(Collectors.toList())) {
-            Event newEvent = new Event();
-            newEvent.setTitle("Дедлайн статьи");
-            newEvent.setStatus(Event.EventStatus.NEW);
-            newEvent.setExecuteDate(deadline.getDate());
-            newEvent.setCreateDate(new Date());
-            newEvent.setUpdateDate(new Date());
-            newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' cтатьи '" + newPaper.getTitle() + "'");
-            newEvent.setRecipients(new ArrayList(newPaper.getAuthors()));
-            newEvent.setPaper(newPaper);
-            timeline.getEvents().add(eventRepository.save(newEvent));
+        objectClassName = newObject.getClass().getName();
+
+        switch(objectClassName) {
+            case "ru.ulstu.paper.model.Paper":
+                newPaper = (Paper)newObject;
+                timeline.getEvents().removeAll(events);
+                for (Deadline deadline : newPaper.getDeadlines()
+                        .stream()
+                        .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
+                        .collect(Collectors.toList())) {
+                    Event newEvent = new Event();
+                    newEvent.setTitle("Дедлайн статьи");
+                    newEvent.setStatus(Event.EventStatus.NEW);
+                    newEvent.setExecuteDate(deadline.getDate());
+                    newEvent.setCreateDate(new Date());
+                    newEvent.setUpdateDate(new Date());
+                    newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' cтатьи '" + newPaper.getTitle() + "'");
+                    newEvent.setRecipients(new ArrayList(newPaper.getAuthors()));
+                    newEvent.setPaper(newPaper);
+                    timeline.getEvents().add(eventRepository.save(newEvent));
+                }
+                timelineService.save(timeline);
+                break;
+            case "ru.ulstu.conference.model.Conference":
+                newConference = (Conference)newObject;
+                for (Deadline deadline : newConference.getDeadlines()
+                        .stream()
+                        .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
+                        .collect(Collectors.toList())) {
+                    Event newEvent = new Event();
+                    newEvent.setTitle("Дедлайн конференции");
+                    newEvent.setStatus(Event.EventStatus.NEW);
+                    newEvent.setExecuteDate(deadline.getDate());
+                    newEvent.setCreateDate(new Date());
+                    newEvent.setUpdateDate(new Date());
+                    newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' конференции '" + newConference.getTitle() + "'");
+                    newConference.getUsers().forEach(conferenceUser -> newEvent.getRecipients().add(conferenceUser.getUser()));
+                    newEvent.setConference(newConference);
+                    save(newEvent);
+
+                    timeline.getEvents().add(newEvent);
+                    timelineService.save(timeline);
+                }
+                break;
+            case "ru.ulstu.grant.model.Grant":
+                newGrant = (Grant)newObject;
+                for (Deadline deadline : newGrant.getDeadlines()
+                        .stream()
+                        .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
+                        .collect(Collectors.toList())) {
+                    Event newEvent = new Event();
+                    newEvent.setTitle("Дедлайн гранта");
+                    newEvent.setStatus(Event.EventStatus.NEW);
+                    newEvent.setExecuteDate(deadline.getDate());
+                    newEvent.setCreateDate(new Date());
+                    newEvent.setUpdateDate(new Date());
+                    newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' гранта '" + newGrant.getTitle() + "'");
+                    if (newGrant.getAuthors() != null) {
+                        newEvent.setRecipients(new ArrayList(newGrant.getAuthors()));
+                    }
+                    newEvent.getRecipients().add(newGrant.getLeader());
+                    newEvent.setGrant(newGrant);
+                    eventRepository.save(newEvent);
+
+                    timeline.getEvents().add(newEvent);
+                    timelineService.save(timeline);
+                }
+                break;
+            case "ru.ulstu.project.model.Project":
+                newProject = (Project)newObject;
+                for (Deadline deadline : newProject.getDeadlines()
+                        .stream()
+                        .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
+                        .collect(Collectors.toList())) {
+                    Event newEvent = new Event();
+                    newEvent.setTitle("Дедлайн проекта");
+                    newEvent.setStatus(Event.EventStatus.NEW);
+                    newEvent.setExecuteDate(deadline.getDate());
+                    newEvent.setCreateDate(new Date());
+                    newEvent.setUpdateDate(new Date());
+                    newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' проекта '" + newProject.getTitle() + "'");
+                    if (newProject.getExecutors() != null) {
+                        newEvent.setRecipients(new ArrayList(newProject.getExecutors()));
+                    }
+                    newEvent.setProject(newProject);
+                    eventRepository.save(newEvent);
+
+                    timeline.getEvents().add(newEvent);
+                    timelineService.save(timeline);
+                }
+                break;
+            case "ru.ulstu.students.model.Task":
+                newTask = (Task)newObject;
+                for (Deadline deadline : newTask.getDeadlines()
+                        .stream()
+                        .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
+                        .collect(Collectors.toList())) {
+                    Event newEvent = new Event();
+                    newEvent.setTitle("Дедлайн задачи");
+                    newEvent.setStatus(Event.EventStatus.NEW);
+                    newEvent.setExecuteDate(deadline.getDate());
+                    newEvent.setCreateDate(new Date());
+                    newEvent.setUpdateDate(new Date());
+                    newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' задачи '" + newTask.getTitle() + "'");
+                    newEvent.getRecipients().add(userService.getCurrentUser());
+                    newEvent.setTask(newTask);
+                    eventRepository.save(newEvent);
+
+                    timeline.getEvents().add(newEvent);
+                    timelineService.save(timeline);
+                }
+                System.out.println("5");
+                break;
+            default:
+                System.out.println("No such object");
+                break;
         }
-        timelineService.save(timeline);
     }
 
     public void updatePaperDeadlines(Paper paper) {
         List<Event> foundEvents = eventRepository.findAllByPaper(paper);
         eventRepository.delete(foundEvents);
-        createFromPaper(paper, foundEvents);
+        createFromObject(paper, foundEvents);
     }
 
     public List<Event> findByCurrentDate() {
@@ -150,97 +259,19 @@ public class EventService {
         return convert(findAllFuture(), EventDto::new);
     }
 
-    public void createFromConference(Conference newConference) {
-        List<Timeline> timelines = timelineService.findAll();
-        Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0);
-
-        for (Deadline deadline : newConference.getDeadlines()
-                .stream()
-                .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
-                .collect(Collectors.toList())) {
-            Event newEvent = new Event();
-            newEvent.setTitle("Дедлайн конференции");
-            newEvent.setStatus(Event.EventStatus.NEW);
-            newEvent.setExecuteDate(deadline.getDate());
-            newEvent.setCreateDate(new Date());
-            newEvent.setUpdateDate(new Date());
-            newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' конференции '" + newConference.getTitle() + "'");
-            newConference.getUsers().forEach(conferenceUser -> newEvent.getRecipients().add(conferenceUser.getUser()));
-            newEvent.setConference(newConference);
-            save(newEvent);
-
-            timeline.getEvents().add(newEvent);
-            timelineService.save(timeline);
-        }
-    }
-
     public void updateConferenceDeadlines(Conference conference) {
         eventRepository.delete(eventRepository.findAllByConference(conference));
-        createFromConference(conference);
-    }
-
-    public void createFromGrant(Grant newGrant) {
-        List<Timeline> timelines = timelineService.findAll();
-        Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0);
-
-        for (Deadline deadline : newGrant.getDeadlines()
-                .stream()
-                .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
-                .collect(Collectors.toList())) {
-            Event newEvent = new Event();
-            newEvent.setTitle("Дедлайн гранта");
-            newEvent.setStatus(Event.EventStatus.NEW);
-            newEvent.setExecuteDate(deadline.getDate());
-            newEvent.setCreateDate(new Date());
-            newEvent.setUpdateDate(new Date());
-            newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' гранта '" + newGrant.getTitle() + "'");
-            if (newGrant.getAuthors() != null) {
-                newEvent.setRecipients(new ArrayList(newGrant.getAuthors()));
-            }
-            newEvent.getRecipients().add(newGrant.getLeader());
-            newEvent.setGrant(newGrant);
-            eventRepository.save(newEvent);
-
-            timeline.getEvents().add(newEvent);
-            timelineService.save(timeline);
-        }
+        createFromObject(conference, Collections.emptyList());
     }
 
     public void updateGrantDeadlines(Grant grant) {
         eventRepository.delete(eventRepository.findAllByGrant(grant));
-        createFromGrant(grant);
-    }
-
-    public void createFromProject(Project newProject) {
-        List<Timeline> timelines = timelineService.findAll();
-        Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0);
-
-        for (Deadline deadline : newProject.getDeadlines()
-                .stream()
-                .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
-                .collect(Collectors.toList())) {
-            Event newEvent = new Event();
-            newEvent.setTitle("Дедлайн проекта");
-            newEvent.setStatus(Event.EventStatus.NEW);
-            newEvent.setExecuteDate(deadline.getDate());
-            newEvent.setCreateDate(new Date());
-            newEvent.setUpdateDate(new Date());
-            newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' проекта '" + newProject.getTitle() + "'");
-            if (newProject.getExecutors() != null) {
-                newEvent.setRecipients(new ArrayList(newProject.getExecutors()));
-            }
-//            newEvent.getRecipients().add((User) newProject.getExecutors());
-            newEvent.setProject(newProject);
-            eventRepository.save(newEvent);
-
-            timeline.getEvents().add(newEvent);
-            timelineService.save(timeline);
-        }
+        createFromObject(grant, Collections.emptyList());
     }
 
     public void updateProjectDeadlines(Project project) {
         eventRepository.delete(eventRepository.findAllByProject(project));
-        createFromProject(project);
+        createFromObject(project, Collections.emptyList());
     }
 
     public void removeConferencesEvent(Conference conference) {
@@ -248,32 +279,8 @@ public class EventService {
         eventList.forEach(event -> eventRepository.delete(event.getId()));
     }
 
-    public void createFromTask(Task newTask) {
-        List<Timeline> timelines = timelineService.findAll();
-        Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0);
-
-        for (Deadline deadline : newTask.getDeadlines()
-                .stream()
-                .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
-                .collect(Collectors.toList())) {
-            Event newEvent = new Event();
-            newEvent.setTitle("Дедлайн задачи");
-            newEvent.setStatus(Event.EventStatus.NEW);
-            newEvent.setExecuteDate(deadline.getDate());
-            newEvent.setCreateDate(new Date());
-            newEvent.setUpdateDate(new Date());
-            newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' задачи '" + newTask.getTitle() + "'");
-            newEvent.getRecipients().add(userService.getCurrentUser());
-            newEvent.setTask(newTask);
-            eventRepository.save(newEvent);
-
-            timeline.getEvents().add(newEvent);
-            timelineService.save(timeline);
-        }
-    }
-
     public void updateTaskDeadlines(Task task) {
         eventRepository.delete(eventRepository.findAllByTask(task));
-        createFromTask(task);
+        createFromObject(task, Collections.emptyList());
     }
 }
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index aed9997..4504857 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -49,6 +49,6 @@
     <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-20190529_000000-schema.xml"/>
+    <include file="db/changelog-20190529_000001-schema.xml"/>
     <include file="db/changelog-20190601_000001-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file

From 961a6a318e29917922bfa539d792ecdda3e9cc9b Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Sat, 1 Jun 2019 11:51:01 +0400
Subject: [PATCH 65/74] #101 event service edited

---
 src/main/java/ru/ulstu/timeline/service/EventService.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/ru/ulstu/timeline/service/EventService.java b/src/main/java/ru/ulstu/timeline/service/EventService.java
index 01113c7..d307a8d 100644
--- a/src/main/java/ru/ulstu/timeline/service/EventService.java
+++ b/src/main/java/ru/ulstu/timeline/service/EventService.java
@@ -123,7 +123,6 @@ public class EventService {
         List<Timeline> timelines = timelineService.findAll();
         Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0);
         objectClassName = newObject.getClass().getName();
-
         switch(objectClassName) {
             case "ru.ulstu.paper.model.Paper":
                 newPaper = (Paper)newObject;
@@ -240,7 +239,6 @@ public class EventService {
                 break;
         }
     }
-
     public void updatePaperDeadlines(Paper paper) {
         List<Event> foundEvents = eventRepository.findAllByPaper(paper);
         eventRepository.delete(foundEvents);

From 7edb9d2aa38d27778a16d6c3c2389333de3a3e09 Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Sat, 1 Jun 2019 11:56:38 +0400
Subject: [PATCH 66/74] #101 event service edited

---
 src/main/java/ru/ulstu/paper/service/LatexService.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/java/ru/ulstu/paper/service/LatexService.java b/src/main/java/ru/ulstu/paper/service/LatexService.java
index 82dd1ba..27dfa1e 100644
--- a/src/main/java/ru/ulstu/paper/service/LatexService.java
+++ b/src/main/java/ru/ulstu/paper/service/LatexService.java
@@ -41,12 +41,6 @@ public class LatexService {
         Process process = processBuilder.start();
         InputStreamReader inputStreamReader = new InputStreamReader(process.getInputStream());
 
-        try (BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) {
-            while ((bufferedReader.readLine()) != null) {
-                //
-            }
-        }
-
         int exitCode = process.waitFor();
         if (exitCode != 0) {
             errorMessage = message + " Exit value of the process: " + exitCode;

From 38478835fbca880a8dabf764d6a9d28c0435fc78 Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Sat, 1 Jun 2019 12:03:42 +0400
Subject: [PATCH 67/74] #101 event service edited

---
 src/test/java/ru/ulstu/project/service/ProjectServiceTest.java | 2 +-
 src/test/java/ru/ulstu/students/service/TaskServiceTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java b/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java
index 7c4f5fa..d06ad0e 100644
--- a/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java
+++ b/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java
@@ -99,7 +99,7 @@ public class ProjectServiceTest {
     public void create() throws IOException {
         when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines);
         when(projectRepository.save(new Project())).thenReturn(project);
-        eventService.createFromProject(new Project());
+        eventService.createFromObject(new Project(), Collections.emptyList());
 
         projectDto.setTitle(TITLE);
         projectDto.setDeadlines(deadlines);
diff --git a/src/test/java/ru/ulstu/students/service/TaskServiceTest.java b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
index 8edfc77..0d33630 100644
--- a/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
+++ b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
@@ -136,7 +136,7 @@ public class TaskServiceTest {
         when(tagService.saveOrCreate(new ArrayList<>())).thenReturn(tags);
         when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines);
         when(taskRepository.save(new Task())).thenReturn(task);
-        eventService.createFromTask(new Task());
+        eventService.createFromObject(new Task(), Collections.emptyList());
 
         taskDto.setTags(tags);
         taskDto.setDeadlines(deadlines);

From ae8dc58a9dab04bafa5a2722d383cda2d428bbe9 Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Sat, 1 Jun 2019 12:16:59 +0400
Subject: [PATCH 68/74] #101 event service edited

---
 src/main/resources/application.properties                  | 4 ++--
 src/main/resources/db/changelog-20190528_000002-schema.xml | 2 +-
 src/main/resources/db/changelog-master.xml                 | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index f4be778..276e6c4 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -22,9 +22,9 @@ spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.ssl.enable=true
 spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
 # JPA Settings
-spring.datasource.url=jdbc:postgresql://localhost:5432/ng-tracker
+spring.datasource.url=jdbc:postgresql://localhost:5433/ng-tracker
 spring.datasource.username=postgres
-spring.datasource.password=postgres
+spring.datasource.password=1234
 spring.datasource.driverclassName=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=validate
 # Liquibase Settings
diff --git a/src/main/resources/db/changelog-20190528_000002-schema.xml b/src/main/resources/db/changelog-20190528_000002-schema.xml
index 7df707c..a4e2032 100644
--- a/src/main/resources/db/changelog-20190528_000002-schema.xml
+++ b/src/main/resources/db/changelog-20190528_000002-schema.xml
@@ -2,7 +2,7 @@
 <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="anton" id="20190528_000000-3">
+    <changeSet author="anton" id="20190528_000002-1">
         <createTable tableName="deadline_executors">
             <column name="deadline_id" type="integer"/>
             <column name="executors_id" type="integer"/>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 4504857..26ad8b9 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -49,6 +49,7 @@
     <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-20190529_000000-schema.xml"/>
     <include file="db/changelog-20190529_000001-schema.xml"/>
     <include file="db/changelog-20190601_000001-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file

From e6dc2abdd9ca7292a3bf4115a6c20eb27fbdbe68 Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Sat, 1 Jun 2019 12:23:52 +0400
Subject: [PATCH 69/74] #101 event service edited

---
 src/main/resources/application.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 276e6c4..f4be778 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -22,9 +22,9 @@ spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.ssl.enable=true
 spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
 # JPA Settings
-spring.datasource.url=jdbc:postgresql://localhost:5433/ng-tracker
+spring.datasource.url=jdbc:postgresql://localhost:5432/ng-tracker
 spring.datasource.username=postgres
-spring.datasource.password=1234
+spring.datasource.password=postgres
 spring.datasource.driverclassName=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=validate
 # Liquibase Settings

From db3252d8228da4662275e92fe262c1da9703039f Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Sat, 1 Jun 2019 12:55:13 +0400
Subject: [PATCH 70/74] #101 event service edited

---
 src/main/java/ru/ulstu/paper/service/LatexService.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/ru/ulstu/paper/service/LatexService.java b/src/main/java/ru/ulstu/paper/service/LatexService.java
index 27dfa1e..82dd1ba 100644
--- a/src/main/java/ru/ulstu/paper/service/LatexService.java
+++ b/src/main/java/ru/ulstu/paper/service/LatexService.java
@@ -41,6 +41,12 @@ public class LatexService {
         Process process = processBuilder.start();
         InputStreamReader inputStreamReader = new InputStreamReader(process.getInputStream());
 
+        try (BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) {
+            while ((bufferedReader.readLine()) != null) {
+                //
+            }
+        }
+
         int exitCode = process.waitFor();
         if (exitCode != 0) {
             errorMessage = message + " Exit value of the process: " + exitCode;

From bde4ac5f1c3a98235f2062e713e78fa21b91eacd Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Sat, 1 Jun 2019 13:25:12 +0400
Subject: [PATCH 71/74] #101 event service edited

---
 src/main/java/ru/ulstu/paper/service/LatexService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/ulstu/paper/service/LatexService.java b/src/main/java/ru/ulstu/paper/service/LatexService.java
index 82dd1ba..9892e35 100644
--- a/src/main/java/ru/ulstu/paper/service/LatexService.java
+++ b/src/main/java/ru/ulstu/paper/service/LatexService.java
@@ -42,8 +42,9 @@ public class LatexService {
         InputStreamReader inputStreamReader = new InputStreamReader(process.getInputStream());
 
         try (BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) {
-            while ((bufferedReader.readLine()) != null) {
-                //
+            String line = bufferedReader.readLine();
+            while (line != null) {
+                line = bufferedReader.readLine();
             }
         }
 

From 23d4e5602f90a11f1eaaf123098d8b8da2e6748f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=20=D0=9C?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B8=D1=8F?= <semenovamasha98@mail.ru>
Date: Sat, 1 Jun 2019 23:16:39 +0400
Subject: [PATCH 72/74] #103 integration auto tests

---
 build.gradle                                  |   2 +
 .../fragments/paperDashboardFragment.html     |   3 +-
 .../resources/templates/papers/paper.html     |  14 +-
 src/test/java/PaperTest.java                  | 247 ++++++++++++++++++
 src/test/java/core/PageObject.java            |   8 +
 src/test/java/paper/PaperPage.java            | 206 +++++++++++++++
 src/test/java/paper/PapersDashboardPage.java  |  13 +
 src/test/java/paper/PapersPage.java           |  50 ++++
 8 files changed, 537 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/PaperTest.java

diff --git a/build.gradle b/build.gradle
index 71c9977..e57e620 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,5 +127,7 @@ dependencies {
 
     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'
 
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/papers/fragments/paperDashboardFragment.html b/src/main/resources/templates/papers/fragments/paperDashboardFragment.html
index d0ec0c5..62d2466 100644
--- a/src/main/resources/templates/papers/fragments/paperDashboardFragment.html
+++ b/src/main/resources/templates/papers/fragments/paperDashboardFragment.html
@@ -10,7 +10,8 @@
             <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status})"/>
         </div>
         <div class="col col-10 text-right">
-            <p th:if="${paper.url!=null and paper.url!=''}"><a target="_blank" th:href="${paper.url}"><i
+            <p th:if="${paper.url!=null and paper.url!=''}"><a target="_blank" class="externalLink"
+                                                               th:href="${paper.url}"><i
                     class="fa fa-external-link fa-1x"
                     aria-hidden="true"></i></a></p>
             <p th:unless="${paper.url!=null and paper.url!=''}"><i class="fa fa-fw fa-2x" aria-hidden="true"></i></p>
diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html
index 2755aba..2fbfa3a 100644
--- a/src/main/resources/templates/papers/paper.html
+++ b/src/main/resources/templates/papers/paper.html
@@ -87,14 +87,16 @@
 
                                         <div class="form-group">
                                             <label>Дедлайны:</label>
-                                            <div class="row" th:each="deadline, rowStat : *{deadlines}">
+                                            <div class="row deadline" th:each="deadline, rowStat : *{deadlines}">
                                                 <input type="hidden" th:field="*{deadlines[__${rowStat.index}__].id}"/>
                                                 <div class="col-6">
-                                                    <input type="date" class="form-control" name="deadline"
+                                                    <input type="date" class="form-control deadline-date"
+                                                           name="deadline"
                                                            th:field="*{deadlines[__${rowStat.index}__].date}"/>
                                                 </div>
                                                 <div class="col-4">
-                                                    <input class="form-control" type="text" placeholder="Описание"
+                                                    <input class="form-control deadline-desc" type="text"
+                                                           placeholder="Описание"
                                                            th:field="*{deadlines[__${rowStat.index}__].description}"/>
                                                 </div>
                                                 <div class="col-2">
@@ -234,7 +236,8 @@
                                                         </div>
                                                         <div class="form-group col-12">
                                                             <label class="col-4">Год издания:</label>
-                                                            <input type="number" class="form-control col-7 "
+                                                            <input type="number"
+                                                                   class="form-control col-7 publicationYear"
                                                                    name="publicationYear"
                                                                    th:field="*{references[__${rowStat.index}__].publicationYear}"/>
                                                         </div>
@@ -247,7 +250,8 @@
                                                         </div>
                                                         <div class="form-group col-12">
                                                             <label class="col-4">Страницы:</label>
-                                                            <input type="text" class="form-control col-7" name="pages"
+                                                            <input type="text" class="form-control col-7 pages"
+                                                                   name="pages"
                                                                    th:field="*{references[__${rowStat.index}__].pages}"/>
                                                         </div>
                                                         <div class="form-group col-12">
diff --git a/src/test/java/PaperTest.java b/src/test/java/PaperTest.java
new file mode 100644
index 0000000..a08a1d8
--- /dev/null
+++ b/src/test/java/PaperTest.java
@@ -0,0 +1,247 @@
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import core.PageObject;
+import core.TestTemplate;
+import org.junit.Assert;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import paper.PaperPage;
+import paper.PapersDashboardPage;
+import paper.PapersPage;
+import ru.ulstu.NgTrackerApplication;
+import ru.ulstu.configuration.ApplicationProperties;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(SpringRunner.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+public class PaperTest extends TestTemplate {
+    private final Map<PageObject, List<String>> navigationHolder = ImmutableMap.of(
+            new PapersPage(), Arrays.asList("СТАТЬИ", "/papers/papers"),
+            new PaperPage(), Arrays.asList("РЕДАКТИРОВАНИЕ СТАТЬИ", "/papers/paper?id=0"),
+            new PapersDashboardPage(), Arrays.asList("СТАТЬИ", "/papers/dashboard")
+    );
+
+    @Autowired
+    private ApplicationProperties applicationProperties;
+
+    private String getPaperPageUrl() {
+        return Iterables.get(navigationHolder.entrySet(), 1).getValue().get(1);
+    }
+
+    private PaperPage getPaperPage() {
+        PaperPage paperPage = (PaperPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        paperPage.initElements();
+        return paperPage;
+    }
+
+    private String getPapersPageUrl() {
+        return Iterables.get(navigationHolder.entrySet(), 0).getValue().get(1);
+    }
+
+    private PapersPage getPapersPage() {
+        PapersPage papersPage = (PapersPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 0).getKey());
+        papersPage.initElements();
+        return papersPage;
+    }
+
+    private String getPapersDashboardPageUrl() {
+        return Iterables.get(navigationHolder.entrySet(), 2).getValue().get(1);
+    }
+
+    private PapersDashboardPage getPapersDashboardPage() {
+        PapersDashboardPage papersDashboardPage = (PapersDashboardPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 2).getKey());
+        papersDashboardPage.initElements();
+        return papersDashboardPage;
+    }
+
+    @Test
+    public void createNewPaperTest() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+        PaperPage paperPage = getPaperPage();
+
+        String testTitle = "test " + (String.valueOf(System.currentTimeMillis()));
+        fillRequiredFields(paperPage, testTitle);
+        paperPage.clickSaveBtn();
+
+        PapersPage papersPage = getPapersPage();
+
+        Assert.assertTrue(papersPage.havePaperWithTitle(testTitle));
+    }
+
+    @Test
+    public void editPaperTest() {
+        createNewPaper();
+        getContext().goTo(applicationProperties.getBaseUrl() + getPapersPageUrl());
+        PapersPage papersPage = getPapersPage();
+        papersPage.clickFirstPaper();
+
+        PaperPage paperPage = getPaperPage();
+        String testTitle = "test " + (String.valueOf(System.currentTimeMillis()));
+        paperPage.setTitle(testTitle);
+        paperPage.clickSaveBtn();
+
+        Assert.assertTrue(papersPage.havePaperWithTitle(testTitle));
+    }
+
+    private void createNewPaper() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+        PaperPage paperPage = getPaperPage();
+        String testTitle = "test " + (String.valueOf(System.currentTimeMillis()));
+        fillRequiredFields(paperPage, testTitle);
+        paperPage.clickSaveBtn();
+    }
+
+    @Test
+    public void addDeadlineTest() {
+        createNewPaper();
+        getContext().goTo(applicationProperties.getBaseUrl() + getPapersPageUrl());
+        PapersPage papersPage = getPapersPage();
+        papersPage.clickFirstPaper();
+
+        PaperPage paperPage = getPaperPage();
+        papersPage.clickAddDeadline();
+        String testDate = "01.01.2019";
+        String testDateResult = "2019-01-01";
+        String testDesc = "desc";
+        Integer deadlineNumber = 2;
+        paperPage.setDeadlineDate(deadlineNumber, testDate);
+        paperPage.setDeadlineDescription(deadlineNumber, testDesc);
+        String paperId = paperPage.getId();
+        paperPage.clickSaveBtn();
+
+        getContext().goTo(applicationProperties.getBaseUrl() + String.format("/papers/paper?id=%s", paperId));
+
+        Assert.assertTrue(paperPage.deadlineExist(testDesc, testDateResult));
+    }
+
+    @Test
+    public void noDeadlinesValidationTest() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+        PaperPage paperPage = getPaperPage();
+
+        String testTitle = "test " + (String.valueOf(System.currentTimeMillis()));
+        paperPage.setTitle(testTitle);
+        paperPage.clickSaveBtn();
+
+        Assert.assertTrue(paperPage.hasAlert("Не может быть пустым"));
+    }
+
+    private void fillRequiredFields(PaperPage paperPage, String title) {
+        paperPage.setTitle(title);
+        String testDate = "01.01.2019";
+        String testDesc = "desc";
+        Integer deadlineNumber = 1;
+        paperPage.setDeadlineDate(deadlineNumber, testDate);
+        paperPage.setDeadlineDescription(deadlineNumber, testDesc);
+    }
+
+    @Test
+    public void addReferenceTest() {
+        createNewPaper();
+        getContext().goTo(applicationProperties.getBaseUrl() + getPapersPageUrl());
+        PapersPage papersPage = getPapersPage();
+        papersPage.clickFirstPaper();
+
+        PaperPage paperPage = getPaperPage();
+        fillRequiredFields(paperPage, "test " + (String.valueOf(System.currentTimeMillis())));
+        paperPage.clickReferenceTab();
+        paperPage.clickAddReferenceButton();
+
+        paperPage.clickReferenceTab();
+        paperPage.showFirstReference();
+        String authors = "testAuthors";
+        paperPage.setFirstReferenceAuthors(authors);
+
+        String paperId = paperPage.getId();
+        paperPage.clickSaveBtn();
+
+        getContext().goTo(applicationProperties.getBaseUrl() + String.format("/papers/paper?id=%s", paperId));
+
+        Assert.assertTrue(paperPage.authorsExists(authors));
+    }
+
+    @Test
+    public void referencesFormatTest() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+
+        PaperPage paperPage = getPaperPage();
+        paperPage.setTitle("test");
+        paperPage.clickReferenceTab();
+        paperPage.clickAddReferenceButton();
+
+        paperPage.clickReferenceTab();
+        paperPage.showFirstReference();
+        paperPage.setFirstReferenceAuthors("authors");
+        paperPage.setFirstReferencePublicationTitle("title");
+        paperPage.setFirstReferencePublicationYear("2010");
+        paperPage.setFirstReferencePublisher("publisher");
+        paperPage.setFirstReferencePages("200");
+        paperPage.setFirstReferenceJournalOrCollectionTitle("journal");
+        paperPage.setFormatStandardSpringer();
+        paperPage.clickFormatButton();
+
+        Assert.assertEquals("authors (2010) title. journal, publisher, pp 200", paperPage.getFormatString());
+    }
+
+    @Test
+    public void dashboardLinkTest() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+        PaperPage paperPage = getPaperPage();
+
+        fillRequiredFields(paperPage, "test " + (String.valueOf(System.currentTimeMillis())));
+        String testLink = "http://test.com/";
+        paperPage.setUrl(testLink);
+        paperPage.clickSaveBtn();
+
+        getContext().goTo(applicationProperties.getBaseUrl() + getPapersDashboardPageUrl());
+        PapersDashboardPage papersDashboardPage = getPapersDashboardPage();
+
+        Assert.assertTrue(papersDashboardPage.externalLinkExists(testLink));
+    }
+
+    @Test
+    public void deletePaperTest() {
+        createNewPaper();
+        getContext().goTo(applicationProperties.getBaseUrl() + getPapersPageUrl());
+        PapersPage papersPage = getPapersPage();
+
+        int size = papersPage.getPapersCount();
+        papersPage.clickRemoveFirstPaperButton();
+        papersPage.clickConfirmDeleteButton();
+
+        Assert.assertEquals(size - 1, papersPage.getPapersCount());
+    }
+
+    @Test
+    public void latexValidationTest() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+
+        PaperPage paperPage = getPaperPage();
+        paperPage.setTitle("test");
+        paperPage.clickLatexTab();
+        paperPage.setLatexText("test");
+        paperPage.clickPdfButton();
+
+        Assert.assertTrue(paperPage.dangerMessageExist("Ошибка при создании PDF"));
+    }
+
+    @Test
+    public void titleValidationTest() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+        PaperPage paperPage = getPaperPage();
+
+        paperPage.clickSaveBtn();
+
+        Assert.assertTrue(paperPage.hasAlert("не может быть пусто"));
+    }
+
+}
diff --git a/src/test/java/core/PageObject.java b/src/test/java/core/PageObject.java
index f3e5cb8..e8eae6e 100644
--- a/src/test/java/core/PageObject.java
+++ b/src/test/java/core/PageObject.java
@@ -2,16 +2,24 @@ package core;
 
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.ui.WebDriverWait;
 
 public abstract class PageObject {
     protected WebDriver driver;
     protected JavascriptExecutor js;
+    protected WebDriverWait waiter;
 
     public abstract String getSubTitle();
 
     public PageObject setDriver(WebDriver driver) {
         this.driver = driver;
         js = (JavascriptExecutor) driver;
+        waiter = new WebDriverWait(driver, 10);
         return this;
     }
+
+    public void initElements() {
+        PageFactory.initElements(driver, this);
+    }
 }
diff --git a/src/test/java/paper/PaperPage.java b/src/test/java/paper/PaperPage.java
index 9c3c357..908f8a1 100644
--- a/src/test/java/paper/PaperPage.java
+++ b/src/test/java/paper/PaperPage.java
@@ -2,10 +2,216 @@ package paper;
 
 import core.PageObject;
 import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.Select;
+
+import java.util.List;
 
 public class PaperPage extends PageObject {
 
+    @FindBy(id = "title")
+    private WebElement titleInput;
+
+    @FindBy(id = "sendMessageButton")
+    private WebElement sendMessageButton;
+
+    @FindBy(id = "id")
+    private WebElement idInput;
+
+    @FindBy(css = "#messages .alert-danger span")
+    private WebElement dangerMessage;
+
+    @FindBy(className = "deadline")
+    private List<WebElement> deadlines;
+
+    @FindBy(className = "deadline-date")
+    private List<WebElement> deadlineDates;
+
+    @FindBy(className = "deadline-desc")
+    private List<WebElement> deadlineDescs;
+
+    @FindBy(css = ".alert.alert-danger")
+    private List<WebElement> dangerAlerts;
+
+    @FindBy(className = "collapse-heading")
+    private WebElement firstCollapsedLink;
+
+    @FindBy(id = "nav-references-tab")
+    private WebElement referenceTab;
+
+    @FindBy(id = "nav-latex-tab")
+    private WebElement latexTab;
+
+    @FindBy(id = "latex-text")
+    private WebElement latexTextarea;
+
+    @FindBy(id = "addReference")
+    private WebElement addReferenceButton;
+
+    @FindBy(css = "input.author ")
+    private WebElement firstAuthorInput;
+
+    @FindBy(css = "input.publicationTitle")
+    private WebElement firstPublicationTitleInput;
+
+    @FindBy(css = "input.publicationYear")
+    private WebElement firstPublicationYearInput;
+
+    @FindBy(css = "input.publisher")
+    private WebElement firstPublisherInput;
+
+    @FindBy(css = "input.pages")
+    private WebElement firstPagesInput;
+
+    @FindBy(css = "input.journalOrCollectionTitle")
+    private WebElement firstJournalOrCollectionTitleInput;
+
+    @FindBy(id = "formatBtn")
+    private WebElement formatButton;
+
+    @FindBy(id = "formattedReferencesArea")
+    private WebElement formatArea;
+
+    @FindBy(id = "url")
+    private WebElement urlInput;
+
+    @FindBy(id = "pdfBtn")
+    private WebElement pdfButton;
+
+    @FindBy(css = "input.author ")
+    private List<WebElement> authorInputs;
+
     public String getSubTitle() {
         return driver.findElement(By.tagName("h2")).getText();
     }
+
+    public void clickReferenceTab() {
+        js.executeScript("document.getElementById('nav-references-tab').scrollIntoView(false);");
+        referenceTab.click();
+    }
+
+    public void clickLatexTab() {
+        latexTab.click();
+    }
+
+    public void showFirstReference() {
+        waiter.until(ExpectedConditions.elementToBeClickable(firstCollapsedLink));
+        firstCollapsedLink.click();
+    }
+
+    public void clickAddReferenceButton() {
+        js.executeScript("arguments[0].click()", addReferenceButton);
+    }
+
+    public void clickFormatButton() {
+        formatButton.click();
+    }
+
+    public void clickPdfButton() {
+        pdfButton.click();
+    }
+
+    public void setTitle(String title) {
+        titleInput.clear();
+        titleInput.sendKeys(title);
+    }
+
+    public void setLatexText(String text) {
+        waiter.until(ExpectedConditions.visibilityOf(latexTextarea));
+        latexTextarea.clear();
+        latexTextarea.sendKeys(text);
+    }
+
+    public void setFirstReferenceAuthors(String authors) {
+        waiter.until(ExpectedConditions.visibilityOf(firstAuthorInput));
+
+        firstAuthorInput.clear();
+        firstAuthorInput.sendKeys(authors);
+    }
+
+    public void setFirstReferencePublicationTitle(String title) {
+        firstPublicationTitleInput.clear();
+        firstPublicationTitleInput.sendKeys(title);
+    }
+
+    public void setFirstReferencePublicationYear(String year) {
+        firstPublicationYearInput.clear();
+        firstPublicationYearInput.sendKeys(year);
+    }
+
+    public void setFirstReferencePublisher(String publisher) {
+        firstPublisherInput.clear();
+        firstPublisherInput.sendKeys(publisher);
+    }
+
+    public void setFirstReferencePages(String pages) {
+        firstPagesInput.clear();
+        firstPagesInput.sendKeys(pages);
+    }
+
+    public void setFirstReferenceJournalOrCollectionTitle(String journal) {
+        firstJournalOrCollectionTitleInput.clear();
+        firstJournalOrCollectionTitleInput.sendKeys(journal);
+    }
+
+    public void setUrl(String url) {
+        urlInput.clear();
+        urlInput.sendKeys(url);
+    }
+
+    public void setFormatStandardSpringer() {
+        Select standards = new Select(driver.findElement(By.id("formatStandard")));
+        standards.selectByValue("SPRINGER");
+    }
+
+    public void setDeadlineDate(Integer deadlineNumber, String date) {
+        deadlineDates.get(deadlineNumber - 1).sendKeys(date);
+    }
+
+    public void setDeadlineDescription(Integer deadlineNumber, String desc) {
+        deadlineDescs.get(deadlineNumber - 1).clear();
+        deadlineDescs.get(deadlineNumber - 1).sendKeys(desc);
+    }
+
+    public boolean hasAlert(String alertMessage) {
+        return dangerAlerts
+                .stream()
+                .anyMatch(
+                        webElement -> webElement.getText().contains(alertMessage));
+    }
+
+    public void clickSaveBtn() {
+        sendMessageButton.click();
+    }
+
+    public String getId() {
+        return idInput.getAttribute("value");
+    }
+
+    public String getFormatString() {
+        waiter.until(ExpectedConditions.attributeToBeNotEmpty(formatArea, "value"));
+        return formatArea.getAttribute("value");
+    }
+
+    public boolean deadlineExist(String desc, String date) {
+        return deadlines
+                .stream()
+                .anyMatch(
+                        webElement -> webElement.findElement(By.className("deadline-desc")).getAttribute("value").equals(desc)
+                                && webElement.findElement(By.className("deadline-date")).getAttribute("value").equals(date));
+    }
+
+    public boolean authorsExists(String authors) {
+        return authorInputs
+                .stream()
+                .anyMatch(
+                        webElement -> webElement.getAttribute("value").equals(authors));
+    }
+
+    public boolean dangerMessageExist(String message) {
+        waiter.until(ExpectedConditions.visibilityOf(dangerMessage));
+        return dangerMessage.getText().equals(message);
+    }
 }
diff --git a/src/test/java/paper/PapersDashboardPage.java b/src/test/java/paper/PapersDashboardPage.java
index 51d7cb8..4567490 100644
--- a/src/test/java/paper/PapersDashboardPage.java
+++ b/src/test/java/paper/PapersDashboardPage.java
@@ -2,10 +2,23 @@ package paper;
 
 import core.PageObject;
 import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+
+import java.util.List;
 
 public class PapersDashboardPage extends PageObject {
+    @FindBy(className = "externalLink")
+    private List<WebElement> externalLinks;
 
     public String getSubTitle() {
         return driver.findElement(By.tagName("h2")).getText();
     }
+
+    public boolean externalLinkExists(String link) {
+        return externalLinks
+                .stream()
+                .anyMatch(
+                        webElement -> webElement.getAttribute("href").equals(link));
+    }
 }
diff --git a/src/test/java/paper/PapersPage.java b/src/test/java/paper/PapersPage.java
index f191d9b..620d0c0 100644
--- a/src/test/java/paper/PapersPage.java
+++ b/src/test/java/paper/PapersPage.java
@@ -2,10 +2,60 @@ package paper;
 
 import core.PageObject;
 import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+
+import java.util.List;
 
 public class PapersPage extends PageObject {
+    @FindBy(css = ".paper-row .h6")
+    private List<WebElement> paperTitles;
+
+    @FindBy(className = "paper-row")
+    private List<WebElement> paperItems;
+
+    @FindBy(className = "remove-paper")
+    private WebElement removeFirstPaperButton;
+
+    @FindBy(id = "dataConfirmOK")
+    private WebElement confirmDeleteButton;
+
+    @FindBy(id = "addDeadline")
+    private WebElement addDeadlineButton;
+
+    @FindBy(css = ".paper-row a:nth-child(2)")
+    private WebElement firstPaper;
 
     public String getSubTitle() {
         return driver.findElement(By.tagName("h2")).getText();
     }
+
+    public void clickFirstPaper() {
+        firstPaper.click();
+    }
+
+    public void clickAddDeadline() {
+        addDeadlineButton.click();
+    }
+
+    public void clickRemoveFirstPaperButton() {
+        js.executeScript("arguments[0].click()", removeFirstPaperButton);
+    }
+
+    public void clickConfirmDeleteButton() {
+        waiter.until(ExpectedConditions.visibilityOf(confirmDeleteButton));
+        confirmDeleteButton.click();
+    }
+
+    public boolean havePaperWithTitle(String title) {
+        return paperTitles
+                .stream()
+                .anyMatch(webElement -> webElement.getText().equals(title));
+    }
+
+    public int getPapersCount() {
+        return paperItems.size();
+    }
+
 }

From 482964fe5315475574bbf839229476f6aae6d663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 3 Jun 2019 20:21:46 +0300
Subject: [PATCH 73/74] #101 EventService edited

---
 .../ru/ulstu/conference/model/Conference.java |  18 +-
 .../conference/service/ConferenceService.java |   2 +-
 .../java/ru/ulstu/core/model/EventSource.java |  17 ++
 src/main/java/ru/ulstu/grant/model/Grant.java |  14 +-
 .../ru/ulstu/grant/service/GrantService.java  |   4 +-
 src/main/java/ru/ulstu/paper/model/Paper.java |  13 +-
 .../java/ru/ulstu/project/model/Project.java  |  14 +-
 .../ulstu/project/service/ProjectService.java |   2 +-
 .../java/ru/ulstu/students/model/Task.java    |  34 +++-
 .../ulstu/students/service/TaskService.java   |   2 +-
 .../ulstu/timeline/service/EventService.java  | 162 ++++--------------
 11 files changed, 139 insertions(+), 143 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/core/model/EventSource.java

diff --git a/src/main/java/ru/ulstu/conference/model/Conference.java b/src/main/java/ru/ulstu/conference/model/Conference.java
index 4df1a1f..572921e 100644
--- a/src/main/java/ru/ulstu/conference/model/Conference.java
+++ b/src/main/java/ru/ulstu/conference/model/Conference.java
@@ -5,8 +5,11 @@ import org.hibernate.annotations.FetchMode;
 import org.hibernate.validator.constraints.NotBlank;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.EventSource;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.paper.model.Paper;
+import ru.ulstu.timeline.model.Event;
+import ru.ulstu.user.model.User;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -28,7 +31,7 @@ import java.util.Optional;
 
 @Entity
 @Table(name = "conference")
-public class Conference extends BaseEntity {
+public class Conference extends BaseEntity implements EventSource {
 
     @NotBlank
     private String title;
@@ -71,6 +74,19 @@ public class Conference extends BaseEntity {
         return title;
     }
 
+    @Override
+    public List<User> getRecipients() {
+        List<User> list = new ArrayList<>();
+
+        getUsers().forEach(conferenceUser -> list.add(conferenceUser.getUser()));
+        return list;
+    }
+
+    @Override
+    public void addObjectToEvent(Event event) {
+        event.setConference(this);
+    }
+
     public void setTitle(String title) {
         this.title = title;
     }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 3b3bace..f742139 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -117,7 +117,7 @@ public class ConferenceService extends BaseService {
         Conference newConference = copyFromDto(new Conference(), conferenceDto);
         newConference = conferenceRepository.save(newConference);
         conferenceNotificationService.sendCreateNotification(newConference);
-        eventService.createFromObject(newConference, Collections.emptyList());
+        eventService.createFromObject(newConference, Collections.emptyList(), false, "конференции");
         return newConference;
     }
 
diff --git a/src/main/java/ru/ulstu/core/model/EventSource.java b/src/main/java/ru/ulstu/core/model/EventSource.java
new file mode 100644
index 0000000..32ffcf2
--- /dev/null
+++ b/src/main/java/ru/ulstu/core/model/EventSource.java
@@ -0,0 +1,17 @@
+package ru.ulstu.core.model;
+
+import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.timeline.model.Event;
+import ru.ulstu.user.model.User;
+
+import java.util.List;
+
+public interface EventSource {
+    List<Deadline> getDeadlines();
+
+    String getTitle();
+
+    List<User> getRecipients();
+
+    void addObjectToEvent(Event event);
+}
diff --git a/src/main/java/ru/ulstu/grant/model/Grant.java b/src/main/java/ru/ulstu/grant/model/Grant.java
index 369568f..78583c3 100644
--- a/src/main/java/ru/ulstu/grant/model/Grant.java
+++ b/src/main/java/ru/ulstu/grant/model/Grant.java
@@ -4,6 +4,7 @@ import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.EventSource;
 import ru.ulstu.core.model.UserContainer;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
@@ -26,6 +27,7 @@ import javax.persistence.OrderBy;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
@@ -35,7 +37,7 @@ import java.util.Set;
 
 @Entity
 @Table(name = "grants")
-public class Grant extends BaseEntity implements UserContainer {
+public class Grant extends BaseEntity implements UserContainer, EventSource {
     public enum GrantStatus {
         APPLICATION("Заявка"),
         ON_COMPETITION("Отправлен на конкурс"),
@@ -134,6 +136,16 @@ public class Grant extends BaseEntity implements UserContainer {
         return title;
     }
 
+    @Override
+    public List<User> getRecipients() {
+        return authors != null ? new ArrayList<>(authors) : Collections.emptyList();
+    }
+
+    @Override
+    public void addObjectToEvent(Event event) {
+        event.setGrant(this);
+    }
+
     public void setTitle(String title) {
         this.title = title;
     }
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index d8e4aad..27841e3 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -90,7 +90,7 @@ public class GrantService extends BaseService {
     public Integer create(GrantDto grantDto) throws IOException {
         Grant newGrant = copyFromDto(new Grant(), grantDto);
         newGrant = grantRepository.save(newGrant);
-        eventService.createFromObject(newGrant, Collections.emptyList());
+        eventService.createFromObject(newGrant, Collections.emptyList(), false, "гранта");
         grantNotificationService.sendCreateNotification(newGrant);
         return newGrant.getId();
     }
@@ -178,7 +178,7 @@ public class GrantService extends BaseService {
         grant.getPapers().add(paper);
         grant = grantRepository.save(grant);
 
-        eventService.createFromObject(grant, Collections.emptyList());
+        eventService.createFromObject(grant, Collections.emptyList(), false, "гранта");
         grantNotificationService.sendCreateNotification(grant);
 
         return grant;
diff --git a/src/main/java/ru/ulstu/paper/model/Paper.java b/src/main/java/ru/ulstu/paper/model/Paper.java
index 413c5db..dbc9b52 100644
--- a/src/main/java/ru/ulstu/paper/model/Paper.java
+++ b/src/main/java/ru/ulstu/paper/model/Paper.java
@@ -5,6 +5,7 @@ import org.hibernate.annotations.FetchMode;
 import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.conference.model.Conference;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.EventSource;
 import ru.ulstu.core.model.UserContainer;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
@@ -34,7 +35,7 @@ import java.util.Optional;
 import java.util.Set;
 
 @Entity
-public class Paper extends BaseEntity implements UserContainer {
+public class Paper extends BaseEntity implements UserContainer, EventSource {
     public enum PaperStatus {
         ATTENTION("Обратить внимание"),
         ON_PREPARATION("На подготовке"),
@@ -196,6 +197,16 @@ public class Paper extends BaseEntity implements UserContainer {
         return title;
     }
 
+    @Override
+    public List<User> getRecipients() {
+        return new ArrayList(authors);
+    }
+
+    @Override
+    public void addObjectToEvent(Event event) {
+        event.setPaper(this);
+    }
+
     public void setTitle(String title) {
         this.title = title;
     }
diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java
index 0c0af94..07f0141 100644
--- a/src/main/java/ru/ulstu/project/model/Project.java
+++ b/src/main/java/ru/ulstu/project/model/Project.java
@@ -4,6 +4,7 @@ import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.EventSource;
 import ru.ulstu.core.model.UserContainer;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
@@ -23,12 +24,13 @@ import javax.persistence.ManyToMany;
 import javax.persistence.JoinTable;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 @Entity
-public class Project extends BaseEntity implements UserContainer {
+public class Project extends BaseEntity implements UserContainer, EventSource {
 
     public enum ProjectStatus {
         TECHNICAL_TASK("Техническое задание"),
@@ -92,6 +94,16 @@ public class Project extends BaseEntity implements UserContainer {
         return title;
     }
 
+    @Override
+    public List<User> getRecipients() {
+        return executors != null ? new ArrayList<>(executors) : Collections.emptyList();
+    }
+
+    @Override
+    public void addObjectToEvent(Event event) {
+        event.setProject(this);
+    }
+
     public void setTitle(String title) {
         this.title = title;
     }
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index de64c4c..6491b04 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -72,7 +72,7 @@ public class ProjectService {
     public Project create(ProjectDto projectDto) throws IOException {
         Project newProject = copyFromDto(new Project(), projectDto);
         newProject = projectRepository.save(newProject);
-        eventService.createFromObject(newProject, Collections.emptyList());
+        eventService.createFromObject(newProject, Collections.emptyList(), false, "проекта");
         return newProject;
     }
 
diff --git a/src/main/java/ru/ulstu/students/model/Task.java b/src/main/java/ru/ulstu/students/model/Task.java
index 2a03e37..2e63a3c 100644
--- a/src/main/java/ru/ulstu/students/model/Task.java
+++ b/src/main/java/ru/ulstu/students/model/Task.java
@@ -4,8 +4,17 @@ import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.EventSource;
 import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.deadline.service.DeadlineService;
+import ru.ulstu.students.repository.SchedulerRepository;
+import ru.ulstu.students.repository.TaskRepository;
 import ru.ulstu.tags.model.Tag;
+import ru.ulstu.tags.service.TagService;
+import ru.ulstu.timeline.model.Event;
+import ru.ulstu.timeline.service.EventService;
+import ru.ulstu.user.model.User;
+import ru.ulstu.user.service.UserService;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -20,12 +29,14 @@ import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.Transient;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
 @Entity
-public class Task extends BaseEntity {
+public class Task extends BaseEntity implements EventSource {
 
     public enum TaskStatus {
         IN_WORK("В работе"),
@@ -49,6 +60,17 @@ public class Task extends BaseEntity {
 
     private String description;
 
+    @Transient
+    private UserService userService;
+
+    public Task() {
+
+    }
+
+    public Task(UserService userService) {
+        this.userService = userService;
+    }
+
     @Enumerated(value = EnumType.STRING)
     private TaskStatus status = TaskStatus.IN_WORK;
 
@@ -77,6 +99,16 @@ public class Task extends BaseEntity {
         return title;
     }
 
+    @Override
+    public List<User> getRecipients() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public void addObjectToEvent(Event event) {
+        event.setTask(this);
+    }
+
     public void setTitle(String title) {
         this.title = title;
     }
diff --git a/src/main/java/ru/ulstu/students/service/TaskService.java b/src/main/java/ru/ulstu/students/service/TaskService.java
index 0a4590a..f78f8f7 100644
--- a/src/main/java/ru/ulstu/students/service/TaskService.java
+++ b/src/main/java/ru/ulstu/students/service/TaskService.java
@@ -84,7 +84,7 @@ public class TaskService {
     public Integer create(TaskDto taskDto) throws IOException {
         Task newTask = copyFromDto(new Task(), taskDto);
         newTask = taskRepository.save(newTask);
-        eventService.createFromObject(newTask, Collections.emptyList());
+        eventService.createFromObject(newTask, Collections.emptyList(), true, "задачи");
         return newTask.getId();
     }
 
diff --git a/src/main/java/ru/ulstu/timeline/service/EventService.java b/src/main/java/ru/ulstu/timeline/service/EventService.java
index d307a8d..c22b9a3 100644
--- a/src/main/java/ru/ulstu/timeline/service/EventService.java
+++ b/src/main/java/ru/ulstu/timeline/service/EventService.java
@@ -1,12 +1,11 @@
 package ru.ulstu.timeline.service;
 
-import com.sun.jna.platform.win32.COM.util.Convert;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.ulstu.conference.model.Conference;
-import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.EventSource;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.paper.model.Paper;
@@ -16,12 +15,10 @@ import ru.ulstu.timeline.model.Event;
 import ru.ulstu.timeline.model.EventDto;
 import ru.ulstu.timeline.model.Timeline;
 import ru.ulstu.timeline.repository.EventRepository;
-import ru.ulstu.user.model.User;
 import ru.ulstu.user.model.UserDto;
 import ru.ulstu.user.service.UserService;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -36,13 +33,6 @@ public class EventService {
     private final TimelineService timelineService;
     private final UserService userService;
 
-    private String objectClassName = "";
-    private Paper newPaper = new Paper();
-    private Conference newConference = new Conference();
-    private Grant newGrant = new Grant();
-    private Project newProject = new Project();
-    private Task newTask = new Task();
-
     public EventService(EventRepository eventRepository,
                         @Lazy TimelineService timelineService,
                         UserService userService) {
@@ -116,133 +106,39 @@ public class EventService {
     }
 
     public void createFromPaper(Paper newPaper) {
-        createFromObject(newPaper, Collections.emptyList());
+        createFromObject(newPaper, Collections.emptyList(), false, "статьи");
     }
 
-    public void createFromObject(Object newObject, List<Event> events) {
+    public void createFromObject(EventSource eventSource, List<Event> events, Boolean addCurrentUser, String suffix) {
         List<Timeline> timelines = timelineService.findAll();
         Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0);
-        objectClassName = newObject.getClass().getName();
-        switch(objectClassName) {
-            case "ru.ulstu.paper.model.Paper":
-                newPaper = (Paper)newObject;
-                timeline.getEvents().removeAll(events);
-                for (Deadline deadline : newPaper.getDeadlines()
-                        .stream()
-                        .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
-                        .collect(Collectors.toList())) {
-                    Event newEvent = new Event();
-                    newEvent.setTitle("Дедлайн статьи");
-                    newEvent.setStatus(Event.EventStatus.NEW);
-                    newEvent.setExecuteDate(deadline.getDate());
-                    newEvent.setCreateDate(new Date());
-                    newEvent.setUpdateDate(new Date());
-                    newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' cтатьи '" + newPaper.getTitle() + "'");
-                    newEvent.setRecipients(new ArrayList(newPaper.getAuthors()));
-                    newEvent.setPaper(newPaper);
-                    timeline.getEvents().add(eventRepository.save(newEvent));
-                }
-                timelineService.save(timeline);
-                break;
-            case "ru.ulstu.conference.model.Conference":
-                newConference = (Conference)newObject;
-                for (Deadline deadline : newConference.getDeadlines()
-                        .stream()
-                        .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
-                        .collect(Collectors.toList())) {
-                    Event newEvent = new Event();
-                    newEvent.setTitle("Дедлайн конференции");
-                    newEvent.setStatus(Event.EventStatus.NEW);
-                    newEvent.setExecuteDate(deadline.getDate());
-                    newEvent.setCreateDate(new Date());
-                    newEvent.setUpdateDate(new Date());
-                    newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' конференции '" + newConference.getTitle() + "'");
-                    newConference.getUsers().forEach(conferenceUser -> newEvent.getRecipients().add(conferenceUser.getUser()));
-                    newEvent.setConference(newConference);
-                    save(newEvent);
 
-                    timeline.getEvents().add(newEvent);
-                    timelineService.save(timeline);
-                }
-                break;
-            case "ru.ulstu.grant.model.Grant":
-                newGrant = (Grant)newObject;
-                for (Deadline deadline : newGrant.getDeadlines()
-                        .stream()
-                        .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
-                        .collect(Collectors.toList())) {
-                    Event newEvent = new Event();
-                    newEvent.setTitle("Дедлайн гранта");
-                    newEvent.setStatus(Event.EventStatus.NEW);
-                    newEvent.setExecuteDate(deadline.getDate());
-                    newEvent.setCreateDate(new Date());
-                    newEvent.setUpdateDate(new Date());
-                    newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' гранта '" + newGrant.getTitle() + "'");
-                    if (newGrant.getAuthors() != null) {
-                        newEvent.setRecipients(new ArrayList(newGrant.getAuthors()));
-                    }
-                    newEvent.getRecipients().add(newGrant.getLeader());
-                    newEvent.setGrant(newGrant);
-                    eventRepository.save(newEvent);
-
-                    timeline.getEvents().add(newEvent);
-                    timelineService.save(timeline);
-                }
-                break;
-            case "ru.ulstu.project.model.Project":
-                newProject = (Project)newObject;
-                for (Deadline deadline : newProject.getDeadlines()
-                        .stream()
-                        .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
-                        .collect(Collectors.toList())) {
-                    Event newEvent = new Event();
-                    newEvent.setTitle("Дедлайн проекта");
-                    newEvent.setStatus(Event.EventStatus.NEW);
-                    newEvent.setExecuteDate(deadline.getDate());
-                    newEvent.setCreateDate(new Date());
-                    newEvent.setUpdateDate(new Date());
-                    newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' проекта '" + newProject.getTitle() + "'");
-                    if (newProject.getExecutors() != null) {
-                        newEvent.setRecipients(new ArrayList(newProject.getExecutors()));
-                    }
-                    newEvent.setProject(newProject);
-                    eventRepository.save(newEvent);
-
-                    timeline.getEvents().add(newEvent);
-                    timelineService.save(timeline);
-                }
-                break;
-            case "ru.ulstu.students.model.Task":
-                newTask = (Task)newObject;
-                for (Deadline deadline : newTask.getDeadlines()
-                        .stream()
-                        .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
-                        .collect(Collectors.toList())) {
-                    Event newEvent = new Event();
-                    newEvent.setTitle("Дедлайн задачи");
-                    newEvent.setStatus(Event.EventStatus.NEW);
-                    newEvent.setExecuteDate(deadline.getDate());
-                    newEvent.setCreateDate(new Date());
-                    newEvent.setUpdateDate(new Date());
-                    newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' задачи '" + newTask.getTitle() + "'");
-                    newEvent.getRecipients().add(userService.getCurrentUser());
-                    newEvent.setTask(newTask);
-                    eventRepository.save(newEvent);
-
-                    timeline.getEvents().add(newEvent);
-                    timelineService.save(timeline);
-                }
-                System.out.println("5");
-                break;
-            default:
-                System.out.println("No such object");
-                break;
+        timeline.getEvents().removeAll(events);
+        for (Deadline deadline : eventSource.getDeadlines()
+                .stream()
+                .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
+                .collect(Collectors.toList())) {
+            Event newEvent = new Event();
+            newEvent.setTitle("Дедлайн " + suffix);
+            newEvent.setStatus(Event.EventStatus.NEW);
+            newEvent.setExecuteDate(deadline.getDate());
+            newEvent.setCreateDate(new Date());
+            newEvent.setUpdateDate(new Date());
+            newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' " + suffix + " '"
+                    + eventSource.getTitle() + "'");
+            if (addCurrentUser) {
+                newEvent.getRecipients().add(userService.getCurrentUser());
+            }
+            newEvent.setRecipients(eventSource.getRecipients());
+            eventSource.addObjectToEvent(newEvent);
+            timeline.getEvents().add(eventRepository.save(newEvent));
         }
+        timelineService.save(timeline);
     }
     public void updatePaperDeadlines(Paper paper) {
         List<Event> foundEvents = eventRepository.findAllByPaper(paper);
         eventRepository.delete(foundEvents);
-        createFromObject(paper, foundEvents);
+        createFromObject(paper, foundEvents, false, "статьи");
     }
 
     public List<Event> findByCurrentDate() {
@@ -259,17 +155,17 @@ public class EventService {
 
     public void updateConferenceDeadlines(Conference conference) {
         eventRepository.delete(eventRepository.findAllByConference(conference));
-        createFromObject(conference, Collections.emptyList());
+        createFromObject(conference, Collections.emptyList(), false, "конференции");
     }
 
     public void updateGrantDeadlines(Grant grant) {
         eventRepository.delete(eventRepository.findAllByGrant(grant));
-        createFromObject(grant, Collections.emptyList());
+        createFromObject(grant, Collections.emptyList(), false, "гранта");
     }
 
     public void updateProjectDeadlines(Project project) {
         eventRepository.delete(eventRepository.findAllByProject(project));
-        createFromObject(project, Collections.emptyList());
+        createFromObject(project, Collections.emptyList(), false, "проекта");
     }
 
     public void removeConferencesEvent(Conference conference) {
@@ -279,6 +175,6 @@ public class EventService {
 
     public void updateTaskDeadlines(Task task) {
         eventRepository.delete(eventRepository.findAllByTask(task));
-        createFromObject(task, Collections.emptyList());
+        createFromObject(task, Collections.emptyList(), true, "задачи");
     }
-}
+}
\ No newline at end of file

From bdff81d25eba7c66559a79b669ae2509bd3317c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 3 Jun 2019 20:42:49 +0300
Subject: [PATCH 74/74] #101 tests edited

---
 src/test/java/ru/ulstu/project/service/ProjectServiceTest.java | 2 +-
 src/test/java/ru/ulstu/students/service/TaskServiceTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java b/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java
index d06ad0e..4015f3b 100644
--- a/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java
+++ b/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java
@@ -99,7 +99,7 @@ public class ProjectServiceTest {
     public void create() throws IOException {
         when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines);
         when(projectRepository.save(new Project())).thenReturn(project);
-        eventService.createFromObject(new Project(), Collections.emptyList());
+        eventService.createFromObject(new Project(), Collections.emptyList(), false, "проекта");
 
         projectDto.setTitle(TITLE);
         projectDto.setDeadlines(deadlines);
diff --git a/src/test/java/ru/ulstu/students/service/TaskServiceTest.java b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
index 0d33630..d3db954 100644
--- a/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
+++ b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java
@@ -136,7 +136,7 @@ public class TaskServiceTest {
         when(tagService.saveOrCreate(new ArrayList<>())).thenReturn(tags);
         when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines);
         when(taskRepository.save(new Task())).thenReturn(task);
-        eventService.createFromObject(new Task(), Collections.emptyList());
+        eventService.createFromObject(new Task(), Collections.emptyList(), true, "задачи");
 
         taskDto.setTags(tags);
         taskDto.setDeadlines(deadlines);