From c489ebbf9149da82f7ab1364b52c883131c02c24 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Thu, 25 Apr 2019 17:12:39 +0400
Subject: [PATCH 01/37] #70 added create notification for all users about new
 conference

---
 .../ru/ulstu/conference/model/Conference.java | 20 +++++
 .../ConferenceNotificationService.java        | 73 +++++++++++++++++++
 .../conference/service/ConferenceService.java |  6 +-
 .../conferenceCreateNotification.html         | 30 ++++++++
 .../templates/conferences/conference.html     |  5 +-
 5 files changed, 129 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/mail_templates/conferenceCreateNotification.html

diff --git a/src/main/java/ru/ulstu/conference/model/Conference.java b/src/main/java/ru/ulstu/conference/model/Conference.java
index 3f77699..126c1bc 100644
--- a/src/main/java/ru/ulstu/conference/model/Conference.java
+++ b/src/main/java/ru/ulstu/conference/model/Conference.java
@@ -21,8 +21,10 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 @Entity
 @Table(name = "conference")
@@ -135,4 +137,22 @@ public class Conference extends BaseEntity {
     public void setUsers(List<ConferenceUser> users) {
         this.users = users;
     }
+
+    public Optional<Deadline> getNextDeadline() {
+        return deadlines
+                .stream()
+                .filter(deadline -> deadline.getDate() != null)
+                .sorted(Comparator.comparing(Deadline::getDate))
+                .filter(d -> d.getDate().after(new Date()))
+                .findFirst();
+    }
+
+    public boolean lastDeadlineFailed() {
+        return !deadlines
+                .stream()
+                .filter(deadline -> deadline.getDate() != null)
+                .filter(d -> d.getDate().after(new Date()))
+                .findAny()
+                .isPresent();
+    }
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java b/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
index ff9f69a..c69d862 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
@@ -1,7 +1,80 @@
 package ru.ulstu.conference.service;
 
+import com.google.common.collect.ImmutableMap;
 import org.springframework.stereotype.Service;
+import ru.ulstu.conference.model.Conference;
+import ru.ulstu.core.util.DateUtils;
+import ru.ulstu.user.service.MailService;
+import ru.ulstu.user.service.UserService;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class ConferenceNotificationService {
+
+    private final static int DAYS_TO_DEADLINE_NOTIFICATION = 7;
+    private final static String TEMPLATE_DEADLINE = "conferenceDeadlineNotification";
+    private final static String TEMPLATE_CREATE_CONFERENCE = "conferenceCreateNotification";
+    private final static String TEMPLATE_STATUS_CHANGED = "conferenceChangeNotification";
+    private final static String TEMPLATE_FAILED = "conferenceFailedNotification";
+
+    private final static String TITLE_DEADLINE = "Приближается дедлайн конференции";
+    private final static String TITLE_CREATE = "Создана новая конференция: %s";
+    private final static String TITLE_STATUS_CHANGED = "Изменения в конференции";
+    private final static String TITLE_FAILED = "Статья провалена";
+
+
+    private final MailService mailService;
+    private final UserService userService;
+
+    public ConferenceNotificationService(MailService mailService,
+                                         UserService userService) {
+        this.mailService = mailService;
+        this.userService = userService;
+    }
+
+    public void sendDeadlineNotifications(List<Conference> conferences, boolean isDeadlineBeforeWeek) {
+        Date now = DateUtils.addDays(new Date(), DAYS_TO_DEADLINE_NOTIFICATION);
+        conferences
+                .stream()
+                .filter(conference -> needToSendDeadlineNotification(conference, now, isDeadlineBeforeWeek))
+                .forEach(conference -> sendMessageDeadline(conference));
+    }
+
+    private boolean needToSendDeadlineNotification(Conference conference, Date compareDate, boolean isDeadlineBeforeWeek) {
+        return (conference.getNextDeadline().isPresent())
+                && (compareDate.before(conference.getNextDeadline().get().getDate()) && isDeadlineBeforeWeek
+                || compareDate.after(conference.getNextDeadline().get().getDate()) && !isDeadlineBeforeWeek)
+                && conference.getNextDeadline().get().getDate().after(new Date());
+    }
+
+    private void sendMessageDeadline(Conference conference) {
+        Map<String, Object> variables = ImmutableMap.of("conference", conference);
+        sendForAllParticipals(variables, conference, TEMPLATE_DEADLINE, TITLE_DEADLINE);
+    }
+
+    public void sendCreateNotification(Conference conference) {
+        Map<String, Object> variables = ImmutableMap.of("conference", conference);
+        sendForAllUsers(variables, TEMPLATE_CREATE_CONFERENCE, String.format(TITLE_CREATE, conference.getTitle()));
+    }
+
+    //    public void statusChangeNotification(Paper paper, Paper.PaperStatus oldStatus) {
+//        Map<String, Object> variables = ImmutableMap.of("paper", paper, "oldStatus", oldStatus);
+//        sendForAllParticipals(variables, paper, TEMPLATE_STATUS_CHANGED, TITLE_STATUS_CHANGED);
+//    }
+//
+//    public void sendFailedNotification(Paper paper, Paper.PaperStatus oldStatus) {
+//        Map<String, Object> variables = ImmutableMap.of("paper", paper, "oldStatus", oldStatus);
+//        sendForAllParticipals(variables, paper, TEMPLATE_FAILED, TITLE_FAILED);
+//    }
+
+    private void sendForAllUsers(Map<String, Object> variables, String template, String title) {
+        userService.findAll().forEach(user -> mailService.sendEmailFromTemplate(variables, user, template, title));
+    }
+
+    private void sendForAllParticipals(Map<String, Object> variables, Conference conference, String template, String title) {
+        conference.getUsers().forEach(conferenceUser -> mailService.sendEmailFromTemplate(variables, conferenceUser.getUser(), template, title));
+    }
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 905c208..bed0deb 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -36,19 +36,22 @@ public class ConferenceService {
     private final PaperService paperService;
     private final UserService userService;
     private final PingService pingService;
+    private final ConferenceNotificationService conferenceNotificationService;
 
     public ConferenceService(ConferenceRepository conferenceRepository,
                              ConferenceUserService conferenceUserService,
                              DeadlineService deadlineService,
                              PaperService paperService,
                              UserService userService,
-                             PingService pingService) {
+                             PingService pingService,
+                             ConferenceNotificationService conferenceNotificationService) {
         this.conferenceRepository = conferenceRepository;
         this.conferenceUserService = conferenceUserService;
         this.deadlineService = deadlineService;
         this.paperService = paperService;
         this.userService = userService;
         this.pingService = pingService;
+        this.conferenceNotificationService = conferenceNotificationService;
     }
 
     public ConferenceDto getExistConferenceById(Integer id) {
@@ -91,6 +94,7 @@ public class ConferenceService {
     public Integer create(ConferenceDto conferenceDto) throws IOException {
         Conference newConference = copyFromDto(new Conference(), conferenceDto);
         newConference = conferenceRepository.save(newConference);
+        conferenceNotificationService.sendCreateNotification(newConference);
         return newConference.getId();
     }
 
diff --git a/src/main/resources/mail_templates/conferenceCreateNotification.html b/src/main/resources/mail_templates/conferenceCreateNotification.html
new file mode 100644
index 0000000..055e85d
--- /dev/null
+++ b/src/main/resources/mail_templates/conferenceCreateNotification.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <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>
+    Уважаемый(ая) <span th:text="${user.firstName + ' ' + user.lastName}">Ivan Ivanov</span>
+</p>
+<p>
+    Была создана новая конференция: "<a th:href="@{|${baseUrl}/conferences/conference?id=${conference.id}|}">
+    <span th:text="${conference.title}">Title</span></a>".
+    <br/>
+    Спешите принять участие!
+</p>
+<p>
+    Даты проведения:
+    <span th:text="${#dates.format(conference.beginDate, 'dd.MM.yyyy')}"></span>
+    -
+    <span th:text="${#dates.format(conference.endDate, 'dd.MM.yyyy')}"></span>.
+</p>
+<p>
+    Regards,
+    <br/>
+    <em>NG-tracker.</em>
+</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index 2d93a5e..69c754a 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorator="default" xmlns:th="">
+      layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
 <head>
     <link rel="stylesheet" type="text/css" href="../css/conference.css"/>
 </head>
@@ -135,7 +135,6 @@
                                 <div class="form-group">
                                     <label for="papers">Статьи:</label>
                                     <div class="paper-list form-control list-group" id="papers">
-                                        <!--<input th:type="hidden" th:field="*{papers}"/>-->
                                         <div class="paper d-flex list-group-item p-0"
                                              th:each="paper, rowStat : *{papers}">
                                             <input type="hidden" th:field="*{papers[__${rowStat.index}__].id}"/>
@@ -148,8 +147,6 @@
                                                 <span th:text="*{papers[__${rowStat.index}__].title}">
                                                     Имя статьи
                                                 </span>
-
-                                                <!--<img class="icon-paper" src="/img/conference/paper.png"/>-->
                                             </a>
                                             <a class="paper-name"
                                                th:unless="*{papers[__${rowStat.index}__].id !=null}">

From 16e9bf1fb56c092e6a57fc7afa45306f18a6f406 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Thu, 25 Apr 2019 19:15:19 +0400
Subject: [PATCH 02/37] #70 added update notification for all participants

---
 .../ConferenceNotificationService.java        | 25 ++++++++----
 .../conference/service/ConferenceService.java | 40 +++++++++++++++++++
 .../conferenceUpdateDatesNotification.html    | 31 ++++++++++++++
 ...conferenceUpdateDeadlinesNotification.html | 24 +++++++++++
 4 files changed, 113 insertions(+), 7 deletions(-)
 create mode 100644 src/main/resources/mail_templates/conferenceUpdateDatesNotification.html
 create mode 100644 src/main/resources/mail_templates/conferenceUpdateDeadlinesNotification.html

diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java b/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
index c69d862..39472aa 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
@@ -16,15 +16,14 @@ public class ConferenceNotificationService {
 
     private final static int DAYS_TO_DEADLINE_NOTIFICATION = 7;
     private final static String TEMPLATE_DEADLINE = "conferenceDeadlineNotification";
-    private final static String TEMPLATE_CREATE_CONFERENCE = "conferenceCreateNotification";
-    private final static String TEMPLATE_STATUS_CHANGED = "conferenceChangeNotification";
-    private final static String TEMPLATE_FAILED = "conferenceFailedNotification";
+    private final static String TEMPLATE_CREATE = "conferenceCreateNotification";
+    private final static String TEMPLATE_UPDATE_DEADLINES = "conferenceUpdateDeadlinesNotification";
+    private final static String TEMPLATE_UPDATE_DATES = "conferenceUpdateDatesNotification";
 
     private final static String TITLE_DEADLINE = "Приближается дедлайн конференции";
     private final static String TITLE_CREATE = "Создана новая конференция: %s";
-    private final static String TITLE_STATUS_CHANGED = "Изменения в конференции";
-    private final static String TITLE_FAILED = "Статья провалена";
-
+    private final static String TITLE_UPDATE_DEADLINES = "Изменения дедлайнов в конференции: %s";
+    private final static String TITLE_UPDATE_DATES = "Изменение дат проведения конференции: %s";
 
     private final MailService mailService;
     private final UserService userService;
@@ -57,7 +56,17 @@ public class ConferenceNotificationService {
 
     public void sendCreateNotification(Conference conference) {
         Map<String, Object> variables = ImmutableMap.of("conference", conference);
-        sendForAllUsers(variables, TEMPLATE_CREATE_CONFERENCE, String.format(TITLE_CREATE, conference.getTitle()));
+        sendForAllUsers(variables, TEMPLATE_CREATE, String.format(TITLE_CREATE, conference.getTitle()));
+    }
+
+    public void updateDeadlineNotification(Conference conference) {
+        Map<String, Object> variables = ImmutableMap.of("conference", conference);
+        sendForAllParticipals(variables, conference, TEMPLATE_UPDATE_DEADLINES, String.format(TITLE_UPDATE_DEADLINES, conference.getTitle()));
+    }
+
+    public void updateConferencesDatesNotification(Conference conference, Date oldBeginDate, Date oldEndDate) {
+        Map<String, Object> variables = ImmutableMap.of("conference", conference, "oldBeginDate", oldBeginDate, "oldEndDate", oldEndDate);
+        sendForAllParticipals(variables, conference, TEMPLATE_UPDATE_DATES, String.format(TITLE_UPDATE_DATES, conference.getTitle()));
     }
 
     //    public void statusChangeNotification(Paper paper, Paper.PaperStatus oldStatus) {
@@ -77,4 +86,6 @@ public class ConferenceNotificationService {
     private void sendForAllParticipals(Map<String, Object> variables, Conference conference, String template, String title) {
         conference.getUsers().forEach(conferenceUser -> mailService.sendEmailFromTemplate(variables, conferenceUser.getUser(), template, title));
     }
+
+
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index bed0deb..af43ae9 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -10,6 +10,7 @@ import ru.ulstu.conference.model.ConferenceDto;
 import ru.ulstu.conference.model.ConferenceFilterDto;
 import ru.ulstu.conference.model.ConferenceUser;
 import ru.ulstu.conference.repository.ConferenceRepository;
+import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.service.PaperService;
@@ -22,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static org.springframework.util.ObjectUtils.isEmpty;
 import static ru.ulstu.core.util.StreamApiUtils.convert;
@@ -101,7 +103,13 @@ public class ConferenceService {
     @Transactional
     public Integer update(ConferenceDto conferenceDto) throws IOException {
         Conference conference = conferenceRepository.findOne(conferenceDto.getId());
+        List<Deadline> oldDeadlines = conference.getDeadlines().stream()
+                .map(this::copyDeadline)
+                .collect(Collectors.toList());
+        Date oldBeginDate = conference.getBeginDate();
+        Date oldEndDate = conference.getEndDate();
         conferenceRepository.save(copyFromDto(conference, conferenceDto));
+        sendNotificationAfterUpdate(conference, oldDeadlines, oldBeginDate, oldEndDate);
         conferenceDto.getRemovedDeadlineIds().forEach(deadlineService::remove);
         return conference.getId();
     }
@@ -228,4 +236,36 @@ public class ConferenceService {
         modelMap.addAttribute("nearshoreSales", nearshoreSales);
         modelMap.addAttribute("offshoreSales", offshoreSales);
     }
+
+    public void sendNotificationAfterUpdate(Conference conference, List<Deadline> oldDeadlines, Date oldBeginDate, Date oldEndDate) {
+        boolean isSendNotificationAboutDeadlines = false;
+        if (oldDeadlines.size() != conference.getDeadlines().size()) {
+            isSendNotificationAboutDeadlines = true;
+        }
+        for (Deadline deadline : conference.getDeadlines()) {
+            if (isSendNotificationAboutDeadlines) {
+                break;
+            }
+            for (Deadline oldDeadline : oldDeadlines) {
+                if (deadline.getId().equals(oldDeadline.getId())) {
+                    if (!deadline.getDescription().equals(oldDeadline.getDescription()) || !deadline.getDate().equals(oldDeadline.getDate())) {
+                        isSendNotificationAboutDeadlines = true;
+                        break;
+                    }
+                }
+            }
+        }
+        if (isSendNotificationAboutDeadlines) {
+            conferenceNotificationService.updateDeadlineNotification(conference);
+        }
+        if (!conference.getBeginDate().equals(oldBeginDate) || !conference.getEndDate().equals(oldEndDate)) {
+            conferenceNotificationService.updateConferencesDatesNotification(conference, oldBeginDate, oldEndDate);
+        }
+    }
+
+    public Deadline copyDeadline(Deadline oldDeadline) {
+        Deadline newDeadline = new Deadline(oldDeadline.getDate(), oldDeadline.getDescription());
+        newDeadline.setId(oldDeadline.getId());
+        return newDeadline;
+    }
 }
diff --git a/src/main/resources/mail_templates/conferenceUpdateDatesNotification.html b/src/main/resources/mail_templates/conferenceUpdateDatesNotification.html
new file mode 100644
index 0000000..479336f
--- /dev/null
+++ b/src/main/resources/mail_templates/conferenceUpdateDatesNotification.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <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>
+    Уважаемый(ая) <span th:text="${user.firstName + ' ' + user.lastName}">Ivan Ivanov</span>
+</p>
+<p>
+    Даты проведения конференции "<a th:href="@{|${baseUrl}/conferences/conference?id=${conference.id}|}">
+    <span th:text="${conference.title}">Title</span></a>" изменились с <br/>
+    "<span th:text="${#dates.format(oldBeginDate, 'dd.MM.yyyy')}">oldBeginDate</span>"
+    -
+    "<span th:text="${#dates.format(oldEndDate, 'dd.MM.yyyy')}">oldEndDate</span>"
+    <br/>
+
+    на <br/>
+    "<span th:text="${#dates.format(conference.beginDate, 'dd.MM.yyyy')}"></span>"
+    -
+    "<span th:text="${#dates.format(conference.endDate, 'dd.MM.yyyy')}"></span>".
+</p>
+<p>
+    Regards,
+    <br/>
+    <em>NG-tracker.</em>
+</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/mail_templates/conferenceUpdateDeadlinesNotification.html b/src/main/resources/mail_templates/conferenceUpdateDeadlinesNotification.html
new file mode 100644
index 0000000..f010fb8
--- /dev/null
+++ b/src/main/resources/mail_templates/conferenceUpdateDeadlinesNotification.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <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>
+    Уважаемый(ая) <span th:text="${user.firstName + ' ' + user.lastName}">Ivan Ivanov</span>
+</p>
+<p>
+    Дедлайны конференции "<a th:href="@{|${baseUrl}/conferences/conference?id=${conference.id}|}">
+    <span th:text="${conference.title}">Title</span></a>" притерпели изменения.
+    <br/>
+    Ознакомтесь с изменениями.
+</p>
+<p>
+    Regards,
+    <br/>
+    <em>NG-tracker.</em>
+</p>
+</body>
+</html>
\ No newline at end of file

From 34925b81ffc1fc03cbfa7ca5c798921483447b7d Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Thu, 25 Apr 2019 21:17:48 +0400
Subject: [PATCH 03/37] #70 added schedule for deadline of conference

---
 .../ConferenceNotificationService.java        | 12 +-----
 .../service/ConferenceScheduler.java          | 37 +++++++++++++++++++
 .../conferenceDeadlineNotification.html       | 29 +++++++++++++++
 3 files changed, 67 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java
 create mode 100644 src/main/resources/mail_templates/conferenceDeadlineNotification.html

diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java b/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
index 39472aa..54faa49 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
@@ -39,7 +39,7 @@ public class ConferenceNotificationService {
         conferences
                 .stream()
                 .filter(conference -> needToSendDeadlineNotification(conference, now, isDeadlineBeforeWeek))
-                .forEach(conference -> sendMessageDeadline(conference));
+                .forEach(this::sendMessageDeadline);
     }
 
     private boolean needToSendDeadlineNotification(Conference conference, Date compareDate, boolean isDeadlineBeforeWeek) {
@@ -69,16 +69,6 @@ public class ConferenceNotificationService {
         sendForAllParticipals(variables, conference, TEMPLATE_UPDATE_DATES, String.format(TITLE_UPDATE_DATES, conference.getTitle()));
     }
 
-    //    public void statusChangeNotification(Paper paper, Paper.PaperStatus oldStatus) {
-//        Map<String, Object> variables = ImmutableMap.of("paper", paper, "oldStatus", oldStatus);
-//        sendForAllParticipals(variables, paper, TEMPLATE_STATUS_CHANGED, TITLE_STATUS_CHANGED);
-//    }
-//
-//    public void sendFailedNotification(Paper paper, Paper.PaperStatus oldStatus) {
-//        Map<String, Object> variables = ImmutableMap.of("paper", paper, "oldStatus", oldStatus);
-//        sendForAllParticipals(variables, paper, TEMPLATE_FAILED, TITLE_FAILED);
-//    }
-
     private void sendForAllUsers(Map<String, Object> variables, String template, String title) {
         userService.findAll().forEach(user -> mailService.sendEmailFromTemplate(variables, user, template, title));
     }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java b/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java
new file mode 100644
index 0000000..ead2913
--- /dev/null
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java
@@ -0,0 +1,37 @@
+package ru.ulstu.conference.service;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ConferenceScheduler {
+    private final static boolean IS_DEADLINE_NOTIFICATION_BEFORE_WEEK = true;
+
+    private final Logger log = LoggerFactory.getLogger(ConferenceScheduler.class);
+
+    private final ConferenceNotificationService conferenceNotificationService;
+    private final ConferenceService conferenceService;
+
+    public ConferenceScheduler(ConferenceNotificationService conferenceNotificationService,
+                               ConferenceService conferenceService) {
+        this.conferenceNotificationService = conferenceNotificationService;
+        this.conferenceService = conferenceService;
+    }
+
+
+    @Scheduled(cron = "0 0 21-22 * * *", zone = "Europe/Samara")
+    public void checkDeadlineBeforeWeek() {
+        log.debug("ConferenceScheduler.checkDeadlineBeforeWeek started");
+        conferenceNotificationService.sendDeadlineNotifications(conferenceService.findAll(), IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
+        log.debug("ConferenceScheduler.checkDeadlineBeforeWeek finished");
+    }
+
+    @Scheduled(cron = "0 0 21-22 * * ?", zone = "Europe/Samara")
+    public void checkDeadlineAfterWeek() {
+        log.debug("ConferenceScheduler.checkDeadlineAfterWeek started");
+        conferenceNotificationService.sendDeadlineNotifications(conferenceService.findAll(), !IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
+        log.debug("ConferenceScheduler.checkDeadlineAfterWeek finished");
+    }
+}
diff --git a/src/main/resources/mail_templates/conferenceDeadlineNotification.html b/src/main/resources/mail_templates/conferenceDeadlineNotification.html
new file mode 100644
index 0000000..77c89b1
--- /dev/null
+++ b/src/main/resources/mail_templates/conferenceDeadlineNotification.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <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>
+    Уважаемый(ая) <span th:text="${user.firstName + ' ' + user.lastName}">Ivan Ivanov</span>
+</p>
+<p>
+    Приближается дедлайн конференции "<a th:href="@{|${baseUrl}/conferences/conference?id=${conference.id}|}">
+    <span th:text="${conference.title}">Title</span></a>".
+</p>
+<p>
+    Срок исполнения: <b><span th:text="${#dates.format(conference.nextDeadline.get().date, 'dd.MM.yyyy')}"></span></b>.
+</p>
+
+<p>
+    Примечание: <b><span th:text="${conference.nextDeadline.get().description}"></span></b>.
+</p>
+<p>
+    Regards,
+    <br/>
+    <em>NG-tracker.</em>
+</p>
+</body>
+</html>

From 51e121ae249325615a3f378fe61595f9c25edcb6 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Fri, 26 Apr 2019 00:29:20 +0400
Subject: [PATCH 04/37] #117 add BAK papers filter

---
 .../java/ru/ulstu/grant/model/GrantDto.java   | 18 +++++++++++
 .../ru/ulstu/grant/service/GrantService.java  | 32 +++++++++++++++++--
 .../paper/repository/PaperRepository.java     |  2 ++
 .../ru/ulstu/paper/service/PaperService.java  |  7 ++++
 .../resources/templates/grants/grant.html     |  9 ++++--
 5 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/model/GrantDto.java b/src/main/java/ru/ulstu/grant/model/GrantDto.java
index 3fb77c5..b60aec0 100644
--- a/src/main/java/ru/ulstu/grant/model/GrantDto.java
+++ b/src/main/java/ru/ulstu/grant/model/GrantDto.java
@@ -33,6 +33,8 @@ public class GrantDto {
     private boolean wasLeader;
     private boolean hasAge;
     private boolean hasDegree;
+    private boolean hasBAKPapers;
+    private boolean hasScopusPapers;
     private List<Integer> paperIds = new ArrayList<>();
     private List<Paper> papers = new ArrayList<>();
     private List<Integer> removedDeadlineIds = new ArrayList<>();
@@ -224,4 +226,20 @@ public class GrantDto {
     public void setRemovedDeadlineIds(List<Integer> removedDeadlineIds) {
         this.removedDeadlineIds = removedDeadlineIds;
     }
+
+    public boolean isHasBAKPapers() {
+        return hasBAKPapers;
+    }
+
+    public void setHasBAKPapers(boolean hasBAKPapers) {
+        this.hasBAKPapers = hasBAKPapers;
+    }
+
+    public boolean isHasScopusPapers() {
+        return hasScopusPapers;
+    }
+
+    public void setHasScopusPapers(boolean hasScopusPapers) {
+        this.hasScopusPapers = hasScopusPapers;
+    }
 }
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index cabed80..ba6e1e9 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -18,11 +18,12 @@ import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
+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.grant.model.Grant.GrantStatus.APPLICATION;
@@ -156,8 +157,15 @@ public class GrantService {
             filteredUsers = filteredUsers
                     .stream()
                     .filter(getCompletedGrantLeaders()::contains)
-                    .collect(Collectors.toList());
+                    .collect(toList());
         }
+        if (grantDto.isHasBAKPapers()) {
+            filteredUsers = filteredUsers
+                    .stream()
+                    .filter(getCompletedBAKPapersAuthors()::contains)
+                    .collect(toList());
+        }
+
         return filteredUsers;
     }
 
@@ -165,7 +173,7 @@ public class GrantService {
         return grantRepository.findByStatus(Grant.GrantStatus.COMPLETED)
                 .stream()
                 .map(Grant::getLeader)
-                .collect(Collectors.toList());
+                .collect(toList());
     }
 
     public List<Paper> getGrantPapers(List<Integer> paperIds) {
@@ -193,4 +201,22 @@ public class GrantService {
         grantDto.getDeadlines().remove((int) deadlineId);
     }
 
+    private List<User> getCompletedBAKPapersAuthors() {
+        List<Paper> papers = paperService.findCompletedVAKPapers()
+                .stream()
+                .filter(paper -> paper.getAuthors() != null)
+                .collect(toList());
+
+        List<User> users = new ArrayList<>();
+        for (Paper p : papers) {
+            p.getAuthors()
+                    .stream()
+                    .forEach(users::add);
+        }
+
+        return users
+                .stream()
+                .distinct()
+                .collect(toList());
+    }
 }
diff --git a/src/main/java/ru/ulstu/paper/repository/PaperRepository.java b/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
index cab9b1a..8bc59ce 100644
--- a/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
+++ b/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
@@ -16,4 +16,6 @@ public interface PaperRepository extends JpaRepository<Paper, Integer> {
     List<Paper> findByIdNotIn(List<Integer> paperIds);
 
     List<Paper> findAllByIdIn(List<Integer> paperIds);
+
+    List<Paper> findByType(Paper.PaperType type);
 }
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index 325e377..648dbc9 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -272,4 +272,11 @@ public class PaperService {
                 .map(User::getUserAbbreviate)
                 .collect(Collectors.joining(", "));
     }
+
+    public List<Paper> findCompletedVAKPapers() {
+        return paperRepository.findByType(Paper.PaperType.VAK)
+                .stream()
+                .filter(findAllCompleted()::contains)
+                .collect(toList());
+    }
 }
diff --git a/src/main/resources/templates/grants/grant.html b/src/main/resources/templates/grants/grant.html
index 9c0736d..da59248 100644
--- a/src/main/resources/templates/grants/grant.html
+++ b/src/main/resources/templates/grants/grant.html
@@ -90,7 +90,8 @@
                                        aria-expanded="false"
                                        aria-controls="collapse-filter">Фильтр рабочей группы
                                 </label>
-                                <div th:class="${grantDto.wasLeader || grantDto.hasAge || grantDto.hasDegree} ?
+                                <div th:class="${grantDto.wasLeader || grantDto.hasAge || grantDto.hasDegree
+                                                || grantDto.hasBAKPapers || grantDto.hasScopusPapers} ?
                                                 'form-check' : 'form-check collapse'" id="collapse-filter">
                                     <div class="row">
                                         <div class="col">
@@ -111,14 +112,16 @@
                                             <label class="form-check-label" for="f3">Cтепень к.т.н.</label>
                                         </div>
                                         <div class="col">
-                                            <input class="form-check-input" type="checkbox" id="f4"/>
+                                            <input class="form-check-input" type="checkbox" id="f4"
+                                                   th:field="*{hasScopusPapers}" th:onclick="|$('#filter').click();|"/>
                                             <label class="form-check-label" for="f4">Более 3-х публикаций в
                                                 scopus</label>
                                         </div>
                                     </div>
                                     <div class="row">
                                         <div class="col">
-                                            <input class="form-check-input" type="checkbox" id="f5"/>
+                                            <input class="form-check-input" type="checkbox" id="f5"
+                                                   th:field="*{hasBAKPapers}" th:onclick="|$('#filter').click();|"/>
                                             <label class="form-check-label" for="f5">Наличие ВАК статей</label> <br/>
                                         </div>
                                         <div class="col">

From 51877023d122a5ea98198ce254ef57af5d4f245f Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Fri, 26 Apr 2019 09:28:20 +0400
Subject: [PATCH 05/37] #70 added new column to event

---
 .../ru/ulstu/conference/model/Conference.java |  9 -------
 .../service/ConferenceScheduler.java          |  4 +--
 .../conference/service/ConferenceService.java |  7 +++++-
 .../ulstu/timeline/service/EventService.java  | 25 +++++++++++++++++++
 .../db/changelog-20190426_000000-schema.xml   | 13 ++++++++++
 src/main/resources/db/changelog-master.xml    |  1 +
 6 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20190426_000000-schema.xml

diff --git a/src/main/java/ru/ulstu/conference/model/Conference.java b/src/main/java/ru/ulstu/conference/model/Conference.java
index 126c1bc..9c91a7e 100644
--- a/src/main/java/ru/ulstu/conference/model/Conference.java
+++ b/src/main/java/ru/ulstu/conference/model/Conference.java
@@ -146,13 +146,4 @@ public class Conference extends BaseEntity {
                 .filter(d -> d.getDate().after(new Date()))
                 .findFirst();
     }
-
-    public boolean lastDeadlineFailed() {
-        return !deadlines
-                .stream()
-                .filter(deadline -> deadline.getDate() != null)
-                .filter(d -> d.getDate().after(new Date()))
-                .findAny()
-                .isPresent();
-    }
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java b/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java
index ead2913..863abb5 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java
@@ -21,14 +21,14 @@ public class ConferenceScheduler {
     }
 
 
-    @Scheduled(cron = "0 0 21-22 * * *", zone = "Europe/Samara")
+    @Scheduled(cron = "0 0 8 * * *", zone = "Europe/Samara")
     public void checkDeadlineBeforeWeek() {
         log.debug("ConferenceScheduler.checkDeadlineBeforeWeek started");
         conferenceNotificationService.sendDeadlineNotifications(conferenceService.findAll(), IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
         log.debug("ConferenceScheduler.checkDeadlineBeforeWeek finished");
     }
 
-    @Scheduled(cron = "0 0 21-22 * * ?", zone = "Europe/Samara")
+    @Scheduled(cron = "0 0 8 * * ?", zone = "Europe/Samara")
     public void checkDeadlineAfterWeek() {
         log.debug("ConferenceScheduler.checkDeadlineAfterWeek started");
         conferenceNotificationService.sendDeadlineNotifications(conferenceService.findAll(), !IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index af43ae9..6550814 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -15,6 +15,7 @@ import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.service.PaperService;
 import ru.ulstu.ping.service.PingService;
+import ru.ulstu.timeline.service.EventService;
 import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
 
@@ -39,6 +40,7 @@ public class ConferenceService {
     private final UserService userService;
     private final PingService pingService;
     private final ConferenceNotificationService conferenceNotificationService;
+    private final EventService eventService;
 
     public ConferenceService(ConferenceRepository conferenceRepository,
                              ConferenceUserService conferenceUserService,
@@ -46,7 +48,8 @@ public class ConferenceService {
                              PaperService paperService,
                              UserService userService,
                              PingService pingService,
-                             ConferenceNotificationService conferenceNotificationService) {
+                             ConferenceNotificationService conferenceNotificationService,
+                             EventService eventService) {
         this.conferenceRepository = conferenceRepository;
         this.conferenceUserService = conferenceUserService;
         this.deadlineService = deadlineService;
@@ -54,6 +57,7 @@ public class ConferenceService {
         this.userService = userService;
         this.pingService = pingService;
         this.conferenceNotificationService = conferenceNotificationService;
+        this.eventService = eventService;
     }
 
     public ConferenceDto getExistConferenceById(Integer id) {
@@ -97,6 +101,7 @@ public class ConferenceService {
         Conference newConference = copyFromDto(new Conference(), conferenceDto);
         newConference = conferenceRepository.save(newConference);
         conferenceNotificationService.sendCreateNotification(newConference);
+        eventService.createFromConference(newConference);
         return newConference.getId();
     }
 
diff --git a/src/main/java/ru/ulstu/timeline/service/EventService.java b/src/main/java/ru/ulstu/timeline/service/EventService.java
index 2d2b83d..d0e50a9 100644
--- a/src/main/java/ru/ulstu/timeline/service/EventService.java
+++ b/src/main/java/ru/ulstu/timeline/service/EventService.java
@@ -4,6 +4,7 @@ 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.deadline.model.Deadline;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.timeline.model.Event;
@@ -140,4 +141,28 @@ public class EventService {
     public List<EventDto> findAllFutureDto() {
         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() + "' cтатьи '" + newPaper.getTitle() + "'");
+//            newEvent.setRecipients(new ArrayList(newPaper.getAuthors()));
+//            newEvent.setConference(newConference);
+            eventRepository.save(newEvent);
+
+            timeline.getEvents().add(newEvent);
+            timelineService.save(timeline);
+        }
+    }
 }
diff --git a/src/main/resources/db/changelog-20190426_000000-schema.xml b/src/main/resources/db/changelog-20190426_000000-schema.xml
new file mode 100644
index 0000000..5304032
--- /dev/null
+++ b/src/main/resources/db/changelog-20190426_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="vova" id="20190426_000000-1">
+        <addColumn tableName="event">
+            <column name="conference_id" type="integer"></column>
+        </addColumn>
+        <addForeignKeyConstraint baseTableName="event" baseColumnNames="conference_id"
+                                 constraintName="fk_event_conference_id" referencedTableName="conference"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 68b294a..f5a1451 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -34,4 +34,5 @@
     <include file="db/changelog-20190421_000000-schema.xml"/>
     <include file="db/changelog-20190422_000000-schema.xml"/>
     <include file="db/changelog-20190424_000000-schema.xml"/>
+    <include file="db/changelog-20190426_000000-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file

From dbcdb96dbf066655ebe4ff30048a7c38321902cc Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Fri, 26 Apr 2019 15:12:34 +0400
Subject: [PATCH 06/37] #70 added event method, don't work, because trying to
 find null entity

---
 .../ru/ulstu/conference/model/Conference.java     |  1 +
 .../conference/service/ConferenceService.java     |  1 +
 src/main/java/ru/ulstu/timeline/model/Event.java  | 13 +++++++++++++
 .../java/ru/ulstu/timeline/model/EventDto.java    | 15 ++++++++++++++-
 .../timeline/repository/EventRepository.java      |  3 +++
 .../ru/ulstu/timeline/service/EventService.java   | 13 +++++++++----
 6 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ru/ulstu/conference/model/Conference.java b/src/main/java/ru/ulstu/conference/model/Conference.java
index 9c91a7e..7e18ac0 100644
--- a/src/main/java/ru/ulstu/conference/model/Conference.java
+++ b/src/main/java/ru/ulstu/conference/model/Conference.java
@@ -59,6 +59,7 @@ public class Conference extends BaseEntity {
     @JoinTable(name = "paper_conference",
             joinColumns = {@JoinColumn(name = "conference_id")},
             inverseJoinColumns = {@JoinColumn(name = "paper_id")})
+    @Fetch(FetchMode.SUBSELECT)
     private List<Paper> papers = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 6550814..0c1d37d 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -114,6 +114,7 @@ public class ConferenceService {
         Date oldBeginDate = conference.getBeginDate();
         Date oldEndDate = conference.getEndDate();
         conferenceRepository.save(copyFromDto(conference, conferenceDto));
+        eventService.updateConferenceDeadlines(conference);
         sendNotificationAfterUpdate(conference, oldDeadlines, oldBeginDate, oldEndDate);
         conferenceDto.getRemovedDeadlineIds().forEach(deadlineService::remove);
         return conference.getId();
diff --git a/src/main/java/ru/ulstu/timeline/model/Event.java b/src/main/java/ru/ulstu/timeline/model/Event.java
index ef0a4b8..f53a52d 100644
--- a/src/main/java/ru/ulstu/timeline/model/Event.java
+++ b/src/main/java/ru/ulstu/timeline/model/Event.java
@@ -1,6 +1,7 @@
 package ru.ulstu.timeline.model;
 
 import org.hibernate.validator.constraints.NotBlank;
+import ru.ulstu.conference.model.Conference;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.user.model.User;
@@ -76,6 +77,10 @@ public class Event extends BaseEntity {
     @JoinColumn(name = "paper_id")
     private Paper paper;
 
+    @ManyToOne
+    @JoinColumn(name = "conference_id")
+    private Conference conference;
+
     public String getTitle() {
         return title;
     }
@@ -163,4 +168,12 @@ public class Event extends BaseEntity {
     public void setPaper(Paper paper) {
         this.paper = paper;
     }
+
+    public Conference getConference() {
+        return conference;
+    }
+
+    public void setConference(Conference conference) {
+        this.conference = conference;
+    }
 }
diff --git a/src/main/java/ru/ulstu/timeline/model/EventDto.java b/src/main/java/ru/ulstu/timeline/model/EventDto.java
index 6a4a90b..1d2a29a 100644
--- a/src/main/java/ru/ulstu/timeline/model/EventDto.java
+++ b/src/main/java/ru/ulstu/timeline/model/EventDto.java
@@ -3,6 +3,7 @@ package ru.ulstu.timeline.model;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.hibernate.validator.constraints.NotBlank;
+import ru.ulstu.conference.model.ConferenceDto;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.user.model.UserDto;
 
@@ -25,6 +26,7 @@ public class EventDto {
     private final String description;
     private final List<UserDto> recipients;
     private PaperDto paperDto;
+    private ConferenceDto conferenceDto;
 
     @JsonCreator
     public EventDto(@JsonProperty("id") Integer id,
@@ -36,7 +38,8 @@ public class EventDto {
                     @JsonProperty("updateDate") Date updateDate,
                     @JsonProperty("description") String description,
                     @JsonProperty("paperDto") PaperDto paperDto,
-                    @JsonProperty("recipients") List<UserDto> recipients) {
+                    @JsonProperty("recipients") List<UserDto> recipients,
+                    @JsonProperty("paperDto") ConferenceDto conferenceDto) {
         this.id = id;
         this.title = title;
         this.period = period;
@@ -47,6 +50,7 @@ public class EventDto {
         this.description = description;
         this.recipients = recipients;
         this.paperDto = paperDto;
+        this.conferenceDto = conferenceDto;
     }
 
     public EventDto(Event event) {
@@ -60,6 +64,7 @@ public class EventDto {
         this.description = event.getDescription();
         this.paperDto = new PaperDto(event.getPaper());
         this.recipients = convert(event.getRecipients(), UserDto::new);
+        this.conferenceDto = new ConferenceDto(event.getConference());
     }
 
     public Integer getId() {
@@ -105,4 +110,12 @@ public class EventDto {
     public void setPaperDto(PaperDto paperDto) {
         this.paperDto = paperDto;
     }
+
+    public ConferenceDto getConferenceDto() {
+        return conferenceDto;
+    }
+
+    public void setConferenceDto(ConferenceDto conferenceDto) {
+        this.conferenceDto = conferenceDto;
+    }
 }
diff --git a/src/main/java/ru/ulstu/timeline/repository/EventRepository.java b/src/main/java/ru/ulstu/timeline/repository/EventRepository.java
index eb5c08b..a4b1e47 100644
--- a/src/main/java/ru/ulstu/timeline/repository/EventRepository.java
+++ b/src/main/java/ru/ulstu/timeline/repository/EventRepository.java
@@ -2,6 +2,7 @@ package ru.ulstu.timeline.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import ru.ulstu.conference.model.Conference;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.timeline.model.Event;
 
@@ -15,4 +16,6 @@ public interface EventRepository extends JpaRepository<Event, Integer> {
     List<Event> findAllFuture();
 
     List<Event> findAllByPaper(Paper paper);
+
+    List<Event> findAllByConference(Conference conference);
 }
diff --git a/src/main/java/ru/ulstu/timeline/service/EventService.java b/src/main/java/ru/ulstu/timeline/service/EventService.java
index d0e50a9..f4e2873 100644
--- a/src/main/java/ru/ulstu/timeline/service/EventService.java
+++ b/src/main/java/ru/ulstu/timeline/service/EventService.java
@@ -151,18 +151,23 @@ public class EventService {
                 .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
                 .collect(Collectors.toList())) {
             Event newEvent = new Event();
-            newEvent.setTitle("Дедлайн статьи");
+            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.setConference(newConference);
+            newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' конференции '" + newConference.getTitle() + "'");
+            newConference.getUsers().forEach(conferenceUser -> newEvent.getRecipients().add(conferenceUser.getUser()));
+            newEvent.setConference(newConference);
             eventRepository.save(newEvent);
 
             timeline.getEvents().add(newEvent);
             timelineService.save(timeline);
         }
     }
+
+    public void updateConferenceDeadlines(Conference conference) {
+        eventRepository.delete(eventRepository.findAllByConference(conference));
+        createFromConference(conference);
+    }
 }

From 39f3c6947925f9999e2d58ec16ff1e698b971f6c Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Fri, 26 Apr 2019 15:16:04 +0400
Subject: [PATCH 07/37] #117 add scopus papers filter

---
 .../ru/ulstu/grant/service/GrantService.java  | 34 +++++++++++++++----
 .../ru/ulstu/paper/service/PaperService.java  |  4 +--
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index ba6e1e9..dbf9972 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -20,6 +20,7 @@ import ru.ulstu.user.service.UserService;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -162,10 +163,15 @@ public class GrantService {
         if (grantDto.isHasBAKPapers()) {
             filteredUsers = filteredUsers
                     .stream()
-                    .filter(getCompletedBAKPapersAuthors()::contains)
+                    .filter(getBAKAuthors()::contains)
+                    .collect(toList());
+        }
+        if (grantDto.isHasScopusPapers()) {
+            filteredUsers = filteredUsers
+                    .stream()
+                    .filter(getScopusAuthors()::contains)
                     .collect(toList());
         }
-
         return filteredUsers;
     }
 
@@ -201,22 +207,36 @@ public class GrantService {
         grantDto.getDeadlines().remove((int) deadlineId);
     }
 
-    private List<User> getCompletedBAKPapersAuthors() {
-        List<Paper> papers = paperService.findCompletedVAKPapers()
-                .stream()
+    private List<User> getCompletedPapersAuthors(Paper.PaperType type) {
+        List<Paper> papers = paperService.findAllCompletedByType(type);
+        papers.stream()
                 .filter(paper -> paper.getAuthors() != null)
                 .collect(toList());
-
         List<User> users = new ArrayList<>();
         for (Paper p : papers) {
             p.getAuthors()
                     .stream()
                     .forEach(users::add);
         }
+        return users;
+    }
 
-        return users
+    private List<User> getBAKAuthors() {
+        return getCompletedPapersAuthors(Paper.PaperType.VAK)
                 .stream()
                 .distinct()
                 .collect(toList());
     }
+
+    private List<User> getScopusAuthors() {
+        List<User> oldAuthors = getCompletedPapersAuthors(Paper.PaperType.SCOPUS);
+        List<User> newAuthors = new ArrayList<>();
+        oldAuthors.forEach(author -> {
+            int count = Collections.frequency(oldAuthors, author);
+            if (count > 3) {
+                newAuthors.add(author);
+            }
+        });
+        return newAuthors;
+    }
 }
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index 648dbc9..ae9056b 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -273,8 +273,8 @@ public class PaperService {
                 .collect(Collectors.joining(", "));
     }
 
-    public List<Paper> findCompletedVAKPapers() {
-        return paperRepository.findByType(Paper.PaperType.VAK)
+    public List<Paper> findAllCompletedByType(Paper.PaperType type) {
+        return paperRepository.findByType(type)
                 .stream()
                 .filter(findAllCompleted()::contains)
                 .collect(toList());

From e178cd163909119693001cf225a96dc8eee71bc3 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Sat, 27 Apr 2019 09:45:47 +0400
Subject: [PATCH 08/37] #70 added checking empty fields of deadline, fix bug on
 EventDto

---
 .../ulstu/conference/controller/ConferenceController.java | 6 ++++++
 src/main/java/ru/ulstu/timeline/model/EventDto.java       | 8 ++++++--
 src/main/resources/templates/conferences/conference.html  | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
index 4c5ea91..d324eb4 100644
--- a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
+++ b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
@@ -78,6 +78,12 @@ public class ConferenceController {
     @PostMapping(value = "/conference", params = "save")
     public String save(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
         filterEmptyDeadlines(conferenceDto);
+        for (Deadline deadline : conferenceDto.getDeadlines()) {
+            if (deadline.getDate() == null || deadline.getDescription().isEmpty()) {
+                errors.rejectValue("deadlines", "errorCode", "Все поля дедлайна должны быть заполнены");
+                return CONFERENCE_PAGE;
+            }
+        }
         if (errors.hasErrors()) {
             return CONFERENCE_PAGE;
         }
diff --git a/src/main/java/ru/ulstu/timeline/model/EventDto.java b/src/main/java/ru/ulstu/timeline/model/EventDto.java
index 1d2a29a..e92d2cb 100644
--- a/src/main/java/ru/ulstu/timeline/model/EventDto.java
+++ b/src/main/java/ru/ulstu/timeline/model/EventDto.java
@@ -62,9 +62,13 @@ public class EventDto {
         this.createDate = event.getCreateDate();
         this.updateDate = event.getUpdateDate();
         this.description = event.getDescription();
-        this.paperDto = new PaperDto(event.getPaper());
         this.recipients = convert(event.getRecipients(), UserDto::new);
-        this.conferenceDto = new ConferenceDto(event.getConference());
+        if (paperDto != null) {
+            this.paperDto = new PaperDto(event.getPaper());
+        }
+        if (conferenceDto != null) {
+            this.conferenceDto = new ConferenceDto(event.getConference());
+        }
     }
 
     public Integer getId() {
diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index 69c754a..d5906b6 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -150,10 +150,10 @@
                                             </a>
                                             <a class="paper-name"
                                                th:unless="*{papers[__${rowStat.index}__].id !=null}">
+                                                <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status})"/>
                                                 <span th:text="*{papers[__${rowStat.index}__].title}">
                                                     Имя статьи
                                                 </span>
-                                                <img class="icon-paper" src="/img/conference/paper.png"/>
                                             </a>
                                             <input type="submit" class="icon icon-delete grey-border"
                                                    alt="Удалить" name="removePaper" th:value="${rowStat.index}"/>

From 0e8752e4607dbf4b2561668b8e657be57df37495 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Sat, 27 Apr 2019 20:34:49 +0400
Subject: [PATCH 09/37] #70 style fixes

---
 .../java/ru/ulstu/timeline/model/EventDto.java |  2 +-
 src/main/resources/public/css/conference.css   | 18 ++++++++++++++++--
 .../fragments/confLineFragment.html            |  6 +-----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/java/ru/ulstu/timeline/model/EventDto.java b/src/main/java/ru/ulstu/timeline/model/EventDto.java
index e92d2cb..ccce25a 100644
--- a/src/main/java/ru/ulstu/timeline/model/EventDto.java
+++ b/src/main/java/ru/ulstu/timeline/model/EventDto.java
@@ -39,7 +39,7 @@ public class EventDto {
                     @JsonProperty("description") String description,
                     @JsonProperty("paperDto") PaperDto paperDto,
                     @JsonProperty("recipients") List<UserDto> recipients,
-                    @JsonProperty("paperDto") ConferenceDto conferenceDto) {
+                    @JsonProperty("conferenceDto") ConferenceDto conferenceDto) {
         this.id = id;
         this.title = title;
         this.period = period;
diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css
index 6018b9c..73a96ae 100644
--- a/src/main/resources/public/css/conference.css
+++ b/src/main/resources/public/css/conference.css
@@ -7,6 +7,10 @@ body {
     border-radius: .25rem;
 }
 
+.conference-row .d-flex:hover .icon-delete {
+    visibility: visible;
+}
+
 .filter-option-inner-inner {
     color: white;
 }
@@ -17,10 +21,20 @@ body {
 
 .conference-row .d-flex .text-decoration {
     text-decoration: none;
+    margin: 0;
 }
 
 .conference-row .d-flex .text-decoration:nth-child(1) {
-    margin-left: 10px;
+    margin-left: 5px;
+}
+
+.conference-row .d-flex .icon-delete {
+    width: 29px;
+    height: 29px;
+    margin: auto;
+    border: none;
+    visibility: hidden;
+    background-color: transparent;
 }
 
 
@@ -159,7 +173,7 @@ body {
 }
 
 .icon-delete:hover {
-    background-color: #ff0000;
+    background-color: #ff0000 !important;
     transition: background-color .15s ease-in-out;
 }
 
diff --git a/src/main/resources/templates/conferences/fragments/confLineFragment.html b/src/main/resources/templates/conferences/fragments/confLineFragment.html
index ecd166d..21b4191 100644
--- a/src/main/resources/templates/conferences/fragments/confLineFragment.html
+++ b/src/main/resources/templates/conferences/fragments/confLineFragment.html
@@ -7,17 +7,13 @@
 <div th:fragment="confLine (conference)" class="row text-left conference-row h3" style="background-color: white;">
     <div class="d-flex justify-content-between w-100">
         <a th:href="@{'conference?id='+${conference.id}}" class="w-100 text-decoration">
-            <span class="h5" th:text="${conference.title}"/>
+            <span class="h6 float-left m-2" th:text="${conference.title}"/>
             <span class="text-muted h6 float-right m-2" th:text="${conference.datesString}"/>
         </a>
         <input class="id-class" type="hidden" th:value="${conference.id}"/>
         <input type="submit" class="icon icon-delete grey-border"
                alt="Удалить" th:value="${conference.id}"
                data-confirm="Удалить конференцию?"/>
-        <!--<a class="remove-paper pull-right m-auto" th:href="@{'/conferences/delete/'+${conference.id}}"-->
-        <!--data-confirm="Удалить конференцию?">-->
-        <!--<i class="fa fa-trash" aria-hidden="true"></i>-->
-        <!--</a>-->
     </div>
 </div>
 

From 5c677a975c29d024a326b459e093440b6e88268c 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, 30 Apr 2019 01:01:30 +0300
Subject: [PATCH 10/37] #114 changelog edited

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

diff --git a/src/main/resources/db/changelog-20190428_000000-schema.xml b/src/main/resources/db/changelog-20190428_000000-schema.xml
new file mode 100644
index 0000000..b44691d
--- /dev/null
+++ b/src/main/resources/db/changelog-20190428_000000-schema.xml
@@ -0,0 +1,10 @@
+<?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="20190428_000000-1">
+        <update tableName="project">
+            <column name="status" value="APPLICATION"/>
+        </update>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 68b294a..07b0ca2 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -34,4 +34,5 @@
     <include file="db/changelog-20190421_000000-schema.xml"/>
     <include file="db/changelog-20190422_000000-schema.xml"/>
     <include file="db/changelog-20190424_000000-schema.xml"/>
+    <include file="db/changelog-20190428_000000-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file

From 9edcf353389d453389dcc5e897564a822fb2cbb5 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Tue, 30 Apr 2019 10:43:36 +0400
Subject: [PATCH 11/37] #70 added ping notification

---
 .../ConferenceNotificationService.java        | 34 +++++++++++++++++--
 .../service/ConferenceScheduler.java          |  9 ++++-
 .../ulstu/ping/repository/PingRepository.java |  6 ++++
 .../ru/ulstu/ping/service/PingService.java    |  8 +++++
 .../conferencePingNotification.html           | 25 ++++++++++++++
 5 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/mail_templates/conferencePingNotification.html

diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java b/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
index 54faa49..9449b12 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
@@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableMap;
 import org.springframework.stereotype.Service;
 import ru.ulstu.conference.model.Conference;
 import ru.ulstu.core.util.DateUtils;
+import ru.ulstu.ping.service.PingService;
 import ru.ulstu.user.service.MailService;
 import ru.ulstu.user.service.UserService;
 
@@ -14,24 +15,30 @@ import java.util.Map;
 @Service
 public class ConferenceNotificationService {
 
+    private final static int YESTERDAY = 0;
     private final static int DAYS_TO_DEADLINE_NOTIFICATION = 7;
+    private final static String TEMPLATE_PING = "conferencePingNotification";
     private final static String TEMPLATE_DEADLINE = "conferenceDeadlineNotification";
     private final static String TEMPLATE_CREATE = "conferenceCreateNotification";
     private final static String TEMPLATE_UPDATE_DEADLINES = "conferenceUpdateDeadlinesNotification";
     private final static String TEMPLATE_UPDATE_DATES = "conferenceUpdateDatesNotification";
 
-    private final static String TITLE_DEADLINE = "Приближается дедлайн конференции";
+    private final static String TITLE_PING = "Обратите внимание на конференцию: %s";
+    private final static String TITLE_DEADLINE = "Приближается дедлайн конференции: %s";
     private final static String TITLE_CREATE = "Создана новая конференция: %s";
     private final static String TITLE_UPDATE_DEADLINES = "Изменения дедлайнов в конференции: %s";
     private final static String TITLE_UPDATE_DATES = "Изменение дат проведения конференции: %s";
 
     private final MailService mailService;
     private final UserService userService;
+    private final PingService pingService;
 
     public ConferenceNotificationService(MailService mailService,
-                                         UserService userService) {
+                                         UserService userService,
+                                         PingService pingService) {
         this.mailService = mailService;
         this.userService = userService;
+        this.pingService = pingService;
     }
 
     public void sendDeadlineNotifications(List<Conference> conferences, boolean isDeadlineBeforeWeek) {
@@ -78,4 +85,27 @@ public class ConferenceNotificationService {
     }
 
 
+    public void sendPingNotifications(List<Conference> conferences) {
+        Date yesterday = DateUtils.addDays(new Date(), YESTERDAY);
+        conferences
+                .stream()
+                .filter(conference -> {
+                    Integer pingCount = pingService.countPingYesterday(conference, yesterday);
+                    return needToSendPingNotification(conference, pingCount);
+                })
+                .forEach(this::sendMessagePing);
+    }
+
+    private boolean needToSendPingNotification(Conference conference, Integer pingCount) {
+        if (pingCount > 0) {
+            conference.setPing((Integer) pingCount);
+            return true;
+        }
+        return false;
+    }
+
+    private void sendMessagePing(Conference conference) {
+        Map<String, Object> variables = ImmutableMap.of("conference", conference);
+        sendForAllParticipals(variables, conference, TEMPLATE_PING, String.format(TITLE_PING, conference.getTitle()));
+    }
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java b/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java
index 863abb5..f55f885 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java
@@ -21,7 +21,7 @@ public class ConferenceScheduler {
     }
 
 
-    @Scheduled(cron = "0 0 8 * * *", zone = "Europe/Samara")
+    @Scheduled(cron = "0 0 8 * * MON", zone = "Europe/Samara")
     public void checkDeadlineBeforeWeek() {
         log.debug("ConferenceScheduler.checkDeadlineBeforeWeek started");
         conferenceNotificationService.sendDeadlineNotifications(conferenceService.findAll(), IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
@@ -34,4 +34,11 @@ public class ConferenceScheduler {
         conferenceNotificationService.sendDeadlineNotifications(conferenceService.findAll(), !IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
         log.debug("ConferenceScheduler.checkDeadlineAfterWeek finished");
     }
+
+    @Scheduled(cron = "0 0 8 * * *", zone = "Europe/Samara")
+    public void checkNewPing() {
+        log.debug("ConferenceScheduler.checkPing started");
+        conferenceNotificationService.sendPingNotifications(conferenceService.findAll());
+        log.debug("ConferenceScheduler.checkPing finished");
+    }
 }
diff --git a/src/main/java/ru/ulstu/ping/repository/PingRepository.java b/src/main/java/ru/ulstu/ping/repository/PingRepository.java
index ebafc0c..8e69111 100644
--- a/src/main/java/ru/ulstu/ping/repository/PingRepository.java
+++ b/src/main/java/ru/ulstu/ping/repository/PingRepository.java
@@ -1,7 +1,13 @@
 package ru.ulstu.ping.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.conference.model.Conference;
 import ru.ulstu.ping.model.Ping;
 
 public interface PingRepository extends JpaRepository<Ping, Integer> {
+
+    @Query("SELECT count(*) FROM Ping p WHERE (DAY(p.date) = :day) AND (MONTH(p.date) = :month) AND (p.conference = :conference)")
+    long countByConferenceAndDate(@Param("conference") Conference conference, @Param("day") Integer day, @Param("month") Integer month);
 }
diff --git a/src/main/java/ru/ulstu/ping/service/PingService.java b/src/main/java/ru/ulstu/ping/service/PingService.java
index ff0d249..3152e5a 100644
--- a/src/main/java/ru/ulstu/ping/service/PingService.java
+++ b/src/main/java/ru/ulstu/ping/service/PingService.java
@@ -8,6 +8,7 @@ import ru.ulstu.ping.repository.PingRepository;
 import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
+import java.util.Calendar;
 import java.util.Date;
 
 @Service
@@ -27,4 +28,11 @@ public class PingService {
         newPing.setConference(conference);
         pingRepository.save(newPing);
     }
+
+    public Integer countPingYesterday(Conference conference, Date yesterday) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(yesterday);
+
+        return Math.toIntExact(pingRepository.countByConferenceAndDate(conference, cal.get(Calendar.DAY_OF_MONTH), cal.get(Calendar.MONTH) + 1));
+    }
 }
diff --git a/src/main/resources/mail_templates/conferencePingNotification.html b/src/main/resources/mail_templates/conferencePingNotification.html
new file mode 100644
index 0000000..a80a3f2
--- /dev/null
+++ b/src/main/resources/mail_templates/conferencePingNotification.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <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>
+    Уважаемый(ая) <span th:text="${user.firstName + ' ' + user.lastName}">Ivan Ivanov</span>
+</p>
+<p>
+    Конференция "<a th:href="@{|${baseUrl}/conferences/conference?id=${conference.id}|}">
+    <span th:text="${conference.title}">Title</span></a>" была пропингована
+    <b><span th:text="${conference.ping}"></span></b> раз.
+    <br/>
+    Обратите внимание.
+</p>
+<p>
+    Regards,
+    <br/>
+    <em>NG-tracker.</em>
+</p>
+</body>
+</html>
\ No newline at end of file

From 0e062f133707716faa6843f73164f415adf8d34e Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Tue, 30 Apr 2019 11:41:36 +0400
Subject: [PATCH 12/37] #70 fast fix

---
 src/main/java/ru/ulstu/ping/repository/PingRepository.java | 4 ++--
 src/main/java/ru/ulstu/ping/service/PingService.java       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/ulstu/ping/repository/PingRepository.java b/src/main/java/ru/ulstu/ping/repository/PingRepository.java
index 8e69111..de79dd7 100644
--- a/src/main/java/ru/ulstu/ping/repository/PingRepository.java
+++ b/src/main/java/ru/ulstu/ping/repository/PingRepository.java
@@ -8,6 +8,6 @@ import ru.ulstu.ping.model.Ping;
 
 public interface PingRepository extends JpaRepository<Ping, Integer> {
 
-    @Query("SELECT count(*) FROM Ping p WHERE (DAY(p.date) = :day) AND (MONTH(p.date) = :month) AND (p.conference = :conference)")
-    long countByConferenceAndDate(@Param("conference") Conference conference, @Param("day") Integer day, @Param("month") Integer month);
+    @Query("SELECT count(*) FROM Ping p WHERE (DAY(p.date) = :day) AND (MONTH(p.date) = :month) AND (YEAR(p.date) = :year) AND (p.conference = :conference)")
+    long countByConferenceAndDate(@Param("conference") Conference conference, @Param("day") Integer day, @Param("month") Integer month, @Param("year") Integer year);
 }
diff --git a/src/main/java/ru/ulstu/ping/service/PingService.java b/src/main/java/ru/ulstu/ping/service/PingService.java
index 3152e5a..f24ed9d 100644
--- a/src/main/java/ru/ulstu/ping/service/PingService.java
+++ b/src/main/java/ru/ulstu/ping/service/PingService.java
@@ -33,6 +33,7 @@ public class PingService {
         Calendar cal = Calendar.getInstance();
         cal.setTime(yesterday);
 
-        return Math.toIntExact(pingRepository.countByConferenceAndDate(conference, cal.get(Calendar.DAY_OF_MONTH), cal.get(Calendar.MONTH) + 1));
+        return Math.toIntExact(pingRepository.countByConferenceAndDate(conference, cal.get(Calendar.DAY_OF_MONTH),
+                cal.get(Calendar.MONTH) + 1, cal.get(Calendar.YEAR)));
     }
 }

From 2ebd61016d1b6ea4216726aa2f57f0abd81c1edd Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Tue, 30 Apr 2019 23:40:40 +0400
Subject: [PATCH 13/37] #38 add variable "files"

---
 src/main/java/ru/ulstu/grant/model/Grant.java | 19 ++++++++------
 .../java/ru/ulstu/grant/model/GrantDto.java   | 25 ++++++++++--------
 .../ru/ulstu/grant/service/GrantService.java  | 26 +++++++++----------
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/model/Grant.java b/src/main/java/ru/ulstu/grant/model/Grant.java
index abd61ac..d6f9f0c 100644
--- a/src/main/java/ru/ulstu/grant/model/Grant.java
+++ b/src/main/java/ru/ulstu/grant/model/Grant.java
@@ -1,5 +1,7 @@
 package ru.ulstu.grant.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;
@@ -66,10 +68,11 @@ public class Grant extends BaseEntity implements UserContainer {
 
     private String comment;
 
-    //Заявка на грант
-    @ManyToOne
-    @JoinColumn(name = "file_id")
-    private FileData application;
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @JoinColumn(name = "grant_id", unique = true)
+    @Fetch(FetchMode.SUBSELECT)
+    private List<FileData> files = new ArrayList<>();
+
 
     @ManyToOne(cascade = CascadeType.ALL)
     @JoinColumn(name = "project_id")
@@ -113,12 +116,12 @@ public class Grant extends BaseEntity implements UserContainer {
         this.comment = comment;
     }
 
-    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 String getTitle() {
diff --git a/src/main/java/ru/ulstu/grant/model/GrantDto.java b/src/main/java/ru/ulstu/grant/model/GrantDto.java
index 3fb77c5..6866f41 100644
--- a/src/main/java/ru/ulstu/grant/model/GrantDto.java
+++ b/src/main/java/ru/ulstu/grant/model/GrantDto.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 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.paper.model.Paper;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.user.model.UserDto;
@@ -25,7 +26,7 @@ public class GrantDto {
     private Grant.GrantStatus status;
     private List<Deadline> deadlines = new ArrayList<>();
     private String comment;
-    private String applicationFileName;
+    private List<FileDataDto> files = new ArrayList<>();
     private ProjectDto project;
     private Set<Integer> authorIds;
     private Set<UserDto> authors;
@@ -47,6 +48,7 @@ public class GrantDto {
                     @JsonProperty("status") Grant.GrantStatus status,
                     @JsonProperty("deadlines") List<Deadline> deadlines,
                     @JsonProperty("comment") String comment,
+                    @JsonProperty("files") List<FileDataDto> files,
                     @JsonProperty("project") ProjectDto project,
                     @JsonProperty("authorIds") Set<Integer> authorIds,
                     @JsonProperty("authors") Set<UserDto> authors,
@@ -61,8 +63,9 @@ public class GrantDto {
         this.status = status;
         this.deadlines = deadlines;
         this.comment = comment;
-        this.applicationFileName = null;
+        this.files = files;
         this.project = project;
+        this.authorIds = authorIds;
         this.authors = authors;
         this.leaderId = leaderId;
         this.wasLeader = wasLeader;
@@ -78,8 +81,8 @@ public class GrantDto {
         this.status = grant.getStatus();
         this.deadlines = grant.getDeadlines();
         this.comment = grant.getComment();
+        this.files = convert(grant.getFiles(), FileDataDto::new);
         this.project = grant.getProject() == null ? null : new ProjectDto(grant.getProject());
-        this.applicationFileName = grant.getApplication() == null ? null : grant.getApplication().getName();
         this.authorIds = convert(grant.getAuthors(), user -> user.getId());
         this.authors = convert(grant.getAuthors(), UserDto::new);
         this.leaderId = grant.getLeader().getId();
@@ -130,20 +133,20 @@ public class GrantDto {
         this.comment = comment;
     }
 
-    public ProjectDto getProject() {
-        return project;
+    public List<FileDataDto> getFiles() {
+        return files;
     }
 
-    public void setProject(ProjectDto project) {
-        this.project = project;
+    public void setFiles(List<FileDataDto> files) {
+        this.files = files;
     }
 
-    public String getApplicationFileName() {
-        return applicationFileName;
+    public ProjectDto getProject() {
+        return project;
     }
 
-    public void setApplicationFileName(String applicationFileName) {
-        this.applicationFileName = applicationFileName;
+    public void setProject(ProjectDto project) {
+        this.project = project;
     }
 
     public Set<Integer> getAuthorIds() {
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index cabed80..0c1d68e 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -5,6 +5,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 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.grant.model.Grant;
 import ru.ulstu.grant.model.GrantDto;
@@ -21,8 +22,8 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
+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.grant.model.Grant.GrantStatus.APPLICATION;
@@ -81,9 +82,10 @@ public class GrantService {
             grant.setProject(projectService.findById(grantDto.getProject().getId()));
         }
         grant.setDeadlines(deadlineService.saveOrCreate(grantDto.getDeadlines()));
-        if (grantDto.getApplicationFileName() != null) {
-            grant.setApplication(fileService.createFileFromTmp(grantDto.getApplicationFileName()));
-        }
+
+        grant.setFiles(fileService.saveOrCreate(grantDto.getFiles().stream()
+                .filter(f -> !f.isDeleted())
+                .collect(toList())));
         grant.getAuthors().clear();
         if (grantDto.getAuthorIds() != null && !grantDto.getAuthorIds().isEmpty()) {
             grantDto.getAuthorIds().forEach(authorIds -> grant.getAuthors().add(userService.findById(authorIds)));
@@ -106,8 +108,11 @@ public class GrantService {
     @Transactional
     public Integer update(GrantDto grantDto) throws IOException {
         Grant grant = grantRepository.findOne(grantDto.getId());
-        if (grantDto.getApplicationFileName() != null && grant.getApplication() != null) {
-            fileService.deleteFile(grant.getApplication());
+
+        for (FileDataDto file : grantDto.getFiles().stream()
+                .filter(f -> f.isDeleted() && f.getId() != null)
+                .collect(toList())) {
+            fileService.delete(file.getId());
         }
         grantDto.getRemovedDeadlineIds().forEach(deadlineService::remove);
         grantRepository.save(copyFromDto(grant, grantDto));
@@ -117,9 +122,6 @@ public class GrantService {
     @Transactional
     public void delete(Integer grantId) throws IOException {
         Grant grant = grantRepository.findOne(grantId);
-        if (grant.getApplication() != null) {
-            fileService.deleteFile(grant.getApplication());
-        }
         grantRepository.delete(grant);
     }
 
@@ -156,7 +158,7 @@ public class GrantService {
             filteredUsers = filteredUsers
                     .stream()
                     .filter(getCompletedGrantLeaders()::contains)
-                    .collect(Collectors.toList());
+                    .collect(toList());
         }
         return filteredUsers;
     }
@@ -165,12 +167,11 @@ public class GrantService {
         return grantRepository.findByStatus(Grant.GrantStatus.COMPLETED)
                 .stream()
                 .map(Grant::getLeader)
-                .collect(Collectors.toList());
+                .collect(toList());
     }
 
     public List<Paper> getGrantPapers(List<Integer> paperIds) {
         return paperService.findAllSelect(paperIds);
-
     }
 
     public List<Paper> getAllPapers() {
@@ -192,5 +193,4 @@ public class GrantService {
         }
         grantDto.getDeadlines().remove((int) deadlineId);
     }
-
 }

From 6442a67ff108ca538aeb742f09002478e9df6b15 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Tue, 30 Apr 2019 23:41:51 +0400
Subject: [PATCH 14/37] #38 update view

---
 .../fragments/grantFilesListFragment.html     |  37 ++++++
 .../resources/templates/grants/grant.html     | 111 ++++++++++++++----
 2 files changed, 125 insertions(+), 23 deletions(-)
 create mode 100644 src/main/resources/templates/grants/fragments/grantFilesListFragment.html

diff --git a/src/main/resources/templates/grants/fragments/grantFilesListFragment.html b/src/main/resources/templates/grants/fragments/grantFilesListFragment.html
new file mode 100644
index 0000000..2547c80
--- /dev/null
+++ b/src/main/resources/templates/grants/fragments/grantFilesListFragment.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8"/>
+</head>
+<body>
+<div th:fragment="filesList (isLatexAttach)" th:remove="tag">
+    <th:block th:each="file, rowStat : *{files}">
+        <span th:if="${(!isLatexAttach and file.isLatexAttach == null) or file.isLatexAttach == isLatexAttach}"
+              th:remove="tag">
+            <div class="row div-row-file" 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-10 div-file-name">
+                    <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 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>
+        </span>
+    </th:block>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/grants/grant.html b/src/main/resources/templates/grants/grant.html
index 9c0736d..d33015c 100644
--- a/src/main/resources/templates/grants/grant.html
+++ b/src/main/resources/templates/grants/grant.html
@@ -61,7 +61,7 @@
                                         </div>
                                         <div class="col-2">
                                             <button type="submit"
-                                                    class="btn btn-danger float-right btn-delete-deadline "
+                                                    class="btn btn-danger float-right btn-delete-deadline"
                                                     id="removeDeadline" name="removeDeadline"
                                                     th:value="${rowStat.index}">
                                                 <span aria-hidden="true">
@@ -77,12 +77,14 @@
                                     <input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"
                                            value="Добавить дедлайн"/>
                                 </div>
-                                <div class="form-group">
-                                    <label for="loader">Загрузить заявку:</label>
+                                <div class="form-group div-loader">
+                                    <label for="loader">Загрузить файлы:</label>
                                     <div id="loader">
-
                                     </div>
                                 </div>
+                                <div class="form-group" id="files-list">
+                                    <div th:replace="grants/fragments/grantFilesListFragment :: filesList(isLatexAttach = ${false})"/>
+                                </div>
                             </div>
                             <div class="col-md-6 col-sm-12">
                                 <label data-toggle="collapse"
@@ -233,20 +235,100 @@
             new FileLoader({
                 div: "loader",
                 url: urlFileUpload,
-                maxSize: 1.5,
-                extensions: ["doc", "docx", "xls", "jpg", "pdf", "txt", "png"],
+                maxSize: -1,
+                extensions: [],
                 callback: function (response) {
                     showFeedbackMessage("Файл успешно загружен");
                     console.debug(response);
+                    addNewFile(response);
                 }
             });
             $('.selectpicker').selectpicker();
         });
         /*]]>*/
+        function addNewFile(fileDto) {
+            var fileNumber = $("#files-list div.row").length;
+
+            var newFileRow = $("<div/>")
+                .attr("id", 'files' + fileNumber)
+                .addClass("row div-row-file");
+
+            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 nameDiv = $("<div/>")
+                .addClass("col-10  div-file-name")
+                .append($("<a/>").text(fileDto.fileName)
+                    .attr("href", 'javascript:void(0)')
+                    .attr("onclick", "downloadFile('" + fileDto.tmpFileName + "',null,'" + fileDto.fileName + "')"));
+            newFileRow.append(nameDiv);
+
+            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);
+            $("#files-list").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>
     <script type="text/javascript">
         function updateAuthors() {
@@ -256,23 +338,6 @@
             var lid = $("#leaderId option:selected").val();
             $("#authors [value='" + lid + "']").attr("disabled", "disabled");
         }
-
-    </script>
-
-    <script>
-    function viewdiv(id) {
-        var el = document.getElementById(id);
-        var link = document.getElementById('toggleLink');
-        if (el.style.display == "block") {
-            el.style.display = "none";
-            link.innerText = link.getAttribute('data-text-hide');
-        } else {
-            el.style.display = "block";
-            link.innerText = link.getAttribute('data-text-show');
-        }
-    }
-
-
     </script>
 </div>
 </body>

From a69a257f09f4caf74e8ea10eef83578ad6cad961 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Tue, 30 Apr 2019 23:43:47 +0400
Subject: [PATCH 15/37] #38 add styles

---
 src/main/resources/public/css/grant.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/resources/public/css/grant.css b/src/main/resources/public/css/grant.css
index 3c0cfc8..2e6349d 100644
--- a/src/main/resources/public/css/grant.css
+++ b/src/main/resources/public/css/grant.css
@@ -28,4 +28,16 @@
 
 .btn-delete-deadline {
     color: black;
+}
+
+.div-file-name{
+    padding-top: 6px;
+}
+
+.div-loader {
+    margin-bottom: 5px;
+}
+
+.div-row-file {
+    margin-bottom: 2px;
 }
\ No newline at end of file

From 1f6d15b74b64aacb7837a1aed1575bf181f67cd0 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Tue, 30 Apr 2019 23:55:31 +0400
Subject: [PATCH 16/37] #38 create changelogs

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

diff --git a/src/main/resources/db/changelog-20190430_000000-schema.xml b/src/main/resources/db/changelog-20190430_000000-schema.xml
new file mode 100644
index 0000000..58a3bc5
--- /dev/null
+++ b/src/main/resources/db/changelog-20190430_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="tanya" id="20190430_000000-1">
+        <dropColumn columnName="file_id" tableName="grants"/>
+        <addColumn tableName="file">
+            <column name="grant_id" type="integer"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 68b294a..42d33d7 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -34,4 +34,5 @@
     <include file="db/changelog-20190421_000000-schema.xml"/>
     <include file="db/changelog-20190422_000000-schema.xml"/>
     <include file="db/changelog-20190424_000000-schema.xml"/>
+    <include file="db/changelog-20190430_000000-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file

From 60bdd9d233292b7f778b271d10cfa95b1fb70ddf Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Thu, 2 May 2019 14:35:40 +0400
Subject: [PATCH 17/37] #70 fixes

---
 .../controller/ConferenceController.java      | 21 ++------
 .../ConferenceNotificationService.java        | 30 ++++++-----
 .../service/ConferenceScheduler.java          |  9 +---
 .../conference/service/ConferenceService.java | 54 +++++++++++--------
 .../ru/ulstu/deadline/model/Deadline.java     | 17 ++++++
 .../ru/ulstu/ping/service/PingService.java    |  9 ++--
 .../java/ru/ulstu/timeline/model/Event.java   |  3 +-
 .../ulstu/timeline/service/EventService.java  |  2 +-
 8 files changed, 77 insertions(+), 68 deletions(-)

diff --git a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
index d324eb4..5aecb51 100644
--- a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
+++ b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
@@ -13,7 +13,6 @@ import ru.ulstu.conference.model.ConferenceDto;
 import ru.ulstu.conference.model.ConferenceFilterDto;
 import ru.ulstu.conference.model.ConferenceUser;
 import ru.ulstu.conference.service.ConferenceService;
-import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.user.model.User;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -22,9 +21,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-import java.util.stream.Collectors;
 
-import static org.springframework.util.StringUtils.isEmpty;
 import static ru.ulstu.core.controller.Navigation.CONFERENCES_PAGE;
 import static ru.ulstu.core.controller.Navigation.CONFERENCE_PAGE;
 import static ru.ulstu.core.controller.Navigation.REDIRECT_TO;
@@ -77,13 +74,8 @@ public class ConferenceController {
 
     @PostMapping(value = "/conference", params = "save")
     public String save(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
-        filterEmptyDeadlines(conferenceDto);
-        for (Deadline deadline : conferenceDto.getDeadlines()) {
-            if (deadline.getDate() == null || deadline.getDescription().isEmpty()) {
-                errors.rejectValue("deadlines", "errorCode", "Все поля дедлайна должны быть заполнены");
-                return CONFERENCE_PAGE;
-            }
-        }
+        conferenceService.filterEmptyDeadlines(conferenceDto);
+        conferenceService.checkEmptyFieldsOfDeadline(conferenceDto, errors);
         if (errors.hasErrors()) {
             return CONFERENCE_PAGE;
         }
@@ -93,11 +85,11 @@ public class ConferenceController {
 
     @PostMapping(value = "/conference", params = "addDeadline")
     public String addDeadline(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
-        filterEmptyDeadlines(conferenceDto);
+        conferenceService.filterEmptyDeadlines(conferenceDto);
         if (errors.hasErrors()) {
             return CONFERENCE_PAGE;
         }
-        conferenceDto.getDeadlines().add(new Deadline());
+        conferenceService.addDeadline(conferenceDto);
         return CONFERENCE_PAGE;
     }
 
@@ -173,9 +165,4 @@ public class ConferenceController {
         return years;
     }
 
-    private void filterEmptyDeadlines(ConferenceDto conferenceDto) {
-        conferenceDto.setDeadlines(conferenceDto.getDeadlines().stream()
-                .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
-                .collect(Collectors.toList()));
-    }
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java b/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
index 9449b12..ddb8130 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java
@@ -8,6 +8,7 @@ import ru.ulstu.ping.service.PingService;
 import ru.ulstu.user.service.MailService;
 import ru.ulstu.user.service.UserService;
 
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -15,7 +16,7 @@ import java.util.Map;
 @Service
 public class ConferenceNotificationService {
 
-    private final static int YESTERDAY = 0;
+    private final static int YESTERDAY = -1;
     private final static int DAYS_TO_DEADLINE_NOTIFICATION = 7;
     private final static String TEMPLATE_PING = "conferencePingNotification";
     private final static String TEMPLATE_DEADLINE = "conferenceDeadlineNotification";
@@ -41,24 +42,23 @@ public class ConferenceNotificationService {
         this.pingService = pingService;
     }
 
-    public void sendDeadlineNotifications(List<Conference> conferences, boolean isDeadlineBeforeWeek) {
+    public void sendDeadlineNotifications(List<Conference> conferences) {
         Date now = DateUtils.addDays(new Date(), DAYS_TO_DEADLINE_NOTIFICATION);
         conferences
                 .stream()
-                .filter(conference -> needToSendDeadlineNotification(conference, now, isDeadlineBeforeWeek))
+                .filter(conference -> needToSendDeadlineNotification(conference, now))
                 .forEach(this::sendMessageDeadline);
     }
 
-    private boolean needToSendDeadlineNotification(Conference conference, Date compareDate, boolean isDeadlineBeforeWeek) {
+    private boolean needToSendDeadlineNotification(Conference conference, Date compareDate) {
         return (conference.getNextDeadline().isPresent())
-                && (compareDate.before(conference.getNextDeadline().get().getDate()) && isDeadlineBeforeWeek
-                || compareDate.after(conference.getNextDeadline().get().getDate()) && !isDeadlineBeforeWeek)
-                && conference.getNextDeadline().get().getDate().after(new Date());
+                && conference.getNextDeadline().get().getDate().after(new Date())
+                && conference.getNextDeadline().get().getDate().before(compareDate);
     }
 
     private void sendMessageDeadline(Conference conference) {
         Map<String, Object> variables = ImmutableMap.of("conference", conference);
-        sendForAllParticipals(variables, conference, TEMPLATE_DEADLINE, TITLE_DEADLINE);
+        sendForAllParticipants(variables, conference, TEMPLATE_DEADLINE, String.format(TITLE_DEADLINE, conference.getTitle()));
     }
 
     public void sendCreateNotification(Conference conference) {
@@ -68,29 +68,31 @@ public class ConferenceNotificationService {
 
     public void updateDeadlineNotification(Conference conference) {
         Map<String, Object> variables = ImmutableMap.of("conference", conference);
-        sendForAllParticipals(variables, conference, TEMPLATE_UPDATE_DEADLINES, String.format(TITLE_UPDATE_DEADLINES, conference.getTitle()));
+        sendForAllParticipants(variables, conference, TEMPLATE_UPDATE_DEADLINES, String.format(TITLE_UPDATE_DEADLINES, conference.getTitle()));
     }
 
     public void updateConferencesDatesNotification(Conference conference, Date oldBeginDate, Date oldEndDate) {
         Map<String, Object> variables = ImmutableMap.of("conference", conference, "oldBeginDate", oldBeginDate, "oldEndDate", oldEndDate);
-        sendForAllParticipals(variables, conference, TEMPLATE_UPDATE_DATES, String.format(TITLE_UPDATE_DATES, conference.getTitle()));
+        sendForAllParticipants(variables, conference, TEMPLATE_UPDATE_DATES, String.format(TITLE_UPDATE_DATES, conference.getTitle()));
     }
 
     private void sendForAllUsers(Map<String, Object> variables, String template, String title) {
         userService.findAll().forEach(user -> mailService.sendEmailFromTemplate(variables, user, template, title));
     }
 
-    private void sendForAllParticipals(Map<String, Object> variables, Conference conference, String template, String title) {
+    private void sendForAllParticipants(Map<String, Object> variables, Conference conference, String template, String title) {
         conference.getUsers().forEach(conferenceUser -> mailService.sendEmailFromTemplate(variables, conferenceUser.getUser(), template, title));
     }
 
 
     public void sendPingNotifications(List<Conference> conferences) {
-        Date yesterday = DateUtils.addDays(new Date(), YESTERDAY);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.add(Calendar.DAY_OF_MONTH, YESTERDAY);
         conferences
                 .stream()
                 .filter(conference -> {
-                    Integer pingCount = pingService.countPingYesterday(conference, yesterday);
+                    Integer pingCount = pingService.countPingYesterday(conference, calendar);
                     return needToSendPingNotification(conference, pingCount);
                 })
                 .forEach(this::sendMessagePing);
@@ -106,6 +108,6 @@ public class ConferenceNotificationService {
 
     private void sendMessagePing(Conference conference) {
         Map<String, Object> variables = ImmutableMap.of("conference", conference);
-        sendForAllParticipals(variables, conference, TEMPLATE_PING, String.format(TITLE_PING, conference.getTitle()));
+        sendForAllParticipants(variables, conference, TEMPLATE_PING, String.format(TITLE_PING, conference.getTitle()));
     }
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java b/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java
index f55f885..6f8fe90 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceScheduler.java
@@ -24,17 +24,10 @@ public class ConferenceScheduler {
     @Scheduled(cron = "0 0 8 * * MON", zone = "Europe/Samara")
     public void checkDeadlineBeforeWeek() {
         log.debug("ConferenceScheduler.checkDeadlineBeforeWeek started");
-        conferenceNotificationService.sendDeadlineNotifications(conferenceService.findAll(), IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
+        conferenceNotificationService.sendDeadlineNotifications(conferenceService.findAll());
         log.debug("ConferenceScheduler.checkDeadlineBeforeWeek finished");
     }
 
-    @Scheduled(cron = "0 0 8 * * ?", zone = "Europe/Samara")
-    public void checkDeadlineAfterWeek() {
-        log.debug("ConferenceScheduler.checkDeadlineAfterWeek started");
-        conferenceNotificationService.sendDeadlineNotifications(conferenceService.findAll(), !IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
-        log.debug("ConferenceScheduler.checkDeadlineAfterWeek finished");
-    }
-
     @Scheduled(cron = "0 0 8 * * *", zone = "Europe/Samara")
     public void checkNewPing() {
         log.debug("ConferenceScheduler.checkPing started");
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 0c1d37d..38de435 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -5,6 +5,7 @@ import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.ModelMap;
+import org.springframework.validation.Errors;
 import ru.ulstu.conference.model.Conference;
 import ru.ulstu.conference.model.ConferenceDto;
 import ru.ulstu.conference.model.ConferenceFilterDto;
@@ -115,7 +116,10 @@ public class ConferenceService {
         Date oldEndDate = conference.getEndDate();
         conferenceRepository.save(copyFromDto(conference, conferenceDto));
         eventService.updateConferenceDeadlines(conference);
-        sendNotificationAfterUpdate(conference, oldDeadlines, oldBeginDate, oldEndDate);
+        sendNotificationAfterUpdateDeadlines(conference, oldDeadlines);
+        if (!conference.getBeginDate().equals(oldBeginDate) || !conference.getEndDate().equals(oldEndDate)) {
+            conferenceNotificationService.updateConferencesDatesNotification(conference, oldBeginDate, oldEndDate);
+        }
         conferenceDto.getRemovedDeadlineIds().forEach(deadlineService::remove);
         return conference.getId();
     }
@@ -127,6 +131,11 @@ public class ConferenceService {
         }
     }
 
+    public void addDeadline(ConferenceDto conferenceDto) {
+        conferenceDto.getDeadlines().add(new Deadline());
+    }
+
+
     public void removeDeadline(ConferenceDto conferenceDto, Integer deadlineIndex) throws IOException {
         if (conferenceDto.getDeadlines().get(deadlineIndex).getId() != null) {
             conferenceDto.getRemovedDeadlineIds().add(conferenceDto.getDeadlines().get(deadlineIndex).getId());
@@ -243,29 +252,17 @@ public class ConferenceService {
         modelMap.addAttribute("offshoreSales", offshoreSales);
     }
 
-    public void sendNotificationAfterUpdate(Conference conference, List<Deadline> oldDeadlines, Date oldBeginDate, Date oldEndDate) {
-        boolean isSendNotificationAboutDeadlines = false;
+    public void sendNotificationAfterUpdateDeadlines(Conference conference, List<Deadline> oldDeadlines) {
         if (oldDeadlines.size() != conference.getDeadlines().size()) {
-            isSendNotificationAboutDeadlines = true;
-        }
-        for (Deadline deadline : conference.getDeadlines()) {
-            if (isSendNotificationAboutDeadlines) {
-                break;
-            }
-            for (Deadline oldDeadline : oldDeadlines) {
-                if (deadline.getId().equals(oldDeadline.getId())) {
-                    if (!deadline.getDescription().equals(oldDeadline.getDescription()) || !deadline.getDate().equals(oldDeadline.getDate())) {
-                        isSendNotificationAboutDeadlines = true;
-                        break;
-                    }
-                }
-            }
-        }
-        if (isSendNotificationAboutDeadlines) {
             conferenceNotificationService.updateDeadlineNotification(conference);
+            return;
         }
-        if (!conference.getBeginDate().equals(oldBeginDate) || !conference.getEndDate().equals(oldEndDate)) {
-            conferenceNotificationService.updateConferencesDatesNotification(conference, oldBeginDate, oldEndDate);
+
+        if (conference.getDeadlines()
+                .stream()
+                .filter(deadline -> !oldDeadlines.contains(deadline))
+                .count() > 0) {
+            conferenceNotificationService.updateDeadlineNotification(conference);
         }
     }
 
@@ -274,4 +271,19 @@ public class ConferenceService {
         newDeadline.setId(oldDeadline.getId());
         return newDeadline;
     }
+
+    public void checkEmptyFieldsOfDeadline(ConferenceDto conferenceDto, Errors errors) {
+        for (Deadline deadline : conferenceDto.getDeadlines()) {
+            if (deadline.getDate() == null || deadline.getDescription().isEmpty()) {
+                errors.rejectValue("deadlines", "errorCode", "Все поля дедлайна должны быть заполнены");
+            }
+        }
+    }
+
+
+    public void filterEmptyDeadlines(ConferenceDto conferenceDto) {
+        conferenceDto.setDeadlines(conferenceDto.getDeadlines().stream()
+                .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription()))
+                .collect(Collectors.toList()));
+    }
 }
diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 404e5c8..199427c 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -51,4 +51,21 @@ public class Deadline extends BaseEntity {
     public void setDate(Date date) {
         this.date = date;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        Deadline deadline = (Deadline) o;
+        return getId().equals(deadline.getId()) &&
+                description.equals(deadline.description) &&
+                date.equals(deadline.date);
+    }
 }
diff --git a/src/main/java/ru/ulstu/ping/service/PingService.java b/src/main/java/ru/ulstu/ping/service/PingService.java
index f24ed9d..f7156f0 100644
--- a/src/main/java/ru/ulstu/ping/service/PingService.java
+++ b/src/main/java/ru/ulstu/ping/service/PingService.java
@@ -29,11 +29,8 @@ public class PingService {
         pingRepository.save(newPing);
     }
 
-    public Integer countPingYesterday(Conference conference, Date yesterday) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(yesterday);
-
-        return Math.toIntExact(pingRepository.countByConferenceAndDate(conference, cal.get(Calendar.DAY_OF_MONTH),
-                cal.get(Calendar.MONTH) + 1, cal.get(Calendar.YEAR)));
+    public Integer countPingYesterday(Conference conference, Calendar calendar) {
+        return Math.toIntExact(pingRepository.countByConferenceAndDate(conference, calendar.get(Calendar.DAY_OF_MONTH),
+                calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.YEAR)));
     }
 }
diff --git a/src/main/java/ru/ulstu/timeline/model/Event.java b/src/main/java/ru/ulstu/timeline/model/Event.java
index f53a52d..9409f21 100644
--- a/src/main/java/ru/ulstu/timeline/model/Event.java
+++ b/src/main/java/ru/ulstu/timeline/model/Event.java
@@ -19,6 +19,7 @@ import javax.persistence.OneToMany;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -63,7 +64,7 @@ public class Event extends BaseEntity {
     private String description;
 
     @ManyToMany(fetch = FetchType.EAGER)
-    private List<User> recipients;
+    private List<User> recipients = new ArrayList<User>();
 
     @ManyToOne
     @JoinColumn(name = "child_id")
diff --git a/src/main/java/ru/ulstu/timeline/service/EventService.java b/src/main/java/ru/ulstu/timeline/service/EventService.java
index f4e2873..d2fa510 100644
--- a/src/main/java/ru/ulstu/timeline/service/EventService.java
+++ b/src/main/java/ru/ulstu/timeline/service/EventService.java
@@ -159,7 +159,7 @@ public class EventService {
             newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' конференции '" + newConference.getTitle() + "'");
             newConference.getUsers().forEach(conferenceUser -> newEvent.getRecipients().add(conferenceUser.getUser()));
             newEvent.setConference(newConference);
-            eventRepository.save(newEvent);
+            save(newEvent);
 
             timeline.getEvents().add(newEvent);
             timelineService.save(timeline);

From 6350e1c0d635ec76a6fe949ec01ab45c71c1b4b7 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Thu, 2 May 2019 14:51:22 +0400
Subject: [PATCH 18/37] #70 add hashCode for deadline

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

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 199427c..148697c 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -9,6 +9,7 @@ import javax.persistence.Entity;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import java.util.Date;
+import java.util.Objects;
 
 @Entity
 public class Deadline extends BaseEntity {
@@ -68,4 +69,9 @@ public class Deadline extends BaseEntity {
                 description.equals(deadline.description) &&
                 date.equals(deadline.date);
     }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), description, date);
+    }
 }

From b334b5d70ecda284777035e1065476f652855a18 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Thu, 2 May 2019 21:42:06 +0400
Subject: [PATCH 19/37] #117 resolve discussions

---
 .../ru/ulstu/grant/service/GrantService.java  | 30 ++++++++++++-------
 .../paper/repository/PaperRepository.java     |  2 +-
 .../ru/ulstu/paper/service/PaperService.java  |  5 +++-
 src/main/resources/application.properties     |  4 +--
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index 5f3bdeb..2450440 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -19,11 +19,11 @@ import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toList;
 import static org.springframework.util.ObjectUtils.isEmpty;
@@ -84,7 +84,6 @@ public class GrantService {
             grant.setProject(projectService.findById(grantDto.getProject().getId()));
         }
         grant.setDeadlines(deadlineService.saveOrCreate(grantDto.getDeadlines()));
-
         grant.setFiles(fileService.saveOrCreate(grantDto.getFiles().stream()
                 .filter(f -> !f.isDeleted())
                 .collect(toList())));
@@ -110,7 +109,6 @@ public class GrantService {
     @Transactional
     public Integer update(GrantDto grantDto) throws IOException {
         Grant grant = grantRepository.findOne(grantDto.getId());
-
         for (FileDataDto file : grantDto.getFiles().stream()
                 .filter(f -> f.isDeleted() && f.getId() != null)
                 .collect(toList())) {
@@ -181,7 +179,7 @@ public class GrantService {
         return grantRepository.findByStatus(Grant.GrantStatus.COMPLETED)
                 .stream()
                 .map(Grant::getLeader)
-                .collect(Collectors.toList());
+                .collect(toList());
     }
 
     public List<Paper> getGrantPapers(List<Integer> paperIds) {
@@ -211,10 +209,16 @@ public class GrantService {
 
     private List<User> getCompletedPapersAuthors(Paper.PaperType type) {
         List<Paper> papers = paperService.findAllCompletedByType(type);
-        return papers.stream()
+        papers.stream()
                 .filter(paper -> paper.getAuthors() != null)
-                .flatMap(paper-> paper.getAuthors().stream())
                 .collect(toList());
+        List<User> users = new ArrayList<>();
+        for (Paper p : papers) {
+            p.getAuthors()
+                    .stream()
+                    .forEach(users::add);
+        }
+        return users;
     }
 
     private List<User> getBAKAuthors() {
@@ -225,10 +229,14 @@ public class GrantService {
     }
 
     private List<User> getScopusAuthors() {
-        List<User> authors = getCompletedPapersAuthors(Paper.PaperType.SCOPUS);
-        return authors
-                .stream()
-                .filter(author -> Collections.frequency(authors, author) > 3)
-                .collect(toList());
+        List<User> oldAuthors = getCompletedPapersAuthors(Paper.PaperType.SCOPUS);
+        List<User> newAuthors = new ArrayList<>();
+        oldAuthors.forEach(author -> {
+            int count = Collections.frequency(oldAuthors, author);
+            if (count > 3) {
+                newAuthors.add(author);
+            }
+        });
+        return newAuthors;
     }
 }
diff --git a/src/main/java/ru/ulstu/paper/repository/PaperRepository.java b/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
index f935247..8bc59ce 100644
--- a/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
+++ b/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
@@ -17,5 +17,5 @@ public interface PaperRepository extends JpaRepository<Paper, Integer> {
 
     List<Paper> findAllByIdIn(List<Integer> paperIds);
 
-    List<Paper> findByTypeAndStatus(Paper.PaperType type, Paper.PaperStatus status);
+    List<Paper> findByType(Paper.PaperType type);
 }
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index f98997d..97efafb 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -305,6 +305,9 @@ public class PaperService {
     }
 
     public List<Paper> findAllCompletedByType(Paper.PaperType type) {
-        return paperRepository.findByTypeAndStatus(type, Paper.PaperStatus.COMPLETED);
+        return paperRepository.findByType(type)
+                .stream()
+                .filter(findAllCompleted()::contains)
+                .collect(toList());
     }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8a3366e..038ddcf 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,7 +1,7 @@
 # Server Settings
 spring.main.banner-mode=off
 server.port=8443
-server.http.port=8888
+server.http.port=8080
 spring.http.multipart.maxFileSize=20MB
 spring.http.multipart.maxRequestSize=20MB
 # Thymeleaf Settings
@@ -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=superuser
+spring.datasource.password=postgres
 spring.datasource.driverclassName=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=validate
 # Liquibase Settings

From de625923e96ba4172ac4ae047560c85fc13e12c2 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Thu, 2 May 2019 21:56:54 +0400
Subject: [PATCH 20/37] #117 resolve discussions v.2

---
 .../ru/ulstu/grant/service/GrantService.java  | 26 ++++++-------------
 .../paper/repository/PaperRepository.java     |  2 +-
 .../ru/ulstu/paper/service/PaperService.java  |  5 +---
 src/main/resources/application.properties     |  2 +-
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index 2450440..daf50db 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -19,7 +19,6 @@ import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
@@ -209,16 +208,11 @@ public class GrantService {
 
     private List<User> getCompletedPapersAuthors(Paper.PaperType type) {
         List<Paper> papers = paperService.findAllCompletedByType(type);
-        papers.stream()
+        return papers.stream()
                 .filter(paper -> paper.getAuthors() != null)
+                .flatMap(paper -> paper.getAuthors().stream())
                 .collect(toList());
-        List<User> users = new ArrayList<>();
-        for (Paper p : papers) {
-            p.getAuthors()
-                    .stream()
-                    .forEach(users::add);
-        }
-        return users;
+
     }
 
     private List<User> getBAKAuthors() {
@@ -229,14 +223,10 @@ public class GrantService {
     }
 
     private List<User> getScopusAuthors() {
-        List<User> oldAuthors = getCompletedPapersAuthors(Paper.PaperType.SCOPUS);
-        List<User> newAuthors = new ArrayList<>();
-        oldAuthors.forEach(author -> {
-            int count = Collections.frequency(oldAuthors, author);
-            if (count > 3) {
-                newAuthors.add(author);
-            }
-        });
-        return newAuthors;
+        List<User> authors = getCompletedPapersAuthors(Paper.PaperType.SCOPUS);
+        return authors
+                .stream()
+                .filter(author -> Collections.frequency(authors, author) > 3)
+                .collect(toList());
     }
 }
diff --git a/src/main/java/ru/ulstu/paper/repository/PaperRepository.java b/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
index 8bc59ce..f935247 100644
--- a/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
+++ b/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
@@ -17,5 +17,5 @@ public interface PaperRepository extends JpaRepository<Paper, Integer> {
 
     List<Paper> findAllByIdIn(List<Integer> paperIds);
 
-    List<Paper> findByType(Paper.PaperType type);
+    List<Paper> findByTypeAndStatus(Paper.PaperType type, Paper.PaperStatus status);
 }
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index 97efafb..f98997d 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -305,9 +305,6 @@ public class PaperService {
     }
 
     public List<Paper> findAllCompletedByType(Paper.PaperType type) {
-        return paperRepository.findByType(type)
-                .stream()
-                .filter(findAllCompleted()::contains)
-                .collect(toList());
+        return paperRepository.findByTypeAndStatus(type, Paper.PaperStatus.COMPLETED);
     }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 038ddcf..64194c9 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,7 +1,7 @@
 # Server Settings
 spring.main.banner-mode=off
 server.port=8443
-server.http.port=8080
+server.http.port=8888
 spring.http.multipart.maxFileSize=20MB
 spring.http.multipart.maxRequestSize=20MB
 # Thymeleaf Settings

From 0955388f277095bc08017cbc1466f58b572f7f8f Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Thu, 2 May 2019 22:00:53 +0400
Subject: [PATCH 21/37] #117 fix port

---
 src/main/resources/application.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 64194c9..038ddcf 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,7 +1,7 @@
 # Server Settings
 spring.main.banner-mode=off
 server.port=8443
-server.http.port=8888
+server.http.port=8080
 spring.http.multipart.maxFileSize=20MB
 spring.http.multipart.maxRequestSize=20MB
 # Thymeleaf Settings

From 74d43dcd0d131213f0f6862524b1df89045b5f80 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Thu, 2 May 2019 22:49:58 +0400
Subject: [PATCH 22/37] #117 resolve last discussion

---
 .../ru/ulstu/grant/service/GrantService.java  | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index daf50db..cb86b7a 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -154,26 +154,23 @@ public class GrantService {
     public List<User> getGrantAuthors(GrantDto grantDto) {
         List<User> filteredUsers = userService.filterByAgeAndDegree(grantDto.isHasAge(), grantDto.isHasDegree());
         if (grantDto.isWasLeader()) {
-            filteredUsers = filteredUsers
-                    .stream()
-                    .filter(getCompletedGrantLeaders()::contains)
-                    .collect(toList());
+            filteredUsers = checkContains(filteredUsers, getCompletedGrantLeaders());
         }
         if (grantDto.isHasBAKPapers()) {
-            filteredUsers = filteredUsers
-                    .stream()
-                    .filter(getBAKAuthors()::contains)
-                    .collect(toList());
+            filteredUsers = checkContains(filteredUsers, getBAKAuthors());
         }
         if (grantDto.isHasScopusPapers()) {
-            filteredUsers = filteredUsers
-                    .stream()
-                    .filter(getScopusAuthors()::contains)
-                    .collect(toList());
+            filteredUsers = checkContains(filteredUsers, getScopusAuthors());
         }
         return filteredUsers;
     }
 
+    private List<User> checkContains(List<User> filteredUsers, List<User> checkUsers) {
+        return filteredUsers.stream()
+                .filter(checkUsers::contains)
+                .collect(toList());
+    }
+
     private List<User> getCompletedGrantLeaders() {
         return grantRepository.findByStatus(Grant.GrantStatus.COMPLETED)
                 .stream()

From beb334f2fa2e21c508b86aac0f3ae54fb160fa12 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Sat, 4 May 2019 23:59:03 +0400
Subject: [PATCH 23/37] #32 add variable "events"

---
 src/main/java/ru/ulstu/grant/model/Grant.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/main/java/ru/ulstu/grant/model/Grant.java b/src/main/java/ru/ulstu/grant/model/Grant.java
index d6f9f0c..ac8ac19 100644
--- a/src/main/java/ru/ulstu/grant/model/Grant.java
+++ b/src/main/java/ru/ulstu/grant/model/Grant.java
@@ -9,6 +9,7 @@ import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.project.model.Project;
+import ru.ulstu.timeline.model.Event;
 import ru.ulstu.user.model.User;
 
 import javax.persistence.CascadeType;
@@ -92,6 +93,10 @@ public class Grant extends BaseEntity implements UserContainer {
             inverseJoinColumns = {@JoinColumn(name = "paper_id")})
     private List<Paper> papers = new ArrayList<>();
 
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @JoinColumn(name = "grant_id")
+    private List<Event> events = new ArrayList<>();
+
     public GrantStatus getStatus() {
         return status;
     }
@@ -169,6 +174,14 @@ public class Grant extends BaseEntity implements UserContainer {
         this.papers = papers;
     }
 
+    public List<Event> getEvents() {
+        return events;
+    }
+
+    public void setEvents(List<Event> events) {
+        this.events = events;
+    }
+
     public Optional<Deadline> getNextDeadline() {
         return deadlines
                 .stream()

From 114f6769ac95a280381663ded00bdfe3fe3039d7 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Sun, 5 May 2019 23:54:02 +0400
Subject: [PATCH 24/37] #32 create changelog

---
 .../db/changelog-20190505_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-20190505_000000-schema.xml

diff --git a/src/main/resources/db/changelog-20190505_000000-schema.xml b/src/main/resources/db/changelog-20190505_000000-schema.xml
new file mode 100644
index 0000000..ac8707a
--- /dev/null
+++ b/src/main/resources/db/changelog-20190505_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="tanya" id="20190505_000000-1">
+        <addColumn tableName="event">
+            <column name="grant_id" type="integer"/>
+        </addColumn>
+        <addForeignKeyConstraint baseTableName="event" baseColumnNames="grant_id"
+                                 constraintName="fk_event_grant_id" 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 3cc05ae..83ff280 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -37,4 +37,5 @@
     <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"/>
 </databaseChangeLog>
\ No newline at end of file

From da382b659a003906aaf4a2ddd6b5b5b28d2fd959 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Mon, 6 May 2019 00:32:28 +0400
Subject: [PATCH 25/37] #32 add deadlines on timeline page

---
 src/main/java/ru/ulstu/grant/model/Grant.java |  1 +
 .../ru/ulstu/grant/service/GrantService.java  | 11 ++++++-
 .../java/ru/ulstu/timeline/model/Event.java   | 13 ++++++++
 .../ru/ulstu/timeline/model/EventDto.java     | 17 +++++++++-
 .../timeline/repository/EventRepository.java  |  3 ++
 .../ulstu/timeline/service/EventService.java  | 33 +++++++++++++++++++
 6 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/model/Grant.java b/src/main/java/ru/ulstu/grant/model/Grant.java
index ac8ac19..760895e 100644
--- a/src/main/java/ru/ulstu/grant/model/Grant.java
+++ b/src/main/java/ru/ulstu/grant/model/Grant.java
@@ -91,6 +91,7 @@ public class Grant extends BaseEntity implements UserContainer {
     @JoinTable(name = "grants_papers",
             joinColumns = {@JoinColumn(name = "grant_id")},
             inverseJoinColumns = {@JoinColumn(name = "paper_id")})
+    @Fetch(FetchMode.SUBSELECT)
     private List<Paper> papers = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index cb86b7a..9cff4b6 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -15,6 +15,7 @@ import ru.ulstu.paper.service.PaperService;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.project.service.ProjectService;
+import ru.ulstu.timeline.service.EventService;
 import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
 
@@ -39,19 +40,22 @@ public class GrantService {
     private final FileService fileService;
     private final UserService userService;
     private final PaperService paperService;
+    private final EventService eventService;
 
     public GrantService(GrantRepository grantRepository,
                         FileService fileService,
                         DeadlineService deadlineService,
                         ProjectService projectService,
                         UserService userService,
-                        PaperService paperService) {
+                        PaperService paperService,
+                        EventService eventService) {
         this.grantRepository = grantRepository;
         this.fileService = fileService;
         this.deadlineService = deadlineService;
         this.projectService = projectService;
         this.userService = userService;
         this.paperService = paperService;
+        this.eventService = eventService;
     }
 
     public List<Grant> findAll() {
@@ -72,6 +76,7 @@ public class GrantService {
     public Integer create(GrantDto grantDto) throws IOException {
         Grant newGrant = copyFromDto(new Grant(), grantDto);
         newGrant = grantRepository.save(newGrant);
+        eventService.createFromGrant(newGrant);
         return newGrant.getId();
     }
 
@@ -115,6 +120,7 @@ public class GrantService {
         }
         grantDto.getRemovedDeadlineIds().forEach(deadlineService::remove);
         grantRepository.save(copyFromDto(grant, grantDto));
+        eventService.updateGrantDeadlines(grant);
         return grant.getId();
     }
 
@@ -140,6 +146,9 @@ public class GrantService {
         grant.setLeader(user);
         grant.getPapers().add(paper);
         grant = grantRepository.save(grant);
+
+        eventService.createFromGrant(grant);
+
         return grant;
     }
 
diff --git a/src/main/java/ru/ulstu/timeline/model/Event.java b/src/main/java/ru/ulstu/timeline/model/Event.java
index 9409f21..9252cec 100644
--- a/src/main/java/ru/ulstu/timeline/model/Event.java
+++ b/src/main/java/ru/ulstu/timeline/model/Event.java
@@ -3,6 +3,7 @@ package ru.ulstu.timeline.model;
 import org.hibernate.validator.constraints.NotBlank;
 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.user.model.User;
 
@@ -82,6 +83,10 @@ public class Event extends BaseEntity {
     @JoinColumn(name = "conference_id")
     private Conference conference;
 
+    @ManyToOne
+    @JoinColumn(name = "grant_id")
+    private Grant grant;
+
     public String getTitle() {
         return title;
     }
@@ -177,4 +182,12 @@ public class Event extends BaseEntity {
     public void setConference(Conference conference) {
         this.conference = conference;
     }
+
+    public Grant getGrant() {
+        return grant;
+    }
+
+    public void setGrant(Grant grant) {
+        this.grant = grant;
+    }
 }
diff --git a/src/main/java/ru/ulstu/timeline/model/EventDto.java b/src/main/java/ru/ulstu/timeline/model/EventDto.java
index ccce25a..89df5d8 100644
--- a/src/main/java/ru/ulstu/timeline/model/EventDto.java
+++ b/src/main/java/ru/ulstu/timeline/model/EventDto.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 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.user.model.UserDto;
 
@@ -27,6 +28,7 @@ public class EventDto {
     private final List<UserDto> recipients;
     private PaperDto paperDto;
     private ConferenceDto conferenceDto;
+    private GrantDto grantDto;
 
     @JsonCreator
     public EventDto(@JsonProperty("id") Integer id,
@@ -39,7 +41,8 @@ public class EventDto {
                     @JsonProperty("description") String description,
                     @JsonProperty("paperDto") PaperDto paperDto,
                     @JsonProperty("recipients") List<UserDto> recipients,
-                    @JsonProperty("conferenceDto") ConferenceDto conferenceDto) {
+                    @JsonProperty("conferenceDto") ConferenceDto conferenceDto,
+                    @JsonProperty("grantDto") GrantDto grantDto) {
         this.id = id;
         this.title = title;
         this.period = period;
@@ -51,6 +54,7 @@ public class EventDto {
         this.recipients = recipients;
         this.paperDto = paperDto;
         this.conferenceDto = conferenceDto;
+        this.grantDto = grantDto;
     }
 
     public EventDto(Event event) {
@@ -69,6 +73,9 @@ public class EventDto {
         if (conferenceDto != null) {
             this.conferenceDto = new ConferenceDto(event.getConference());
         }
+        if (grantDto != null) {
+            this.grantDto = new GrantDto(event.getGrant());
+        }
     }
 
     public Integer getId() {
@@ -122,4 +129,12 @@ public class EventDto {
     public void setConferenceDto(ConferenceDto conferenceDto) {
         this.conferenceDto = conferenceDto;
     }
+
+    public GrantDto getGrantDto() {
+        return grantDto;
+    }
+
+    public void setGrantDto(GrantDto grantDto) {
+        this.grantDto = grantDto;
+    }
 }
diff --git a/src/main/java/ru/ulstu/timeline/repository/EventRepository.java b/src/main/java/ru/ulstu/timeline/repository/EventRepository.java
index a4b1e47..e01037a 100644
--- a/src/main/java/ru/ulstu/timeline/repository/EventRepository.java
+++ b/src/main/java/ru/ulstu/timeline/repository/EventRepository.java
@@ -3,6 +3,7 @@ package ru.ulstu.timeline.repository;
 import org.springframework.data.jpa.repository.JpaRepository;
 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.timeline.model.Event;
 
@@ -18,4 +19,6 @@ public interface EventRepository extends JpaRepository<Event, Integer> {
     List<Event> findAllByPaper(Paper paper);
 
     List<Event> findAllByConference(Conference conference);
+
+    List<Event> findAllByGrant(Grant grant);
 }
diff --git a/src/main/java/ru/ulstu/timeline/service/EventService.java b/src/main/java/ru/ulstu/timeline/service/EventService.java
index d2fa510..b935f16 100644
--- a/src/main/java/ru/ulstu/timeline/service/EventService.java
+++ b/src/main/java/ru/ulstu/timeline/service/EventService.java
@@ -6,6 +6,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 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.timeline.model.Event;
 import ru.ulstu.timeline.model.EventDto;
@@ -170,4 +171,36 @@ public class EventService {
         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);
+        }
+    }
+
+    public void updateGrantDeadlines(Grant grant) {
+        eventRepository.delete(eventRepository.findAllByGrant(grant));
+        createFromGrant(grant);
+    }
 }

From 2dae39a100d12de0b3e40cfc8d080eaddc535ef7 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Mon, 6 May 2019 23:57:16 +0400
Subject: [PATCH 26/37] #119 create grants notification service

---
 .../service/GrantNotificationService.java     | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 src/main/java/ru/ulstu/grant/service/GrantNotificationService.java

diff --git a/src/main/java/ru/ulstu/grant/service/GrantNotificationService.java b/src/main/java/ru/ulstu/grant/service/GrantNotificationService.java
new file mode 100644
index 0000000..c234290
--- /dev/null
+++ b/src/main/java/ru/ulstu/grant/service/GrantNotificationService.java
@@ -0,0 +1,66 @@
+package ru.ulstu.grant.service;
+
+import com.google.common.collect.ImmutableMap;
+import org.springframework.stereotype.Service;
+import ru.ulstu.core.util.DateUtils;
+import ru.ulstu.grant.model.Grant;
+import ru.ulstu.user.model.User;
+import ru.ulstu.user.service.MailService;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Service
+public class GrantNotificationService {
+    private final static int DAYS_TO_DEADLINE_NOTIFICATION = 7;
+    private final static String TEMPLATE_DEADLINE = "grantDeadlineNotification";
+    private final static String TEMPLATE_CREATE = "grantCreateNotification";
+    private final static String TEMPLATE_AUTHORS_CHANGED = "grantAuthorsChangeNotification";
+
+    private final static String TITLE_DEADLINE = "Приближается дедлайн гранта: %s";
+    private final static String TITLE_CREATE = "Создан грант: %s";
+    private final static String TITLE_AUTHORS_CHANGED = "Изменился состав рабочей группы гранта: %s";
+
+    private final MailService mailService;
+
+    public GrantNotificationService(MailService mailService) {
+        this.mailService = mailService;
+    }
+
+    public void sendDeadlineNotifications(List<Grant> grants, boolean isDeadlineBeforeWeek) {
+        Date now = DateUtils.addDays(new Date(), DAYS_TO_DEADLINE_NOTIFICATION);
+        grants.stream()
+                .filter(grant -> needToSendDeadlineNotification(grant, now, isDeadlineBeforeWeek))
+                .forEach(grant -> sendMessageDeadline(grant));
+    }
+
+    private boolean needToSendDeadlineNotification(Grant grant, Date compareDate, boolean isDeadlineBeforeWeek) {
+        return (grant.getNextDeadline().isPresent())
+                && (compareDate.before(grant.getNextDeadline().get().getDate()) && isDeadlineBeforeWeek
+                || compareDate.after(grant.getNextDeadline().get().getDate()) && !isDeadlineBeforeWeek)
+                && grant.getNextDeadline().get().getDate().after(new Date());
+    }
+
+    private void sendMessageDeadline(Grant grant) {
+        Map<String, Object> variables = ImmutableMap.of("grant", grant);
+        sendForAllAuthors(variables, grant, TEMPLATE_DEADLINE, String.format(TITLE_DEADLINE, grant.getTitle()));
+    }
+
+    public void sendCreateNotification(Grant grant) {
+        Map<String, Object> variables = ImmutableMap.of("grant", grant);
+        sendForAllAuthors(variables, grant, TEMPLATE_CREATE, String.format(TITLE_CREATE, grant.getTitle()));
+    }
+
+    public void authorsChangeNotification(Grant grant, List<User> oldAuthors) {
+        Map<String, Object> variables = ImmutableMap.of("grant", grant, "oldAuthors", oldAuthors);
+        sendForAllAuthors(variables, grant, TEMPLATE_AUTHORS_CHANGED, String.format(TITLE_AUTHORS_CHANGED, grant.getTitle()));
+    }
+
+    private void sendForAllAuthors(Map<String, Object> variables, Grant grant, String template, String title) {
+        Set<User> allAuthors = grant.getAuthors();
+        allAuthors.add(grant.getLeader());
+        allAuthors.forEach(author -> mailService.sendEmailFromTemplate(variables, author, template, title));
+    }
+}

From dffd839905ffda7d0d5cf86821b7c266abab9178 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: Tue, 7 May 2019 20:26:49 +0400
Subject: [PATCH 27/37] #109 only uncompleted for grant

---
 src/main/java/ru/ulstu/grant/controller/GrantController.java | 2 +-
 src/main/java/ru/ulstu/grant/service/GrantService.java       | 4 ++++
 src/main/java/ru/ulstu/paper/repository/PaperRepository.java | 2 ++
 src/main/java/ru/ulstu/paper/service/PaperService.java       | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/ulstu/grant/controller/GrantController.java b/src/main/java/ru/ulstu/grant/controller/GrantController.java
index 85a0cd9..b28f8c0 100644
--- a/src/main/java/ru/ulstu/grant/controller/GrantController.java
+++ b/src/main/java/ru/ulstu/grant/controller/GrantController.java
@@ -132,7 +132,7 @@ public class GrantController {
 
     @ModelAttribute("allPapers")
     public List<Paper> getAllPapers() {
-        return grantService.getAllPapers();
+        return grantService.getAllUncompletedPapers();
     }
 
     private void filterEmptyDeadlines(GrantDto grantDto) {
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index 9cff4b6..ae11850 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -196,6 +196,10 @@ public class GrantService {
         return paperService.findAll();
     }
 
+    public List<Paper> getAllUncompletedPapers() {
+        return paperService.findAllNotCompleted();
+    }
+
     public void attachPaper(GrantDto grantDto) {
         if (!grantDto.getPaperIds().isEmpty()) {
             grantDto.getPapers().clear();
diff --git a/src/main/java/ru/ulstu/paper/repository/PaperRepository.java b/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
index f935247..7eff73d 100644
--- a/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
+++ b/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
@@ -18,4 +18,6 @@ public interface PaperRepository extends JpaRepository<Paper, Integer> {
     List<Paper> findAllByIdIn(List<Integer> paperIds);
 
     List<Paper> findByTypeAndStatus(Paper.PaperType type, Paper.PaperStatus status);
+
+    List<Paper> findByStatusNot(Paper.PaperStatus status);
 }
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index f98997d..956b4b6 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -246,7 +246,10 @@ public class PaperService {
         } else {
             return sortPapers(paperRepository.findAll());
         }
+    }
 
+    public List<Paper> findAllNotCompleted() {
+        return paperRepository.findByStatusNot(COMPLETED);
     }
 
     public List<Paper> findAllSelect(List<Integer> paperIds) {

From 1e07c5424dd0dddeaf1e109d20dc53d488e2b027 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: Tue, 7 May 2019 21:35:50 +0400
Subject: [PATCH 28/37] #109 only one conference for paper

---
 src/main/java/ru/ulstu/paper/model/Paper.java        | 12 ++++++++++++
 .../ru/ulstu/paper/repository/PaperRepository.java   |  4 ++++
 .../java/ru/ulstu/paper/service/PaperService.java    |  4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/ulstu/paper/model/Paper.java b/src/main/java/ru/ulstu/paper/model/Paper.java
index 65bd32c..eae8764 100644
--- a/src/main/java/ru/ulstu/paper/model/Paper.java
+++ b/src/main/java/ru/ulstu/paper/model/Paper.java
@@ -3,6 +3,7 @@ package ru.ulstu.paper.model;
 import org.hibernate.annotations.Fetch;
 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.UserContainer;
 import ru.ulstu.deadline.model.Deadline;
@@ -114,6 +115,9 @@ public class Paper extends BaseEntity implements UserContainer {
     @Column(name = "latex_text")
     private String latexText;
 
+    @ManyToMany(mappedBy = "papers")
+    private List<Conference> conferences;
+
     public PaperStatus getStatus() {
         return status;
     }
@@ -218,6 +222,14 @@ public class Paper extends BaseEntity implements UserContainer {
         this.latexText = latexText;
     }
 
+    public List<Conference> getConferences() {
+        return conferences;
+    }
+
+    public void setConferences(List<Conference> conferences) {
+        this.conferences = conferences;
+    }
+
     @Override
     public Set<User> getUsers() {
         return getAuthors();
diff --git a/src/main/java/ru/ulstu/paper/repository/PaperRepository.java b/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
index 7eff73d..42d3703 100644
--- a/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
+++ b/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
@@ -20,4 +20,8 @@ public interface PaperRepository extends JpaRepository<Paper, Integer> {
     List<Paper> findByTypeAndStatus(Paper.PaperType type, Paper.PaperStatus status);
 
     List<Paper> findByStatusNot(Paper.PaperStatus status);
+
+    List<Paper> findByConferencesIsNullAndStatusNot(Paper.PaperStatus status);
+
+    List<Paper> findByIdNotInAndConferencesIsNullAndStatusNot(List<Integer> paperIds, Paper.PaperStatus status);
 }
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index 956b4b6..0083de7 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -242,9 +242,9 @@ public class PaperService {
 
     public List<Paper> findAllNotSelect(List<Integer> paperIds) {
         if (!paperIds.isEmpty()) {
-            return sortPapers(paperRepository.findByIdNotIn(paperIds));
+            return sortPapers(paperRepository.findByIdNotInAndConferencesIsNullAndStatusNot(paperIds, COMPLETED));
         } else {
-            return sortPapers(paperRepository.findAll());
+            return sortPapers(paperRepository.findByConferencesIsNullAndStatusNot(COMPLETED));
         }
     }
 

From 934d194df15434c3991d1afb091ea0b1edcd91b8 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Tue, 7 May 2019 22:15:49 +0400
Subject: [PATCH 29/37] #119 gelete unnecessary column

---
 .../resources/db/changelog-20190507_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-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..0cdb99b
--- /dev/null
+++ b/src/main/resources/db/changelog-20190507_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="20190507_000000-1">
+        <dropColumn columnName="deadline_date" tableName="grants"/>
+    </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 d2444378587e669fad6eb6e3204866e6f2c14b33 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Tue, 7 May 2019 22:35:44 +0400
Subject: [PATCH 30/37] #122 fix bug

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

diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 83ff280..63d7ccf 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_000001-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/db/common/changelog-20190507_000001-schema.xml b/src/main/resources/db/common/changelog-20190507_000001-schema.xml
new file mode 100644
index 0000000..c320eba
--- /dev/null
+++ b/src/main/resources/db/common/changelog-20190507_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="tanya" id="20190507_000001-1">
+        <sql>
+            update grants
+            set leader_id =
+            (select u.id
+            from users u
+            where u.last_name = 'Романов' AND u.first_name = 'Антон');
+        </sql>
+    </changeSet>
+</databaseChangeLog>

From 7ffe04f1dbb9f630ed66aba5423800628c6f234e Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Tue, 7 May 2019 22:47:27 +0400
Subject: [PATCH 31/37] #122 move to right directory

---
 .../db/{common => }/changelog-20190507_000001-schema.xml          | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/main/resources/db/{common => }/changelog-20190507_000001-schema.xml (100%)

diff --git a/src/main/resources/db/common/changelog-20190507_000001-schema.xml b/src/main/resources/db/changelog-20190507_000001-schema.xml
similarity index 100%
rename from src/main/resources/db/common/changelog-20190507_000001-schema.xml
rename to src/main/resources/db/changelog-20190507_000001-schema.xml

From 2fba252df088b38068f76ddcc6ae2098e90074df 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: Tue, 7 May 2019 23:53:10 +0400
Subject: [PATCH 32/37] #109 show other paper attachs

---
 src/main/java/ru/ulstu/paper/model/Paper.java | 12 ++++++++++
 .../resources/templates/grants/grant.html     | 24 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/src/main/java/ru/ulstu/paper/model/Paper.java b/src/main/java/ru/ulstu/paper/model/Paper.java
index eae8764..4536ce5 100644
--- a/src/main/java/ru/ulstu/paper/model/Paper.java
+++ b/src/main/java/ru/ulstu/paper/model/Paper.java
@@ -8,6 +8,7 @@ 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;
 import ru.ulstu.timeline.model.Event;
 import ru.ulstu.user.model.User;
 
@@ -118,6 +119,9 @@ public class Paper extends BaseEntity implements UserContainer {
     @ManyToMany(mappedBy = "papers")
     private List<Conference> conferences;
 
+    @ManyToMany(mappedBy = "papers")
+    private List<Grant> grants;
+
     public PaperStatus getStatus() {
         return status;
     }
@@ -230,6 +234,14 @@ public class Paper extends BaseEntity implements UserContainer {
         this.conferences = conferences;
     }
 
+    public List<Grant> getGrants() {
+        return grants;
+    }
+
+    public void setGrants(List<Grant> grants) {
+        this.grants = grants;
+    }
+
     @Override
     public Set<User> getUsers() {
         return getAuthors();
diff --git a/src/main/resources/templates/grants/grant.html b/src/main/resources/templates/grants/grant.html
index 4d3cdde..e357876 100644
--- a/src/main/resources/templates/grants/grant.html
+++ b/src/main/resources/templates/grants/grant.html
@@ -201,6 +201,30 @@
                                                         Статус статьи
                                                     </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>
                                         </div>
                                     </div>

From 2d9fd0506079bb27016c07416c64977aadb2b616 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Wed, 8 May 2019 23:32:37 +0400
Subject: [PATCH 33/37] #119 create grantCreateNotification mail template

---
 .../grantCreateNotification.html              | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/main/resources/mail_templates/grantCreateNotification.html

diff --git a/src/main/resources/mail_templates/grantCreateNotification.html b/src/main/resources/mail_templates/grantCreateNotification.html
new file mode 100644
index 0000000..69736cd
--- /dev/null
+++ b/src/main/resources/mail_templates/grantCreateNotification.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <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>
+    Уважаемый(ая) <span th:text="${user.firstName + ' ' + user.lastName}">Ivan Ivanov</span>
+</p>
+<p>
+    Был добавлен новый грант: "<a th:href="@{|${baseUrl}/grants/grant?id=${grant.id}|}">
+    <span th:text="${grant.title}">Title</span></a>".
+    <br/>
+</p>
+<p>
+    Руководитель гранта:
+    <span th:text="${grant.leader.firstName}"></span>
+    <span th:text="${grant.leader.lastName}">Leader</span>.
+</p>
+<p>
+    Regards,
+    <br/>
+    <em>NG-tracker.</em>
+</p>
+</body>
+</html>
\ No newline at end of file

From b640dea99a47521352214b6e00f1800adea2a7c2 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Thu, 9 May 2019 00:45:54 +0400
Subject: [PATCH 34/37] #119 create scheduler

---
 .../ulstu/grant/service/GrantScheduler.java   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/main/java/ru/ulstu/grant/service/GrantScheduler.java

diff --git a/src/main/java/ru/ulstu/grant/service/GrantScheduler.java b/src/main/java/ru/ulstu/grant/service/GrantScheduler.java
new file mode 100644
index 0000000..1c38c4a
--- /dev/null
+++ b/src/main/java/ru/ulstu/grant/service/GrantScheduler.java
@@ -0,0 +1,30 @@
+package ru.ulstu.grant.service;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+@Service
+public class GrantScheduler {
+    private final static boolean IS_DEADLINE_NOTIFICATION_BEFORE_WEEK = true;
+
+    private final Logger log = LoggerFactory.getLogger(GrantScheduler.class);
+
+    private final GrantNotificationService grantNotificationService;
+    private final GrantService grantService;
+
+    public GrantScheduler(GrantNotificationService grantNotificationService,
+                          GrantService grantService) {
+        this.grantNotificationService = grantNotificationService;
+        this.grantService = grantService;
+    }
+
+
+    @Scheduled(cron = "0 0 8 * * MON", zone = "Europe/Samara")
+    public void checkDeadlineBeforeWeek() {
+        log.debug("GrantScheduler.checkDeadlineBeforeWeek started");
+        grantNotificationService.sendDeadlineNotifications(grantService.findAll(), IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
+        log.debug("GrantScheduler.checkDeadlineBeforeWeek finished");
+    }
+}

From 4262446aef8147b06e3b5b535076d7cfc519e24c Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Thu, 9 May 2019 01:21:56 +0400
Subject: [PATCH 35/37] #119 create all mail templates

---
 .../grantAuthorsChangeNotification.html       | 24 ++++++++++++++++
 .../grantDeadlineNotification.html            | 28 +++++++++++++++++++
 .../grantLeaderChangeNotification.html        | 24 ++++++++++++++++
 3 files changed, 76 insertions(+)
 create mode 100644 src/main/resources/mail_templates/grantAuthorsChangeNotification.html
 create mode 100644 src/main/resources/mail_templates/grantDeadlineNotification.html
 create mode 100644 src/main/resources/mail_templates/grantLeaderChangeNotification.html

diff --git a/src/main/resources/mail_templates/grantAuthorsChangeNotification.html b/src/main/resources/mail_templates/grantAuthorsChangeNotification.html
new file mode 100644
index 0000000..2bae4fe
--- /dev/null
+++ b/src/main/resources/mail_templates/grantAuthorsChangeNotification.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <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>
+    Уважаемый(ая) <span th:text="${user.firstName + ' ' + user.lastName}">Ivan Ivanov</span>
+</p>
+<p>
+    Состав рабочей группы гранта "<a th:href="@{|${baseUrl}/grants/grant?id=${grant.id}|}"><span
+        th:text="${grant.title}">Title</span></a>" сменился с
+    " <span th:each="author : ${oldAuthors}" th:text="${author.lastName + ' '}">oldAuthors</span>"
+    на " <span th:each="author : ${grant.authors}" th:text="${author.lastName + ' '}">newAuthors</span>".
+</p>
+<p>
+    Regards,
+    <br/>
+    <em>NG-tracker.</em>
+</p>
+</body>
+</html>
diff --git a/src/main/resources/mail_templates/grantDeadlineNotification.html b/src/main/resources/mail_templates/grantDeadlineNotification.html
new file mode 100644
index 0000000..190ef67
--- /dev/null
+++ b/src/main/resources/mail_templates/grantDeadlineNotification.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <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>
+    Уважаемый(ая) <span th:text="${user.firstName + ' ' + user.lastName}">Ivan Ivanov</span>
+</p>
+<p>
+    Приближается дедлайн гранта "<a th:href="@{|${baseUrl}/grants/grant?id=${grant.id}|}"><span
+        th:text="${grant.title}">Title</span></a>".
+</p>
+<p>
+    Срок исполнения: <b><span th:text="${#dates.format(grant.nextDeadline.get().date, 'dd.MM.yyyy')}">Date</span></b>.
+</p>
+<p>
+    Примечание: <b><span th:text="${grant.nextDeadline.get().description}">Description</span></b>.
+</p>
+<p>
+    Regards,
+    <br/>
+    <em>NG-tracker.</em>
+</p>
+</body>
+</html>
diff --git a/src/main/resources/mail_templates/grantLeaderChangeNotification.html b/src/main/resources/mail_templates/grantLeaderChangeNotification.html
new file mode 100644
index 0000000..c6a37e0
--- /dev/null
+++ b/src/main/resources/mail_templates/grantLeaderChangeNotification.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <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>
+    Уважаемый(ая) <span th:text="${user.firstName + ' ' + user.lastName}">Ivan Ivanov</span>
+</p>
+<p>
+    Руководитель гранта "<a th:href="@{|${baseUrl}/grants/grant?id=${grant.id}|}"><span
+        th:text="${grant.title}">Title</span></a>" сменился с
+    "<span th:text="${oldLeader.lastName} ">oldLeader</span>"
+    на "<span th:text="${grant.leader.lastName}">newLeader</span>".
+</p>
+<p>
+    Regards,
+    <br/>
+    <em>NG-tracker.</em>
+</p>
+</body>
+</html>

From 74a8dcbd8ab22de90e4318da464254aa624cc0f6 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Thu, 9 May 2019 01:23:17 +0400
Subject: [PATCH 36/37] #119 add leader changed notification

---
 .../ulstu/grant/service/GrantNotificationService.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/service/GrantNotificationService.java b/src/main/java/ru/ulstu/grant/service/GrantNotificationService.java
index c234290..40c045b 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantNotificationService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantNotificationService.java
@@ -18,10 +18,12 @@ public class GrantNotificationService {
     private final static String TEMPLATE_DEADLINE = "grantDeadlineNotification";
     private final static String TEMPLATE_CREATE = "grantCreateNotification";
     private final static String TEMPLATE_AUTHORS_CHANGED = "grantAuthorsChangeNotification";
+    private final static String TEMPLATE_LEADER_CHANGED = "grantLeaderChangeNotification";
 
     private final static String TITLE_DEADLINE = "Приближается дедлайн гранта: %s";
     private final static String TITLE_CREATE = "Создан грант: %s";
     private final static String TITLE_AUTHORS_CHANGED = "Изменился состав рабочей группы гранта: %s";
+    private final static String TITLE_LEADER_CHANGED = "Изменился руководитель гранта: %s";
 
     private final MailService mailService;
 
@@ -53,14 +55,18 @@ public class GrantNotificationService {
         sendForAllAuthors(variables, grant, TEMPLATE_CREATE, String.format(TITLE_CREATE, grant.getTitle()));
     }
 
-    public void authorsChangeNotification(Grant grant, List<User> oldAuthors) {
+    public void sendAuthorsChangeNotification(Grant grant, Set<User> oldAuthors) {
         Map<String, Object> variables = ImmutableMap.of("grant", grant, "oldAuthors", oldAuthors);
         sendForAllAuthors(variables, grant, TEMPLATE_AUTHORS_CHANGED, String.format(TITLE_AUTHORS_CHANGED, grant.getTitle()));
     }
 
+    public void sendLeaderChangeNotification(Grant grant, User oldLeader) {
+        Map<String, Object> variables = ImmutableMap.of("grant", grant, "oldLeader", oldLeader);
+        sendForAllAuthors(variables, grant, TEMPLATE_LEADER_CHANGED, String.format(TITLE_LEADER_CHANGED, grant.getTitle()));
+    }
     private void sendForAllAuthors(Map<String, Object> variables, Grant grant, String template, String title) {
         Set<User> allAuthors = grant.getAuthors();
-        allAuthors.add(grant.getLeader());
         allAuthors.forEach(author -> mailService.sendEmailFromTemplate(variables, author, template, title));
+        mailService.sendEmailFromTemplate(variables, grant.getLeader(), template, title);
     }
 }

From 77e2ad06516d4da9d80b7c8d8c62a51d4397d5d3 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Thu, 9 May 2019 01:24:55 +0400
Subject: [PATCH 37/37] #119 add send notification functions

---
 .../ru/ulstu/grant/service/GrantService.java  | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index ae11850..83ef49e 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -23,7 +23,9 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import static java.util.stream.Collectors.toList;
 import static org.springframework.util.ObjectUtils.isEmpty;
@@ -41,6 +43,7 @@ public class GrantService {
     private final UserService userService;
     private final PaperService paperService;
     private final EventService eventService;
+    private final GrantNotificationService grantNotificationService;
 
     public GrantService(GrantRepository grantRepository,
                         FileService fileService,
@@ -48,7 +51,8 @@ public class GrantService {
                         ProjectService projectService,
                         UserService userService,
                         PaperService paperService,
-                        EventService eventService) {
+                        EventService eventService,
+                        GrantNotificationService grantNotificationService) {
         this.grantRepository = grantRepository;
         this.fileService = fileService;
         this.deadlineService = deadlineService;
@@ -56,6 +60,7 @@ public class GrantService {
         this.userService = userService;
         this.paperService = paperService;
         this.eventService = eventService;
+        this.grantNotificationService = grantNotificationService;
     }
 
     public List<Grant> findAll() {
@@ -77,6 +82,7 @@ public class GrantService {
         Grant newGrant = copyFromDto(new Grant(), grantDto);
         newGrant = grantRepository.save(newGrant);
         eventService.createFromGrant(newGrant);
+        grantNotificationService.sendCreateNotification(newGrant);
         return newGrant.getId();
     }
 
@@ -113,6 +119,8 @@ public class GrantService {
     @Transactional
     public Integer update(GrantDto grantDto) throws IOException {
         Grant grant = grantRepository.findOne(grantDto.getId());
+        Set<User> oldAuthors = new HashSet<>(grant.getAuthors());
+        User oldLeader = grant.getLeader();
         for (FileDataDto file : grantDto.getFiles().stream()
                 .filter(f -> f.isDeleted() && f.getId() != null)
                 .collect(toList())) {
@@ -120,6 +128,20 @@ public class GrantService {
         }
         grantDto.getRemovedDeadlineIds().forEach(deadlineService::remove);
         grantRepository.save(copyFromDto(grant, grantDto));
+
+        grant.getAuthors().forEach(author -> {
+            if (!oldAuthors.contains(author)) {
+                grantNotificationService.sendAuthorsChangeNotification(grant, oldAuthors);
+            }
+        });
+        oldAuthors.forEach(oldAuthor -> {
+            if (!grant.getAuthors().contains(oldAuthor)) {
+                grantNotificationService.sendAuthorsChangeNotification(grant, oldAuthors);
+            }
+        });
+        if (grant.getLeader() != oldLeader) {
+            grantNotificationService.sendLeaderChangeNotification(grant, oldLeader);
+        }
         eventService.updateGrantDeadlines(grant);
         return grant.getId();
     }
@@ -148,6 +170,7 @@ public class GrantService {
         grant = grantRepository.save(grant);
 
         eventService.createFromGrant(grant);
+        grantNotificationService.sendCreateNotification(grant);
 
         return grant;
     }
@@ -222,7 +245,6 @@ public class GrantService {
                 .filter(paper -> paper.getAuthors() != null)
                 .flatMap(paper -> paper.getAuthors().stream())
                 .collect(toList());
-
     }
 
     private List<User> getBAKAuthors() {