#95 merged with dev

build.gradle

@@ -127,5 +127,7 @@ dependencies {
 
     testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test'
     compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1'
+    testCompile group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '3.3.1'
+    testCompile group: 'com.google.guava', name: 'guava', version: '21.0'
 
 }

src/main/java/ru/ulstu/conference/model/Conference.java

@@ -5,8 +5,11 @@ import org.hibernate.annotations.FetchMode;
 import org.hibernate.validator.constraints.NotBlank;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.EventSource;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.paper.model.Paper;
+import ru.ulstu.timeline.model.Event;
+import ru.ulstu.user.model.User;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -28,7 +31,7 @@ import java.util.Optional;
 
 @Entity
 @Table(name = "conference")
-public class Conference extends BaseEntity {
+public class Conference extends BaseEntity implements EventSource {
 
     @NotBlank
     private String title;
@@ -71,6 +74,19 @@ public class Conference extends BaseEntity {
         return title;
     }
 
+    @Override
+    public List<User> getRecipients() {
+        List<User> list = new ArrayList<>();
+
+        getUsers().forEach(conferenceUser -> list.add(conferenceUser.getUser()));
+        return list;
+    }
+
+    @Override
+    public void addObjectToEvent(Event event) {
+        event.setConference(this);
+    }
+
     public void setTitle(String title) {
         this.title = title;
     }

src/main/java/ru/ulstu/conference/service/ConferenceService.java

@@ -25,6 +25,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;
 import java.util.stream.Collectors;
@@ -116,7 +117,7 @@ public class ConferenceService extends BaseService {
         Conference newConference = copyFromDto(new Conference(), conferenceDto);
         newConference = conferenceRepository.save(newConference);
         conferenceNotificationService.sendCreateNotification(newConference);
-        eventService.createFromConference(newConference);
+        eventService.createFromObject(newConference, Collections.emptyList(), false, "конференции");
         return newConference;
     }
 

src/main/java/ru/ulstu/core/model/EventSource.java

@@ -0,0 +1,17 @@
+package ru.ulstu.core.model;
+
+import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.timeline.model.Event;
+import ru.ulstu.user.model.User;
+
+import java.util.List;
+
+public interface EventSource {
+    List<Deadline> getDeadlines();
+
+    String getTitle();
+
+    List<User> getRecipients();
+
+    void addObjectToEvent(Event event);
+}

src/main/java/ru/ulstu/grant/model/Grant.java

@@ -4,6 +4,7 @@ import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.EventSource;
 import ru.ulstu.core.model.UserContainer;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
@@ -26,6 +27,7 @@ import javax.persistence.OrderBy;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
@@ -35,7 +37,7 @@ import java.util.Set;
 
 @Entity
 @Table(name = "grants")
-public class Grant extends BaseEntity implements UserContainer {
+public class Grant extends BaseEntity implements UserContainer, EventSource {
     public enum GrantStatus {
         APPLICATION("Заявка"),
         ON_COMPETITION("Отправлен на конкурс"),
@@ -134,6 +136,16 @@ public class Grant extends BaseEntity implements UserContainer {
         return title;
     }
 
+    @Override
+    public List<User> getRecipients() {
+        return authors != null ? new ArrayList<>(authors) : Collections.emptyList();
+    }
+
+    @Override
+    public void addObjectToEvent(Event event) {
+        event.setGrant(this);
+    }
+
     public void setTitle(String title) {
         this.title = title;
     }

src/main/java/ru/ulstu/grant/repository/GrantRepository.java

@@ -14,6 +14,8 @@ public interface GrantRepository extends JpaRepository<Grant, Integer>, BaseRepo
 
     Grant findByTitle(String title);
 
+    Grant findGrantById(Integer grantId);
+
     @Override
     @Query("SELECT title FROM Grant g WHERE (g.title = :name) AND (:id IS NULL OR g.id != :id) ")
     String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);

src/main/java/ru/ulstu/grant/service/GrantService.java

@@ -1,6 +1,5 @@
 package ru.ulstu.grant.service;
 
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -90,7 +89,7 @@ public class GrantService extends BaseService {
     public Integer create(GrantDto grantDto) throws IOException {
         Grant newGrant = copyFromDto(new Grant(), grantDto);
         newGrant = grantRepository.save(newGrant);
-        eventService.createFromGrant(newGrant);
+        eventService.createFromObject(newGrant, Collections.emptyList(), false, "гранта");
         grantNotificationService.sendCreateNotification(newGrant);
         return newGrant.getId();
     }
@@ -178,7 +177,7 @@ public class GrantService extends BaseService {
         grant.getPapers().add(paper);
         grant = grantRepository.save(grant);
 
-        eventService.createFromGrant(grant);
+        eventService.createFromObject(grant, Collections.emptyList(), false, "гранта");
         grantNotificationService.sendCreateNotification(grant);
 
         return grant;
@@ -232,10 +231,8 @@ public class GrantService extends BaseService {
 
     private boolean checkSameDeadline(GrantDto grantDto, Integer id) {
         Date date = grantDto.getDeadlines().get(0).getDate(); //дата с сайта киас
-        if (deadlineService.findByGrantIdAndDate(id, date).compareTo(date) == 0) { //если есть такая строка с датой
+        Date foundGrantDate = deadlineService.findByGrantIdAndDate(id, date);
-            return true;
+        return foundGrantDate != null && foundGrantDate.compareTo(date) == 0;
-        }
-        return false;
     }
 
     public List<User> getGrantAuthors(GrantDto grantDto) {
@@ -336,4 +333,8 @@ public class GrantService extends BaseService {
     private List<Grant> findAllActive() {
         return grantRepository.findAllActive();
     }
+
+    public Grant findGrantById(Integer grantId) {
+        return grantRepository.findOne(grantId);
+    }
 }

src/main/java/ru/ulstu/paper/model/Paper.java

@@ -5,6 +5,7 @@ import org.hibernate.annotations.FetchMode;
 import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.conference.model.Conference;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.EventSource;
 import ru.ulstu.core.model.UserContainer;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
@@ -34,7 +35,7 @@ import java.util.Optional;
 import java.util.Set;
 
 @Entity
-public class Paper extends BaseEntity implements UserContainer {
+public class Paper extends BaseEntity implements UserContainer, EventSource {
     public enum PaperStatus {
         ATTENTION("Обратить внимание"),
         ON_PREPARATION("На подготовке"),
@@ -196,6 +197,16 @@ public class Paper extends BaseEntity implements UserContainer {
         return title;
     }
 
+    @Override
+    public List<User> getRecipients() {
+        return new ArrayList(authors);
+    }
+
+    @Override
+    public void addObjectToEvent(Event event) {
+        event.setPaper(this);
+    }
+
     public void setTitle(String title) {
         this.title = title;
     }

src/main/java/ru/ulstu/paper/service/LatexService.java

@@ -42,8 +42,9 @@ public class LatexService {
         InputStreamReader inputStreamReader = new InputStreamReader(process.getInputStream());
 
         try (BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) {
-            while ((bufferedReader.readLine()) != null) {
+            String line = bufferedReader.readLine();
-                //
+            while (line != null) {
+                line = bufferedReader.readLine();
             }
         }
 

src/main/java/ru/ulstu/project/controller/ProjectController.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.project.service.ProjectService;
@@ -46,6 +47,8 @@ public class ProjectController {
     @GetMapping("/project")
     public void getProject(ModelMap modelMap, @RequestParam(value = "id") Integer id) {
         if (id != null && id > 0) {
+            ProjectDto projectDto = projectService.findOneDto(id);
+            attachGrant(projectDto);
             modelMap.put("projectDto", projectService.findOneDto(id));
         } else {
             modelMap.put("projectDto", new ProjectDto());
@@ -70,6 +73,12 @@ public class ProjectController {
         return String.format("redirect:%s", "/projects/projects");
     }
 
+    @PostMapping(value = "/project", params = "attachGrant")
+    public String attachGrant(ProjectDto projectDto) {
+        projectService.attachGrant(projectDto);
+        return "/projects/project";
+    }
+
     @PostMapping(value = "/project", params = "addDeadline")
     public String addDeadline(@Valid ProjectDto projectDto, Errors errors) {
         filterEmptyDeadlines(projectDto);
@@ -98,6 +107,11 @@ public class ProjectController {
         return projectService.getProjectExecutors(projectDto);
     }
 
+    @ModelAttribute("allGrants")
+    public List<GrantDto> getAllGrants() {
+        return projectService.getAllGrants();
+    }
+
     private void filterEmptyDeadlines(ProjectDto projectDto) {
         projectDto.setDeadlines(projectDto.getDeadlines().stream()
                 .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))

src/main/java/ru/ulstu/project/model/Project.java

@@ -1,11 +1,15 @@
 package ru.ulstu.project.model;
 
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
 import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.EventSource;
 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;
 
 import javax.persistence.CascadeType;
@@ -14,17 +18,19 @@ import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 @Entity
-public class Project extends BaseEntity implements UserContainer {
+public class Project extends BaseEntity implements UserContainer, EventSource {
 
     public enum ProjectStatus {
         TECHNICAL_TASK("Техническое задание"),
@@ -65,17 +71,39 @@ public class Project extends BaseEntity implements UserContainer {
     @NotNull
     private String repository;
 
-    @ManyToOne
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-    @JoinColumn(name = "file_id")
+    @JoinColumn(name = "project_id", unique = true)
-    private FileData application;
+    @Fetch(FetchMode.SUBSELECT)
+    private List<FileData> files = new ArrayList<>();
+
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @JoinColumn(name = "project_id")
+    private List<Event> events = new ArrayList<>();
 
     @ManyToMany(fetch = FetchType.LAZY)
     private List<User> executors = new ArrayList<>();
 
+    @ManyToMany(fetch = FetchType.LAZY)
+    @JoinTable(name = "project_grants",
+            joinColumns = {@JoinColumn(name = "project_id")},
+            inverseJoinColumns = {@JoinColumn(name = "grants_id")})
+    @Fetch(FetchMode.SUBSELECT)
+    private List<Grant> grants = new ArrayList<>();
+
     public String getTitle() {
         return title;
     }
 
+    @Override
+    public List<User> getRecipients() {
+        return executors != null ? new ArrayList<>(executors) : Collections.emptyList();
+    }
+
+    @Override
+    public void addObjectToEvent(Event event) {
+        event.setProject(this);
+    }
+
     public void setTitle(String title) {
         this.title = title;
     }
@@ -120,12 +148,20 @@ public class Project extends BaseEntity implements UserContainer {
         this.deadlines = deadlines;
     }
 
-    public FileData getApplication() {
+    public List<FileData> getFiles() {
-        return application;
+        return files;
     }
 
-    public void setApplication(FileData application) {
+    public void setFiles(List<FileData> files) {
-        this.application = application;
+        this.files = files;
+    }
+
+    public List<Event> getEvents() {
+        return events;
+    }
+
+    public void setEvents(List<Event> events) {
+        this.events = events;
     }
 
     public List<User> getExecutors() {
@@ -141,4 +177,12 @@ public class Project extends BaseEntity implements UserContainer {
         Set<User> users = new HashSet<User>(getExecutors());
         return users;
     }
+
+    public List<Grant> getGrants() {
+        return grants;
+    }
+
+    public void setGrants(List<Grant> grants) {
+        this.grants = grants;
+    }
 }

src/main/java/ru/ulstu/project/model/ProjectDto.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.file.model.FileDataDto;
 import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.user.model.User;
 import ru.ulstu.user.model.UserDto;
@@ -27,10 +28,12 @@ public class ProjectDto {
     private List<Deadline> deadlines = new ArrayList<>();
     private GrantDto grant;
     private String repository;
-    private String applicationFileName;
+    private List<FileDataDto> files = new ArrayList<>();
     private List<Integer> removedDeadlineIds = new ArrayList<>();
     private Set<Integer> executorIds;
     private List<UserDto> executors;
+    private List<Integer> grantIds;
+    private List<GrantDto> grants;
 
     private final static int MAX_EXECUTORS_LENGTH = 40;
 
@@ -48,9 +51,12 @@ public class ProjectDto {
                       @JsonProperty("description") String description,
                       @JsonProperty("grant") GrantDto grant,
                       @JsonProperty("repository") String repository,
+                      @JsonProperty("files") List<FileDataDto> files,
                       @JsonProperty("deadlines") List<Deadline> deadlines,
                       @JsonProperty("executorIds") Set<Integer> executorIds,
-                      @JsonProperty("executors") List<UserDto> executors) {
+                      @JsonProperty("executors") List<UserDto> executors,
+                      @JsonProperty("grantIds") List<Integer> grantIds,
+                      @JsonProperty("grants") List<GrantDto> grants) {
         this.id = id;
         this.title = title;
         this.status = status;
@@ -58,9 +64,11 @@ public class ProjectDto {
         this.grant = grant;
         this.repository = repository;
         this.deadlines = deadlines;
-        this.applicationFileName = null;
+        this.files = files;
         this.executorIds = executorIds;
         this.executors = executors;
+        this.grantIds = grantIds;
+        this.grants = grants;
     }
 
 
@@ -70,12 +78,14 @@ public class ProjectDto {
         this.title = project.getTitle();
         this.status = project.getStatus();
         this.description = project.getDescription();
-        this.applicationFileName = project.getApplication() == null ? null : project.getApplication().getName();
+        this.files = convert(project.getFiles(), FileDataDto::new);
         this.grant = project.getGrant() == null ? null : new GrantDto(project.getGrant());
         this.repository = project.getRepository();
         this.deadlines = project.getDeadlines();
         this.executorIds = convert(users, user -> user.getId());
         this.executors = convert(project.getExecutors(), UserDto::new);
+        this.grantIds = convert(project.getGrants(), grant -> grant.getId());
+        this.grants = convert(project.getGrants(), GrantDto::new);
     }
 
     public Integer getId() {
@@ -134,12 +144,12 @@ public class ProjectDto {
         this.deadlines = deadlines;
     }
 
-    public String getApplicationFileName() {
+    public List<FileDataDto> getFiles() {
-        return applicationFileName;
+        return files;
     }
 
-    public void setApplicationFileName(String applicationFileName) {
+    public void setFiles(List<FileDataDto> files) {
-        this.applicationFileName = applicationFileName;
+        this.files = files;
     }
 
     public List<Integer> getRemovedDeadlineIds() {
@@ -172,4 +182,20 @@ public class ProjectDto {
                 .map(executor -> executor.getLastName())
                 .collect(Collectors.joining(", ")), MAX_EXECUTORS_LENGTH);
     }
+
+    public List<Integer> getGrantIds() {
+        return grantIds;
+    }
+
+    public void setGrantIds(List<Integer> grantIds) {
+        this.grantIds = grantIds;
+    }
+
+    public List<GrantDto> getGrants() {
+        return grants;
+    }
+
+    public void setGrants(List<GrantDto> grants) {
+        this.grants = grants;
+    }
 }

src/main/java/ru/ulstu/project/service/ProjectService.java

@@ -4,18 +4,23 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.service.DeadlineService;
+import ru.ulstu.file.model.FileDataDto;
 import ru.ulstu.file.service.FileService;
+import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.repository.GrantRepository;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.project.repository.ProjectRepository;
+import ru.ulstu.timeline.service.EventService;
 import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
+import static java.util.stream.Collectors.toList;
 import static org.springframework.util.ObjectUtils.isEmpty;
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 import static ru.ulstu.project.model.Project.ProjectStatus.TECHNICAL_TASK;
@@ -28,17 +33,20 @@ public class ProjectService {
     private final DeadlineService deadlineService;
     private final GrantRepository grantRepository;
     private final FileService fileService;
+    private final EventService eventService;
     private final UserService userService;
 
     public ProjectService(ProjectRepository projectRepository,
                           DeadlineService deadlineService,
                           GrantRepository grantRepository,
                           FileService fileService,
+                          EventService eventService,
                           UserService userService) {
         this.projectRepository = projectRepository;
         this.deadlineService = deadlineService;
         this.grantRepository = grantRepository;
         this.fileService = fileService;
+        this.eventService = eventService;
         this.userService = userService;
     }
 
@@ -64,26 +72,31 @@ public class ProjectService {
     public Project create(ProjectDto projectDto) throws IOException {
         Project newProject = copyFromDto(new Project(), projectDto);
         newProject = projectRepository.save(newProject);
+        eventService.createFromObject(newProject, Collections.emptyList(), false, "проекта");
         return newProject;
     }
 
     @Transactional
     public Project update(ProjectDto projectDto) throws IOException {
         Project project = projectRepository.findOne(projectDto.getId());
-        if (projectDto.getApplicationFileName() != null && project.getApplication() != null) {
-            fileService.deleteFile(project.getApplication());
-        }
         projectRepository.save(copyFromDto(project, projectDto));
+        eventService.updateProjectDeadlines(project);
+        for (FileDataDto file : projectDto.getFiles().stream()
+                .filter(f -> f.isDeleted() && f.getId() != null)
+                .collect(toList())) {
+            fileService.delete(file.getId());
+        }
         return project;
     }
 
     @Transactional
-    public void delete(Integer projectId) throws IOException {
+    public boolean delete(Integer projectId) throws IOException {
+        if (projectRepository.exists(projectId)) {
             Project project = projectRepository.findOne(projectId);
-        if (project.getApplication() != null) {
-            fileService.deleteFile(project.getApplication());
-        }
             projectRepository.delete(project);
+            return true;
+        }
+        return false;
     }
 
     private Project copyFromDto(Project project, ProjectDto projectDto) throws IOException {
@@ -95,8 +108,12 @@ public class ProjectService {
         }
         project.setRepository(projectDto.getRepository());
         project.setDeadlines(deadlineService.saveOrCreate(projectDto.getDeadlines()));
-        if (projectDto.getApplicationFileName() != null) {
+        project.setFiles(fileService.saveOrCreate(projectDto.getFiles().stream()
-            project.setApplication(fileService.createFileFromTmp(projectDto.getApplicationFileName()));
+                .filter(f -> !f.isDeleted())
+                .collect(toList())));
+        project.getGrants().clear();
+        if (projectDto.getGrantIds() != null && !projectDto.getGrantIds().isEmpty()) {
+            projectDto.getGrantIds().forEach(grantIds -> project.getGrants().add(grantRepository.findGrantById(grantIds)));
         }
         return project;
     }
@@ -109,11 +126,12 @@ public class ProjectService {
         }
     }
 
-    public void removeDeadline(ProjectDto projectDto, Integer deadlineId) {
+    public ProjectDto removeDeadline(ProjectDto projectDto, Integer deadlineId) {
         if (deadlineId != null) {
             projectDto.getRemovedDeadlineIds().add(deadlineId);
         }
         projectDto.getDeadlines().remove((int) deadlineId);
+        return projectDto;
     }
 
     public Project findById(Integer id) {
@@ -125,4 +143,22 @@ public class ProjectService {
         return users;
     }
 
+    public List<GrantDto> getAllGrants() {
+        List<GrantDto> grants = convert(grantRepository.findAll(), GrantDto::new);
+        return grants;
+    }
+
+    public List<GrantDto> getProjectGrants(List<Integer> grantIds) {
+        return convert(grantRepository.findAll(grantIds), GrantDto::new);
+    }
+
+    public void attachGrant(ProjectDto projectDto) {
+        if (!projectDto.getGrantIds().isEmpty()) {
+            projectDto.getGrants().clear();
+            projectDto.setGrants(getProjectGrants(projectDto.getGrantIds()));
+        } else {
+            projectDto.getGrants().clear();
+        }
+    }
+
 }

src/main/java/ru/ulstu/students/model/Task.java

@@ -4,8 +4,12 @@ import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.EventSource;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.tags.model.Tag;
+import ru.ulstu.timeline.model.Event;
+import ru.ulstu.user.model.User;
+import ru.ulstu.user.service.UserService;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -20,12 +24,14 @@ import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.Transient;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
 @Entity
-public class Task extends BaseEntity {
+public class Task extends BaseEntity implements EventSource {
 
     public enum TaskStatus {
         IN_WORK("В работе"),
@@ -49,6 +55,17 @@ public class Task extends BaseEntity {
 
     private String description;
 
+    @Transient
+    private UserService userService;
+
+    public Task() {
+
+    }
+
+    public Task(UserService userService) {
+        this.userService = userService;
+    }
+
     @Enumerated(value = EnumType.STRING)
     private TaskStatus status = TaskStatus.IN_WORK;
 
@@ -77,6 +94,16 @@ public class Task extends BaseEntity {
         return title;
     }
 
+    @Override
+    public List<User> getRecipients() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public void addObjectToEvent(Event event) {
+        event.setTask(this);
+    }
+
     public void setTitle(String title) {
         this.title = title;
     }

src/main/java/ru/ulstu/students/service/TaskService.java

@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -83,7 +84,7 @@ public class TaskService {
     public Integer create(TaskDto taskDto) throws IOException {
         Task newTask = copyFromDto(new Task(), taskDto);
         newTask = taskRepository.save(newTask);
-        eventService.createFromTask(newTask);
+        eventService.createFromObject(newTask, Collections.emptyList(), true, "задачи");
         return newTask.getId();
     }
 

src/main/java/ru/ulstu/timeline/model/Event.java

@@ -5,6 +5,7 @@ import ru.ulstu.conference.model.Conference;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.paper.model.Paper;
+import ru.ulstu.project.model.Project;
 import ru.ulstu.students.model.Task;
 import ru.ulstu.user.model.User;
 
@@ -88,6 +89,10 @@ public class Event extends BaseEntity {
     @JoinColumn(name = "grant_id")
     private Grant grant;
 
+    @ManyToOne
+    @JoinColumn(name = "project_id")
+    private Project project;
+
     @ManyToOne
     @JoinColumn(name = "task_id")
     private Task task;
@@ -196,6 +201,14 @@ public class Event extends BaseEntity {
         this.grant = grant;
     }
 
+    public Project getProject() {
+        return project;
+    }
+
+    public void setProject(Project project) {
+        this.project = project;
+    }
+
     public Task getTask() {
         return task;
     }

src/main/java/ru/ulstu/timeline/model/EventDto.java

@@ -6,6 +6,7 @@ import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.conference.model.ConferenceDto;
 import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.paper.model.PaperDto;
+import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.students.model.TaskDto;
 import ru.ulstu.user.model.UserDto;
 
@@ -30,6 +31,7 @@ public class EventDto {
     private PaperDto paperDto;
     private ConferenceDto conferenceDto;
     private GrantDto grantDto;
+    private ProjectDto projectDto;
     private TaskDto taskDto;
 
     @JsonCreator
@@ -45,6 +47,7 @@ public class EventDto {
                     @JsonProperty("recipients") List<UserDto> recipients,
                     @JsonProperty("conferenceDto") ConferenceDto conferenceDto,
                     @JsonProperty("grantDto") GrantDto grantDto,
+                    @JsonProperty("projectDto") ProjectDto projectDto,
                     @JsonProperty("taskDto") TaskDto taskDto) {
         this.id = id;
         this.title = title;
@@ -58,6 +61,7 @@ public class EventDto {
         this.paperDto = paperDto;
         this.conferenceDto = conferenceDto;
         this.grantDto = grantDto;
+        this.projectDto = projectDto;
         this.taskDto = taskDto;
     }
 
@@ -80,6 +84,9 @@ public class EventDto {
         if (grantDto != null) {
             this.grantDto = new GrantDto(event.getGrant());
         }
+        if (projectDto != null) {
+            this.projectDto = new ProjectDto(event.getProject());
+        }
         if (taskDto != null) {
             this.taskDto = new TaskDto(event.getTask());
         }
@@ -145,6 +152,14 @@ public class EventDto {
         this.grantDto = grantDto;
     }
 
+    public ProjectDto getProjectDto() {
+        return projectDto;
+    }
+
+    public void setProjectDto(ProjectDto projectDto) {
+        this.projectDto = projectDto;
+    }
+
     public TaskDto getTaskDto() {
         return taskDto;
     }

src/main/java/ru/ulstu/timeline/repository/EventRepository.java

@@ -5,6 +5,7 @@ import org.springframework.data.jpa.repository.Query;
 import ru.ulstu.conference.model.Conference;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.paper.model.Paper;
+import ru.ulstu.project.model.Project;
 import ru.ulstu.students.model.Task;
 import ru.ulstu.timeline.model.Event;
 
@@ -23,5 +24,7 @@ public interface EventRepository extends JpaRepository<Event, Integer> {
 
     List<Event> findAllByGrant(Grant grant);
 
+    List<Event> findAllByProject(Project project);
+
     List<Event> findAllByTask(Task task);
 }

src/main/java/ru/ulstu/timeline/service/EventService.java

@@ -5,9 +5,11 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.ulstu.conference.model.Conference;
+import ru.ulstu.core.model.EventSource;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.paper.model.Paper;
+import ru.ulstu.project.model.Project;
 import ru.ulstu.students.model.Task;
 import ru.ulstu.timeline.model.Event;
 import ru.ulstu.timeline.model.EventDto;
@@ -16,7 +18,7 @@ import ru.ulstu.timeline.repository.EventRepository;
 import ru.ulstu.user.model.UserDto;
 import ru.ulstu.user.service.UserService;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -103,33 +105,39 @@ public class EventService {
     }
 
     public void createFromPaper(Paper newPaper) {
+        createFromObject(newPaper, Collections.emptyList(), false, "статьи");
+    }
+
+    public void createFromObject(EventSource eventSource, List<Event> events, Boolean addCurrentUser, String suffix) {
         List<Timeline> timelines = timelineService.findAll();
         Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0);
 
-        for (Deadline deadline : newPaper.getDeadlines()
+        timeline.getEvents().removeAll(events);
+        for (Deadline deadline : eventSource.getDeadlines()
                 .stream()
                 .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
                 .collect(Collectors.toList())) {
             Event newEvent = new Event();
-            newEvent.setTitle("Дедлайн статьи");
+            newEvent.setTitle("Дедлайн " + suffix);
             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.setDescription("Дедлайн '" + deadline.getDescription() + "' " + suffix + " '"
-            newEvent.setRecipients(new ArrayList(newPaper.getAuthors()));
+                    + eventSource.getTitle() + "'");
-            newEvent.setPaper(newPaper);
+            if (addCurrentUser) {
-            eventRepository.save(newEvent);
+                newEvent.getRecipients().add(userService.getCurrentUser());
-
+            }
-            timeline.getEvents().add(newEvent);
+            newEvent.setRecipients(eventSource.getRecipients());
+            eventSource.addObjectToEvent(newEvent);
+            timeline.getEvents().add(eventRepository.save(newEvent));
+        }
         timelineService.save(timeline);
     }
-    }
-
     public void updatePaperDeadlines(Paper paper) {
-        eventRepository.delete(eventRepository.findAllByPaper(paper));
+        List<Event> foundEvents = eventRepository.findAllByPaper(paper);
-
+        eventRepository.delete(foundEvents);
-        createFromPaper(paper);
+        createFromObject(paper, foundEvents, false, "статьи");
     }
 
     public List<Event> findByCurrentDate() {
@@ -144,65 +152,19 @@ public class EventService {
         return convert(findAllFuture(), EventDto::new);
     }
 
-    public void createFromConference(Conference newConference) {
-        List<Timeline> timelines = timelineService.findAll();
-        Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0);
-
-        for (Deadline deadline : newConference.getDeadlines()
-                .stream()
-                .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
-                .collect(Collectors.toList())) {
-            Event newEvent = new Event();
-            newEvent.setTitle("Дедлайн конференции");
-            newEvent.setStatus(Event.EventStatus.NEW);
-            newEvent.setExecuteDate(deadline.getDate());
-            newEvent.setCreateDate(new Date());
-            newEvent.setUpdateDate(new Date());
-            newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' конференции '" + newConference.getTitle() + "'");
-            newConference.getUsers().forEach(conferenceUser -> newEvent.getRecipients().add(conferenceUser.getUser()));
-            newEvent.setConference(newConference);
-            save(newEvent);
-
-            timeline.getEvents().add(newEvent);
-            timelineService.save(timeline);
-        }
-    }
-
     public void updateConferenceDeadlines(Conference conference) {
         eventRepository.delete(eventRepository.findAllByConference(conference));
-        createFromConference(conference);
+        createFromObject(conference, Collections.emptyList(), false, "конференции");
-    }
-
-    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);
+        createFromObject(grant, Collections.emptyList(), false, "гранта");
+    }
+
+    public void updateProjectDeadlines(Project project) {
+        eventRepository.delete(eventRepository.findAllByProject(project));
+        createFromObject(project, Collections.emptyList(), false, "проекта");
     }
 
     public void removeConferencesEvent(Conference conference) {
@@ -210,32 +172,8 @@ public class EventService {
         eventList.forEach(event -> eventRepository.delete(event.getId()));
     }
 
-    public void createFromTask(Task newTask) {
-        List<Timeline> timelines = timelineService.findAll();
-        Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0);
-
-        for (Deadline deadline : newTask.getDeadlines()
-                .stream()
-                .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date()))
-                .collect(Collectors.toList())) {
-            Event newEvent = new Event();
-            newEvent.setTitle("Дедлайн задачи");
-            newEvent.setStatus(Event.EventStatus.NEW);
-            newEvent.setExecuteDate(deadline.getDate());
-            newEvent.setCreateDate(new Date());
-            newEvent.setUpdateDate(new Date());
-            newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' задачи '" + newTask.getTitle() + "'");
-            newEvent.getRecipients().add(userService.getCurrentUser());
-            newEvent.setTask(newTask);
-            eventRepository.save(newEvent);
-
-            timeline.getEvents().add(newEvent);
-            timelineService.save(timeline);
-        }
-    }
-
     public void updateTaskDeadlines(Task task) {
         eventRepository.delete(eventRepository.findAllByTask(task));
-        createFromTask(task);
+        createFromObject(task, Collections.emptyList(), true, "задачи");
     }
 }

src/main/java/ru/ulstu/user/controller/UserController.java

@@ -3,7 +3,6 @@ package ru.ulstu.user.controller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.access.annotation.Secured;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -33,7 +32,6 @@ import ru.ulstu.user.service.UserSessionService;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import javax.validation.Valid;
-
 import java.util.Map;
 
 import static ru.ulstu.user.controller.UserController.URL;

src/main/java/ru/ulstu/user/controller/UserMvcController.java

@@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import ru.ulstu.configuration.Constants;
 import ru.ulstu.odin.controller.OdinController;
-import ru.ulstu.user.model.UserDto;
 import ru.ulstu.user.model.User;
+import ru.ulstu.user.model.UserDto;
 import ru.ulstu.user.model.UserListDto;
 import ru.ulstu.user.service.UserService;
 import ru.ulstu.user.service.UserSessionService;

src/main/java/ru/ulstu/utils/timetable/TimetableService.java

@@ -18,7 +18,7 @@ public class TimetableService {
     private static final String TIMETABLE_URL = "http://timetable.athene.tech/api/1.0/timetable?filter=%s";
     private SimpleDateFormat lessonTimeFormat = new SimpleDateFormat("hh:mm");
 
-    private long[] lessonsStarts = new long[] {
+    private long[] lessonsStarts = new long[]{
             lessonTimeFormat.parse("8:00:00").getTime(),
             lessonTimeFormat.parse("9:40:00").getTime(),
             lessonTimeFormat.parse("11:30:00").getTime(),

src/main/resources/db/changelog-20190507_000002-schema.xml

@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="anton" id="20190507_000002-1">
+        <addColumn tableName="event">
+            <column name="project_id" type="integer"/>
+        </addColumn>
+        <addForeignKeyConstraint baseTableName="event" baseColumnNames="project_id"
+                                 constraintName="fk_event_project_id" referencedTableName="project"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog-20190528_000002-schema.xml

@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <changeSet author="anton" id="20190528_000000-3">
+    <changeSet author="anton" id="20190528_000002-1">
         <createTable tableName="deadline_executors">
             <column name="deadline_id" type="integer"/>
             <column name="executors_id" type="integer"/>

src/main/resources/db/changelog-20190529_000000-schema.xml

@@ -0,0 +1,17 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="anton" id="20190528_000000-3">
+        <createTable tableName="project_grants">
+            <column name="project_id" type="integer"/>
+            <column name="grants_id" type="integer"/>
+        </createTable>
+        <addForeignKeyConstraint baseTableName="project_grants" baseColumnNames="project_id"
+                                 constraintName="fk_project_project_grants" referencedTableName="project"
+                                 referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="project_grants" baseColumnNames="grants_id"
+                                 constraintName="fk_grant_project_grants" referencedTableName="grants"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog-20190529_000001-schema.xml

@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="anton" id="20190529_000001-1">
+        <addColumn tableName="file">
+            <column name="project_id" type="integer"/>
+        </addColumn>
+        <addForeignKeyConstraint baseTableName="file" baseColumnNames="project_id"
+                                 constraintName="fk_file_project" referencedTableName="project"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog-20190601_000001-schema.xml

@@ -2,9 +2,9 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <changeSet author="anton" id="20190428_000000-1">
+    <changeSet author="anton" id="20190601_000000-1">
         <update tableName="project">
-            <column name="status" value="APPLICATION"/>
+            <column name="status" value="TECHNICAL_TASK"/>
         </update>
     </changeSet>
 </databaseChangeLog>

src/main/resources/db/changelog-master.xml

@@ -35,7 +35,6 @@
     <include file="db/changelog-20190422_000000-schema.xml"/>
     <include file="db/changelog-20190424_000000-schema.xml"/>
     <include file="db/changelog-20190426_000000-schema.xml"/>
-    <include file="db/changelog-20190428_000000-schema.xml"/>
     <include file="db/changelog-20190430_000000-schema.xml"/>
     <include file="db/changelog-20190505_000000-schema.xml"/>
     <include file="db/changelog-20190505_000001-schema.xml"/>
@@ -43,11 +42,15 @@
     <include file="db/changelog-20190506_000001-schema.xml"/>
     <include file="db/changelog-20190507_000000-schema.xml"/>
     <include file="db/changelog-20190507_000001-schema.xml"/>
+    <include file="db/changelog-20190507_000002-schema.xml"/>
     <include file="db/changelog-20190511_000000-schema.xml"/>
     <include file="db/changelog-20190517_000001-schema.xml"/>
     <include file="db/changelog-20190520_000000-schema.xml"/>
     <include file="db/changelog-20190523_000000-schema.xml"/>
     <include file="db/changelog-20190528_000000-schema.xml"/>
     <include file="db/changelog-20190528_000002-schema.xml"/>
-    <include file="db/changelog-20190531_000002-schema.xml"/>
+    <include file="db/changelog-20190529_000000-schema.xml"/>
+    <include file="db/changelog-20190529_000001-schema.xml"/>
+    <include file="db/changelog-20190601_000001-schema.xml"/>
+    <include file="db/changelog-20190606_000002-schema.xml"/>
 </databaseChangeLog>

src/main/resources/templates/conferences/conference.html

@@ -156,14 +156,16 @@
                                             <a class="paper-name"
                                                th:href="@{'/papers/paper?id=' + *{papers[__${rowStat.index}__].id} + ''}"
                                                th:if="*{papers[__${rowStat.index}__].id !=null}">
-                                                <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status})"/>
+                                                <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status},
+                                                title=*{papers[__${rowStat.index}__].title}, small=false)"/>
                                                 <span th:text="*{papers[__${rowStat.index}__].title}">
                                                     Имя статьи
                                                 </span>
                                             </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:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status},
+                                                title=*{papers[__${rowStat.index}__].title}, small=false)"/>
                                                 <span th:text="*{papers[__${rowStat.index}__].title}">
                                                     Имя статьи
                                                 </span>

src/main/resources/templates/grants/fragments/grantLineFragment.html

@@ -8,10 +8,16 @@
     <div class="col">
         <span th:replace="grants/fragments/grantStatusFragment :: grantStatus(grantStatus=${grant.status})"/>
         <a th:href="@{'grant?id='+${grant.id}}">
-            <span class="h6" th:if="${#strings.length(grant.title) > 50}" th:text="${#strings.substring(grant.title, 0, 50)} + '...'" th:title="${grant.title}"/>
+            <span class="h6" th:if="${#strings.length(grant.title) > 50}"
-            <span class="h6" th:if="${#strings.length(grant.title) le 50}" th:text="${grant.title}" th:title="${grant.title}"/>
+                  th:text="${#strings.substring(grant.title, 0, 50)} + '...'" th:title="${grant.title}"/>
+            <span class="h6" th:if="${#strings.length(grant.title) le 50}" th:text="${grant.title}"
+                  th:title="${grant.title}"/>
             <span class="text-muted" th:text="${grant.authorsString}"/>
         </a>
+        <span th:each="paper, rowStat : *{grant.papers}">
+            <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status},
+            title=${paper.title}, small=true)"/>
+        </span>
         <input class="id-class" type="hidden" th:value="${grant.id}"/>
         <a class="remove-paper  pull-right d-none" th:href="@{'/grants/delete/'+${grant.id}}"
            data-confirm="Удалить грант?">

src/main/resources/templates/grants/fragments/grantStatusFragment.html

@@ -25,7 +25,7 @@
             <i class="fa fa-circle fa-stack-2x text-failed"></i>
         </div>
         </th:block>
-    <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+    <i class="fa fa-clipboard fa-stack-1x fa-inverse"></i>
 </span>
 </body>
 </html>

src/main/resources/templates/grants/grant.html

@@ -49,7 +49,7 @@
                                 <div class="form-group">
                                     <label>Дедлайны показателей:</label>
                                     <input type="hidden" th:field="*{removedDeadlineIds}"/>
-                                    <div class="row" th:each="deadline, rowStat : *{deadlines}">
+                                    <div class="row" id="deadlines" th:each="deadline, rowStat : *{deadlines}">
                                         <input type="hidden" th:field="*{deadlines[__${rowStat.index}__].id}"/>
                                         <div class="col-6 div-deadline-date">
                                             <input type="date" class="form-control form-deadline-date" name="deadline"
@@ -191,6 +191,7 @@
                                         </div>
                                     </div>
                                 </div>
+                                <!--
                                 <div class="form-group">
                                     <div th:if="*{project} == null">
                                         <input type="submit" name="createProject" class="btn btn-primary"
@@ -198,6 +199,7 @@
                                     </div>
                                     <input type = "hidden" th:field="*{project.id}"/>
                                 </div>
+                                -->
                             </div>
                             <div class="clearfix"></div>
                             <div class="col-lg-12">

src/main/resources/templates/index.html

@@ -40,7 +40,7 @@
                 </div>
             </div>
             <div class="col-md-4 col-sm-6 portfolio-item">
-                <a class="portfolio-link" href="./projects/dashboard">
+                <a class="portfolio-link" href="./projects/projects">
                     <div class="portfolio-hover">
                         <div class="portfolio-hover-content">
                             <i class="fa fa-arrow-right fa-3x"></i>

src/main/resources/templates/papers/fragments/paperDashboardFragment.html

@@ -7,10 +7,12 @@
 <div th:fragment="paperDashboard (paper)" class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
     <div class="row">
         <div class="col-2">
-            <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status})"/>
+            <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status},
+            title=${paper.title}, small=false)"/>
         </div>
         <div class="col col-10 text-right">
-            <p th:if="${paper.url!=null and paper.url!=''}"><a target="_blank" th:href="${paper.url}"><i
+            <p th:if="${paper.url!=null and paper.url!=''}"><a target="_blank" class="externalLink"
+                                                               th:href="${paper.url}"><i
                     class="fa fa-external-link fa-1x"
                     aria-hidden="true"></i></a></p>
             <p th:unless="${paper.url!=null and paper.url!=''}"><i class="fa fa-fw fa-2x" aria-hidden="true"></i></p>

src/main/resources/templates/papers/fragments/paperLineFragment.html

@@ -6,10 +6,12 @@
 <body>
 <div th:fragment="paperLine (paper)" class="row text-left paper-row" style="background-color: white;">
     <div class="col">
-        <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status})"/>
+        <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title}, small=false)"/>
-        <a th:href="@{'paper?id='+${paper.id}}">
+        <a th:href="@{'../papers/paper?id='+${paper.id}}">
-            <span class="h6" th:if="${#strings.length(paper.title)} > 50" th:text="${#strings.substring(paper.title, 0, 50) + '...'}" th:title="${paper.title}"/>
+            <span class="h6" th:if="${#strings.length(paper.title)} > 50"
-            <span class="h6" th:if="${#strings.length(paper.title) le 50}" th:text="${paper.title}" th:title="${paper.title}"/>
+                  th:text="${#strings.substring(paper.title, 0, 50) + '...'}" th:title="${paper.title}"/>
+            <span class="h6" th:if="${#strings.length(paper.title) le 50}" th:text="${paper.title}"
+                  th:title="${paper.title}"/>
             <span class="text-muted" th:text="${paper.authorsString}"/>
         </a>
         <input class="id-class" type="hidden" th:value="${paper.id}"/>

src/main/resources/templates/papers/fragments/paperStatusFragment.html

@@ -4,34 +4,35 @@
     <meta charset="UTF-8"/>
 </head>
 <body>
-<span th:fragment="paperStatus (paperStatus)" class="fa-stack fa-1x">
+<span th:fragment="paperStatus (paperStatus, title, small)" class="fa-stack fa-1x">
     <th:block th:switch="${paperStatus.name()}">
         <div th:case="'ATTENTION'">
-            <i class="fa fa-circle fa-stack-2x text-warning"></i>
+            <i class="fa fa-circle text-warning" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'DRAFT'">
-            <i class="fa fa-circle fa-stack-2x text-draft"></i>
+            <i class="fa fa-circle fa-stack-2x text-draft" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'ON_PREPARATION'">
-            <i class="fa fa-circle fa-stack-2x text-primary"></i>
+            <i class="fa fa-circle fa-stack-2x text-primary" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'ON_REVIEW'">
-            <i class="fa fa-circle fa-stack-2x text-review"></i>
+            <i class="fa fa-circle fa-stack-2x text-review" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'COMPLETED'">
-            <i class="fa fa-circle fa-stack-2x text-success"></i>
+            <i class="fa fa-circle fa-stack-2x text-success" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'FAILED'">
-            <i class="fa fa-circle fa-stack-2x text-failed"></i>
+            <i class="fa fa-circle fa-stack-2x text-failed" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'ACCEPTED'">
-            <i class="fa fa-circle fa-stack-2x text-accepted"></i>
+            <i class="fa fa-circle fa-stack-2x text-accepted" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         <div th:case="'NOT_ACCEPTED'">
-            <i class="fa fa-circle fa-stack-2x text-not-accepted"></i>
+            <i class="fa fa-circle fa-stack-2x text-not-accepted"
+               th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
         </div>
         </th:block>
-    <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+    <i class="fa fa-file-text-o fa-stack-1x fa-inverse" th:title="${title}"></i>
 </span>
 </body>
 </html>

src/main/resources/templates/papers/paper.html

@@ -87,14 +87,16 @@
 
                                         <div class="form-group">
                                             <label>Дедлайны:</label>
-                                            <div class="row" th:each="deadline, rowStat : *{deadlines}">
+                                            <div class="row deadline" th:each="deadline, rowStat : *{deadlines}">
                                                 <input type="hidden" th:field="*{deadlines[__${rowStat.index}__].id}"/>
                                                 <div class="col-6">
-                                                    <input type="date" class="form-control" name="deadline"
+                                                    <input type="date" class="form-control deadline-date"
+                                                           name="deadline"
                                                            th:field="*{deadlines[__${rowStat.index}__].date}"/>
                                                 </div>
                                                 <div class="col-4">
-                                                    <input class="form-control" type="text" placeholder="Описание"
+                                                    <input class="form-control deadline-desc" type="text"
+                                                           placeholder="Описание"
                                                            th:field="*{deadlines[__${rowStat.index}__].description}"/>
                                                 </div>
                                                 <div class="col-2">
@@ -234,7 +236,8 @@
                                                         </div>
                                                         <div class="form-group col-12">
                                                             <label class="col-4">Год издания:</label>
-                                                            <input type="number" class="form-control col-7 "
+                                                            <input type="number"
+                                                                   class="form-control col-7 publicationYear"
                                                                    name="publicationYear"
                                                                    th:field="*{references[__${rowStat.index}__].publicationYear}"/>
                                                         </div>
@@ -247,7 +250,8 @@
                                                         </div>
                                                         <div class="form-group col-12">
                                                             <label class="col-4">Страницы:</label>
-                                                            <input type="text" class="form-control col-7" name="pages"
+                                                            <input type="text" class="form-control col-7 pages"
+                                                                   name="pages"
                                                                    th:field="*{references[__${rowStat.index}__].pages}"/>
                                                         </div>
                                                         <div class="form-group col-12">
@@ -526,6 +530,7 @@
             }
         }
 
+
     </script>
     <script th:inline="javascript">
         /*<![CDATA[*/

src/main/resources/templates/projects/dashboard.html

@@ -17,6 +17,7 @@
                     <div th:replace="projects/fragments/projectDashboardFragment :: projectDashboard(project=${project})"/>
                 </th:block>
             </div>
+            <div th:replace="fragments/noRecordsFragment :: noRecords(entities=${projects}, noRecordsMessage=' одного проекта', url='project')"/>
         </div>
     </section>
 </div>

src/main/resources/templates/projects/fragments/projectFilesListFragment.html

@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8"/>
+</head>
+<body>
+<body>
+<div th:fragment="filesList">
+    <th:block th:each="file, rowStat : *{files}">
+
+        <div class="row" th:id="|files${rowStat.index}|"
+             th:style="${file.deleted} ? 'display: none;' :''">
+            <input type="hidden" th:field="*{files[__${rowStat.index}__].id}"/>
+            <input type="hidden"
+                   th:field="*{files[__${rowStat.index}__].deleted}"/>
+            <input type="hidden"
+                   th:field="*{files[__${rowStat.index}__].name}"/>
+            <input type="hidden"
+                   th:field="*{files[__${rowStat.index}__].tmpFileName}"/>
+            <div class="col-2">
+                <a class="btn btn-danger float-right"
+                   th:onclick="|$('#files${rowStat.index}\\.deleted').val('true'); $('#files${rowStat.index}').hide(); |">
+                    <span aria-hidden="true"><i class="fa fa-times"/></span>
+                </a>
+            </div>
+            <div class="col-10">
+                <a th:onclick="${file.id==null} ?  'downloadFile('+${file.tmpFileName}+',null,\''+${file.name}+'\')':
+                                                    'downloadFile(null,'+${file.id}+',\''+${file.name}+'\')' "
+                   href="javascript:void(0)"
+                   th:text="*{files[__${rowStat.index}__].name}">
+                </a>
+            </div>
+        </div>
+    </th:block>
+</div>
+</body>
+
+
+</body>
+</html>

src/main/resources/templates/projects/project.html

@@ -51,12 +51,18 @@
                                 </div>
 
                                 <div class="form-group">
-                                    <label for="createGrant">Добавить грант:</label>
+                                    <label>Добавить грант:</label>
-                                    <div th:if="*{grant} == null">
+                                    <div class="row">
-                                        <input type="submit" id="createGrant" name="createGrant" class="btn btn-primary"
+                                        <div class="col-10">
-                                               value="Добавить грант"/>
+                                            <select class="selectpicker form-control" data-live-search="true"
+                                                    title="-- Прикрепить грант --" id="allGrants"
+                                                    th:field="*{grantIds}" data-size="5">
+                                                <option th:each="grant : ${allGrants}" th:value="${grant.id}"
+                                                        th:text="${grant.title}"> Грант для прикрепления
+                                                </option>
+                                            </select>
+                                        </div>
                                     </div>
-                                    <input type="hidden" th:field="*{grant.id}"/>
                                 </div>
 
                                 <div class="form-group">
@@ -92,9 +98,11 @@
                                         </div>
                                         <div class="col-12" style="margin-bottom: 15px;"></div>
                                         <div class="col-10 div-deadline-executor">
-                                            <select class="selectpicker form-control" multiple="true" data-live-search="true"
+                                            <select class="selectpicker form-control" multiple="true"
+                                                    data-live-search="true"
                                                     title="-- Выберите исполнителя --" id="executors"
-                                                    th:field="*{deadlines[__${rowStat.index}__].executors}" data-size="5">
+                                                    th:field="*{deadlines[__${rowStat.index}__].executors}"
+                                                    data-size="5">
                                                 <option th:each="executors : ${allExecutors}" th:value="${executors.id}"
                                                         th:text="${executors.lastName}"> Участник
                                                 </option>
@@ -113,6 +121,13 @@
                                            value="Добавить дедлайн"/>
                                 </div>
 
+                                <div class="form-group files-list" id="files-list">
+                                    <label>Файлы:</label>
+
+                                    <div th:replace="projects/fragments/projectFilesListFragment"/>
+
+                                </div>
+
                                 <div class="form-group">
                                     <label for="loader">Загрузить файл:</label>
                                     <div id="loader">
@@ -148,17 +163,103 @@
             new FileLoader({
                 div: "loader",
                 url: urlFileUpload,
-                maxSize: 2,
+                maxSize: -1,
-                extensions: ["doc", "docx", "xls", "jpg", "png", "pdf", "txt"],
+                extensions: [],
                 callback: function (response) {
                     showFeedbackMessage("Файл успешно загружен");
                     console.debug(response);
+
+                    addNewFile(response, $("#files-list"));
                 }
             });
             $('.selectpicker').selectpicker();
         });
         /*]]>*/
+        function addNewFile(fileDto, listElement) {
+            var fileNumber = $('.files-list div.row').length;
 
+            var newFileRow = $("<div/>")
+                .attr("id", 'files' + fileNumber)
+                .addClass("row");
+
+            var idInput = $("<input/>")
+                .attr("type", "hidden")
+                .attr("id", "files" + fileNumber + ".id")
+                .attr("value", '')
+                .attr("name", "files[" + fileNumber + "].id");
+            newFileRow.append(idInput);
+
+            var flagInput = $("<input/>")
+                .attr("type", "hidden")
+                .attr("id", "files" + fileNumber + ".deleted")
+                .attr("value", "false")
+                .attr("name", "files[" + fileNumber + "].deleted");
+            newFileRow.append(flagInput);
+
+            var nameInput = $("<input/>")
+                .attr("type", "hidden")
+                .attr("id", "files" + fileNumber + ".name")
+                .attr("value", fileDto.fileName)
+                .attr("name", "files[" + fileNumber + "].name");
+            newFileRow.append(nameInput);
+
+            var tmpFileNameInput = $("<input/>")
+                .attr("type", "hidden")
+                .attr("id", "files" + fileNumber + ".tmpFileName")
+                .attr("value", fileDto.tmpFileName)
+                .attr("name", "files[" + fileNumber + "].tmpFileName");
+            newFileRow.append(tmpFileNameInput);
+
+            var nextDiv = $("<div/>")
+                .addClass("col-2");
+
+            var nextA = $("<a/>")
+                .addClass("btn btn-danger float-right")
+                .attr("onclick", "$('#files" + fileNumber + "\\\\.deleted').val('true'); $('#files" + fileNumber + "').hide();")
+                .append(($("<span/>").attr("aria-hidden", "true")).append($("<i/>").addClass("fa fa-times")))
+            ;
+            nextDiv.append(nextA)
+            newFileRow.append(nextDiv);
+
+            var nameDiv = $("<div/>")
+                .addClass("col-10")
+                .append($("<a/>").text(fileDto.fileName)
+                    .attr("href", 'javascript:void(0)')
+                    .attr("onclick", "downloadFile('" + fileDto.tmpFileName + "',null,'" + fileDto.fileName + "')"));
+            newFileRow.append(nameDiv);
+
+            listElement.append(newFileRow);
+
+        }
+
+        function downloadFile(tmpName, fileId, downloadName) {
+            let xhr = new XMLHttpRequest();
+            if (fileId != null) xhr.open('GET', urlFileDownload + fileId);
+            if (tmpName != null) xhr.open('GET', urlFileDownloadTmp + tmpName);
+            xhr.responseType = 'blob';
+
+            var formData = new FormData();
+            if (fileId != null) formData.append("file-id", fileId);
+            if (tmpName != null) formData.append("tmp-file-name", tmpName);
+
+            xhr.send(formData);
+
+            xhr.onload = function () {
+                if (this.status == 200) {
+                    console.debug(this.response);
+                    var blob = new Blob([this.response], {type: '*'});
+                    let a = document.createElement("a");
+                    a.style = "display: none";
+                    document.body.appendChild(a);
+                    let url = window.URL.createObjectURL(blob);
+                    a.href = url;
+                    a.download = downloadName;
+                    a.click();
+                    window.URL.revokeObjectURL(url);
+                } else {
+                }
+            }
+        }
 
     </script>
 </div>

src/main/resources/templates/projects/projects.html

@@ -24,6 +24,7 @@
                     </div>
                     <div class="col-md-3 col-sm-12">
                     </div>
+                    <div th:replace="fragments/noRecordsFragment :: noRecords(entities=${projects}, noRecordsMessage=' одного проекта', url='project')"/>
                 </div>
             </div>
         </section>

src/main/resources/templates/resetRequest.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml">
+      layout:decorator="default">
 <head>
     <script src="/js/users.js"></script>
     <link rel="stylesheet" href="../css/base.css"/>
@@ -35,7 +35,8 @@
                         <input type="text" name="email" id="resetKey" class="form-control"
                                placeholder="Код подтверждения" style="display:none"/>
                     </div>
-                    <div id="dvloader" class="loader" style="display:none"><img src="../img/main/ajax-loader.gif" /></div>
+                    <div id="dvloader" class="loader" style="display:none"><img src="../img/main/ajax-loader.gif"/>
+                    </div>
                     <button id="btnSend" type="button" onclick="requestResetPassword()"
                             class="btn btn-success btn-block">
                         Отправить код подтверждения

src/main/resources/templates/users/dashboard.html

@@ -29,6 +29,7 @@
             showFeedbackMessage(error, MessageTypesEnum.WARNING)
         });
         /*]]>*/
+
     </script>
 </div>
 </body>

src/main/resources/templates/users/fragments/userDashboardFragment.html

@@ -8,9 +8,13 @@
     <div class="row">
         <div class="col col-10">
             <input type="hidden" id="userId" th:value="${user.user.id}"/>
-            <b><p th:text="${user.user.lastName} + ' ' + ${user.user.firstName} + ' ' + ${user.user.patronymic}"></p></b>
+            <b><p th:text="${user.user.lastName} + ' ' + ${user.user.firstName} + ' ' + ${user.user.patronymic}"></p>
-            <i><p th:if="${user.conference != null}" th:text="'Сейчас на конференции ' + ${user.conference.title}"></p></i>
+            </b>
-            <i><p th:if="${user.lesson != null}" th:text="'Сейчас на паре ' + ${user.lesson.nameOfLesson} + ' в аудитории ' + ${user.lesson.room}"></p></i>
+            <i><p th:if="${user.conference != null}" th:text="'Сейчас на конференции ' + ${user.conference.title}"></p>
+            </i>
+            <i><p th:if="${user.lesson != null}"
+                  th:text="'Сейчас на паре ' + ${user.lesson.nameOfLesson} + ' в аудитории ' + ${user.lesson.room}"></p>
+            </i>
             <p th:if="${user.isOnline()}">Онлайн</p>
             <button onclick="blockUser()">Заблокировать</button>
         </div>

src/test/java/GrantTest.java

@@ -0,0 +1,225 @@
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import core.PageObject;
+import core.TestTemplate;
+import grant.GrantPage;
+import grant.GrantsDashboardPage;
+import grant.GrantsPage;
+import org.junit.Assert;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.openqa.selenium.WebElement;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import ru.ulstu.NgTrackerApplication;
+import ru.ulstu.configuration.ApplicationProperties;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(SpringRunner.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+public class GrantTest extends TestTemplate {
+    private final Map<PageObject, List<String>> navigationHolder = ImmutableMap.of(
+            new GrantsPage(), Arrays.asList("ГРАНТЫ", "/grants/grants"),
+            new GrantPage(), Arrays.asList("РЕДАКТИРОВАНИЕ ГРАНТА", "/grants/grant?id=0"),
+            new GrantsDashboardPage(), Arrays.asList("Гранты", "/grants/dashboard")
+    );
+
+    @Autowired
+    private ApplicationProperties applicationProperties;
+
+    @Test
+    public void aCreateNewGrant() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 1);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        GrantPage grantPage = (GrantPage) getContext().initPage(page.getKey());
+        GrantsPage grantsPage = (GrantsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 0).getKey());
+
+        String newGrantName = "test grant" + (new Date());
+        grantPage.setTitle(newGrantName);
+        String deadlineDate = new Date().toString();
+        String deadlineDescription = "test deadline description";
+        grantPage.setDeadline(deadlineDate, 0, deadlineDescription);
+        grantPage.setLeader();
+        grantPage.saveGrant();
+
+        Assert.assertTrue(grantsPage.findGrantByTitle(newGrantName));
+    }
+
+    @Test
+    public void bCreateBlankGrant() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 1);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        GrantPage grantPage = (GrantPage) getContext().initPage(page.getKey());
+
+        grantPage.saveGrant();
+
+        Assert.assertTrue(grantPage.checkBlankFields());
+    }
+
+    @Test
+    public void cUpdateGrantTitle() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey());
+        GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+
+        grantsPage.getFirstGrant();
+        String newGrantTitle = "test " + (new Date());
+        grantPage.setTitle(newGrantTitle);
+        grantPage.saveGrant();
+
+        Assert.assertTrue(grantsPage.findGrantByTitle(newGrantTitle));
+    }
+
+    @Test
+    public void dAttachPaper() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey());
+        GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+
+        grantsPage.getFirstGrant();
+        Integer countPapers = grantPage.getAttachedPapers().size();
+
+        Assert.assertEquals(countPapers + 1, grantPage.attachPaper().size());
+    }
+
+    @Test
+    public void eDeletePaper() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey());
+        GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+
+        grantsPage.getFirstGrant();
+        Integer oldCountPapers = grantPage.getAttachedPapers().size();
+        if (oldCountPapers == 0) {
+            oldCountPapers = grantPage.attachPaper().size();
+        }
+
+        Assert.assertEquals(oldCountPapers - 1, grantPage.deletePaper().size());
+    }
+
+    @Test
+    public void fAddDeadline() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey());
+        GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+
+        grantsPage.getFirstGrant();
+        String grantId = grantPage.getId();
+        Integer deadlineCount = grantPage.getDeadlineCount();
+
+        String description = "deadline test";
+        String date = "08.08.2019";
+        String dateValue = "2019-08-08";
+        grantPage.addDeadline();
+        grantPage.setDeadline(date, deadlineCount, description);
+        grantPage.saveGrant();
+
+        getContext().goTo(applicationProperties.getBaseUrl() + String.format("/grants/grant?id=%s", grantId));
+
+        Assert.assertTrue(grantPage.checkDeadline(description, dateValue));
+    }
+
+    @Test
+    public void gDeleteDeadline() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey());
+        GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+
+        grantsPage.getFirstGrant();
+        String grantId = grantPage.getId();
+        Integer deadlineCount = grantPage.getDeadlineCount();
+
+        grantPage.deleteDeadline();
+        grantPage.saveGrant();
+
+        getContext().goTo(applicationProperties.getBaseUrl() + String.format("/grants/grant?id=%s", grantId));
+        Integer newDeadlineCount = grantPage.getDeadlineCount();
+        Assert.assertEquals(deadlineCount - 1, (int) newDeadlineCount);
+    }
+
+    @Test
+    public void hAddAuthor() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey());
+        GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+
+        WebElement grant = grantsPage.getFirstGrantWithoutClick();
+        String grantTitle = grantsPage.getGrantTitle(grant);
+        Integer authorsCount = grantsPage.getAuthorsCount(grant);
+
+        grantsPage.getFirstGrant();
+        grantPage.addAuthor();
+        grantPage.saveGrant();
+
+        grant = grantsPage.getGrantByTitle(grantTitle);
+        Integer newAuthorsCount = grantsPage.getAuthorsCount(grant);
+
+        Assert.assertEquals(authorsCount + 1, (int) newAuthorsCount);
+    }
+
+    @Test
+    public void iDeleteAuthor() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey());
+        GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+
+        WebElement grant = grantsPage.getFirstGrantWithoutClick();
+        String grantTitle = grantsPage.getGrantTitle(grant);
+        Integer authorsCount = grantsPage.getAuthorsCount(grant);
+
+        grantsPage.getFirstGrant();
+        grantPage.deleteAuthor();
+        grantPage.saveGrant();
+
+        grant = grantsPage.getGrantByTitle(grantTitle);
+        Integer newAuthorsCount = grantsPage.getAuthorsCount(grant);
+
+        authorsCount = (authorsCount == 0) ? 0 : authorsCount - 1;
+
+        Assert.assertEquals((int) authorsCount, (int) newAuthorsCount);
+    }
+
+    @Test
+    public void jUpdateGrantDescription() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey());
+        GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+
+        String description = "newDescriptionForGrant";
+        grantsPage.getFirstGrant();
+        String grantId = grantPage.getId();
+        grantPage.setDescription(description);
+        grantPage.saveGrant();
+
+        getContext().goTo(applicationProperties.getBaseUrl() + String.format("/grants/grant?id=%s", grantId));
+
+        Assert.assertTrue(description.equals(grantPage.getDescription()));
+    }
+
+    @Test
+    public void kDeleteGrant() throws InterruptedException {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey());
+
+        Integer size = grantsPage.getGrantsList().size();
+        grantsPage.deleteFirst();
+        Assert.assertEquals(size - 1, grantsPage.getGrantsList().size());
+    }
+}

src/test/java/PaperTest.java

@@ -0,0 +1,247 @@
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import core.PageObject;
+import core.TestTemplate;
+import org.junit.Assert;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import paper.PaperPage;
+import paper.PapersDashboardPage;
+import paper.PapersPage;
+import ru.ulstu.NgTrackerApplication;
+import ru.ulstu.configuration.ApplicationProperties;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(SpringRunner.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+public class PaperTest extends TestTemplate {
+    private final Map<PageObject, List<String>> navigationHolder = ImmutableMap.of(
+            new PapersPage(), Arrays.asList("СТАТЬИ", "/papers/papers"),
+            new PaperPage(), Arrays.asList("РЕДАКТИРОВАНИЕ СТАТЬИ", "/papers/paper?id=0"),
+            new PapersDashboardPage(), Arrays.asList("СТАТЬИ", "/papers/dashboard")
+    );
+
+    @Autowired
+    private ApplicationProperties applicationProperties;
+
+    private String getPaperPageUrl() {
+        return Iterables.get(navigationHolder.entrySet(), 1).getValue().get(1);
+    }
+
+    private PaperPage getPaperPage() {
+        PaperPage paperPage = (PaperPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        paperPage.initElements();
+        return paperPage;
+    }
+
+    private String getPapersPageUrl() {
+        return Iterables.get(navigationHolder.entrySet(), 0).getValue().get(1);
+    }
+
+    private PapersPage getPapersPage() {
+        PapersPage papersPage = (PapersPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 0).getKey());
+        papersPage.initElements();
+        return papersPage;
+    }
+
+    private String getPapersDashboardPageUrl() {
+        return Iterables.get(navigationHolder.entrySet(), 2).getValue().get(1);
+    }
+
+    private PapersDashboardPage getPapersDashboardPage() {
+        PapersDashboardPage papersDashboardPage = (PapersDashboardPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 2).getKey());
+        papersDashboardPage.initElements();
+        return papersDashboardPage;
+    }
+
+    @Test
+    public void createNewPaperTest() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+        PaperPage paperPage = getPaperPage();
+
+        String testTitle = "test " + (String.valueOf(System.currentTimeMillis()));
+        fillRequiredFields(paperPage, testTitle);
+        paperPage.clickSaveBtn();
+
+        PapersPage papersPage = getPapersPage();
+
+        Assert.assertTrue(papersPage.havePaperWithTitle(testTitle));
+    }
+
+    @Test
+    public void editPaperTest() {
+        createNewPaper();
+        getContext().goTo(applicationProperties.getBaseUrl() + getPapersPageUrl());
+        PapersPage papersPage = getPapersPage();
+        papersPage.clickFirstPaper();
+
+        PaperPage paperPage = getPaperPage();
+        String testTitle = "test " + (String.valueOf(System.currentTimeMillis()));
+        paperPage.setTitle(testTitle);
+        paperPage.clickSaveBtn();
+
+        Assert.assertTrue(papersPage.havePaperWithTitle(testTitle));
+    }
+
+    private void createNewPaper() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+        PaperPage paperPage = getPaperPage();
+        String testTitle = "test " + (String.valueOf(System.currentTimeMillis()));
+        fillRequiredFields(paperPage, testTitle);
+        paperPage.clickSaveBtn();
+    }
+
+    @Test
+    public void addDeadlineTest() {
+        createNewPaper();
+        getContext().goTo(applicationProperties.getBaseUrl() + getPapersPageUrl());
+        PapersPage papersPage = getPapersPage();
+        papersPage.clickFirstPaper();
+
+        PaperPage paperPage = getPaperPage();
+        papersPage.clickAddDeadline();
+        String testDate = "01.01.2019";
+        String testDateResult = "2019-01-01";
+        String testDesc = "desc";
+        Integer deadlineNumber = 2;
+        paperPage.setDeadlineDate(deadlineNumber, testDate);
+        paperPage.setDeadlineDescription(deadlineNumber, testDesc);
+        String paperId = paperPage.getId();
+        paperPage.clickSaveBtn();
+
+        getContext().goTo(applicationProperties.getBaseUrl() + String.format("/papers/paper?id=%s", paperId));
+
+        Assert.assertTrue(paperPage.deadlineExist(testDesc, testDateResult));
+    }
+
+    @Test
+    public void noDeadlinesValidationTest() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+        PaperPage paperPage = getPaperPage();
+
+        String testTitle = "test " + (String.valueOf(System.currentTimeMillis()));
+        paperPage.setTitle(testTitle);
+        paperPage.clickSaveBtn();
+
+        Assert.assertTrue(paperPage.hasAlert("Не может быть пустым"));
+    }
+
+    private void fillRequiredFields(PaperPage paperPage, String title) {
+        paperPage.setTitle(title);
+        String testDate = "01.01.2019";
+        String testDesc = "desc";
+        Integer deadlineNumber = 1;
+        paperPage.setDeadlineDate(deadlineNumber, testDate);
+        paperPage.setDeadlineDescription(deadlineNumber, testDesc);
+    }
+
+    @Test
+    public void addReferenceTest() {
+        createNewPaper();
+        getContext().goTo(applicationProperties.getBaseUrl() + getPapersPageUrl());
+        PapersPage papersPage = getPapersPage();
+        papersPage.clickFirstPaper();
+
+        PaperPage paperPage = getPaperPage();
+        fillRequiredFields(paperPage, "test " + (String.valueOf(System.currentTimeMillis())));
+        paperPage.clickReferenceTab();
+        paperPage.clickAddReferenceButton();
+
+        paperPage.clickReferenceTab();
+        paperPage.showFirstReference();
+        String authors = "testAuthors";
+        paperPage.setFirstReferenceAuthors(authors);
+
+        String paperId = paperPage.getId();
+        paperPage.clickSaveBtn();
+
+        getContext().goTo(applicationProperties.getBaseUrl() + String.format("/papers/paper?id=%s", paperId));
+
+        Assert.assertTrue(paperPage.authorsExists(authors));
+    }
+
+    @Test
+    public void referencesFormatTest() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+
+        PaperPage paperPage = getPaperPage();
+        paperPage.setTitle("test");
+        paperPage.clickReferenceTab();
+        paperPage.clickAddReferenceButton();
+
+        paperPage.clickReferenceTab();
+        paperPage.showFirstReference();
+        paperPage.setFirstReferenceAuthors("authors");
+        paperPage.setFirstReferencePublicationTitle("title");
+        paperPage.setFirstReferencePublicationYear("2010");
+        paperPage.setFirstReferencePublisher("publisher");
+        paperPage.setFirstReferencePages("200");
+        paperPage.setFirstReferenceJournalOrCollectionTitle("journal");
+        paperPage.setFormatStandardSpringer();
+        paperPage.clickFormatButton();
+
+        Assert.assertEquals("authors (2010) title. journal, publisher, pp 200", paperPage.getFormatString());
+    }
+
+    @Test
+    public void dashboardLinkTest() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+        PaperPage paperPage = getPaperPage();
+
+        fillRequiredFields(paperPage, "test " + (String.valueOf(System.currentTimeMillis())));
+        String testLink = "http://test.com/";
+        paperPage.setUrl(testLink);
+        paperPage.clickSaveBtn();
+
+        getContext().goTo(applicationProperties.getBaseUrl() + getPapersDashboardPageUrl());
+        PapersDashboardPage papersDashboardPage = getPapersDashboardPage();
+
+        Assert.assertTrue(papersDashboardPage.externalLinkExists(testLink));
+    }
+
+    @Test
+    public void deletePaperTest() {
+        createNewPaper();
+        getContext().goTo(applicationProperties.getBaseUrl() + getPapersPageUrl());
+        PapersPage papersPage = getPapersPage();
+
+        int size = papersPage.getPapersCount();
+        papersPage.clickRemoveFirstPaperButton();
+        papersPage.clickConfirmDeleteButton();
+
+        Assert.assertEquals(size - 1, papersPage.getPapersCount());
+    }
+
+    @Test
+    public void latexValidationTest() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+
+        PaperPage paperPage = getPaperPage();
+        paperPage.setTitle("test");
+        paperPage.clickLatexTab();
+        paperPage.setLatexText("test");
+        paperPage.clickPdfButton();
+
+        Assert.assertTrue(paperPage.dangerMessageExist("Ошибка при создании PDF"));
+    }
+
+    @Test
+    public void titleValidationTest() {
+        getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl());
+        PaperPage paperPage = getPaperPage();
+
+        paperPage.clickSaveBtn();
+
+        Assert.assertTrue(paperPage.hasAlert("не может быть пусто"));
+    }
+
+}

src/test/java/ProjectTest.java

@@ -0,0 +1,174 @@
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import core.PageObject;
+import core.TestTemplate;
+import org.junit.Assert;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import project.ProjectDashboard;
+import project.ProjectPage;
+import project.ProjectsPage;
+import ru.ulstu.NgTrackerApplication;
+import ru.ulstu.configuration.ApplicationProperties;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(SpringRunner.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+public class ProjectTest extends TestTemplate {
+    private final Map<PageObject, List<String>> navigationHolder = ImmutableMap.of(
+            new ProjectPage(), Arrays.asList("ПРОЕКТЫ", "/projects/projects"),
+            new ProjectsPage(), Arrays.asList("РЕДАКТИРОВАНИЕ ПРОЕКТА", "/projects/project?id=0"),
+            new ProjectDashboard(), Arrays.asList("ПРОЕКТЫ", "/projects/dashboard")
+    );
+
+    @Autowired
+    private ApplicationProperties applicationProperties;
+
+    @Test
+    public void testACreateNewProject() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 1);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(page.getKey());
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 0).getKey());
+        String name = "Project " + (new Date()).getTime();
+        String date = "01.01.2019";
+        Integer deadNum = projectPage.getDeadlineCount();
+        projectPage.setName(name);
+        projectPage.clickAddDeadline();
+        projectPage.addDeadlineDate(date, deadNum);
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testBChangeNameAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = "Project " + (new Date()).getTime();
+        projectPage.clearName();
+        projectPage.setName(name);
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testCChangeDeadlineAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        String date = "01.01.2019";
+        Integer deadNum = projectPage.getDeadlineCount();
+        projectPage.addDeadlineDate(date, deadNum);
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testDSetStatusAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        projectPage.setStatus();
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testEAddDescriptionAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        String description = "Description " + (new Date()).getTime();
+        projectPage.addDescription(description);
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testFAddLinkAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        String link = "Link " + (new Date()).getTime();
+        projectPage.addLink(link);
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testGAddDeadlineDescriptionAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        String deadDesc = "Description " + (new Date()).getTime();
+        projectPage.addDeadlineDescription(deadDesc);
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testHSetDeadlineCompletionAndSave() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        projectPage.setDeadlineCompletion();
+        projectPage.clickSave();
+        Assert.assertTrue(projectsPage.checkNameInList(name));
+    }
+
+    @Test
+    public void testIDeleteDeadline() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        projectPage.clickDeleteDeadline();
+        Assert.assertTrue(projectPage.getDeadlineCount() == 0);
+    }
+
+    @Test
+    public void testJDeleteProject() {
+        Map.Entry<PageObject, List<String>> page = Iterables.get(navigationHolder.entrySet(), 0);
+        getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
+        ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey());
+        ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey());
+        projectsPage.getFirstProject();
+        String name = projectPage.getName();
+        projectPage.clickSave();
+        projectsPage.deleteFirst();
+        projectsPage.clickConfirm();
+        Assert.assertFalse(projectsPage.checkNameInList(name));
+    }
+}

src/test/java/core/PageObject.java

@@ -2,16 +2,24 @@ package core;
 
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.ui.WebDriverWait;
 
 public abstract class PageObject {
     protected WebDriver driver;
     protected JavascriptExecutor js;
+    protected WebDriverWait waiter;
 
     public abstract String getSubTitle();
 
     public PageObject setDriver(WebDriver driver) {
         this.driver = driver;
         js = (JavascriptExecutor) driver;
+        waiter = new WebDriverWait(driver, 10);
         return this;
     }
+
+    public void initElements() {
+        PageFactory.initElements(driver, this);
+    }
 }

src/test/java/grant/GrantPage.java

@@ -0,0 +1,149 @@
+package grant;
+
+import core.PageObject;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.Select;
+
+import java.util.List;
+
+public class GrantPage extends PageObject {
+    @Override
+    public String getSubTitle() {
+        return driver.findElement(By.tagName("h2")).getText();
+    }
+
+    public String getId() {
+        return driver.findElement(By.id("id")).getAttribute("value");
+    }
+
+    public void setTitle(String name) {
+        driver.findElement(By.id("title")).clear();
+        driver.findElement(By.id("title")).sendKeys(name);
+    }
+
+    public String getTitle() {
+        return driver.findElement(By.id("title")).getAttribute("value");
+    }
+
+    public void setDeadline(String date, Integer i, String description) {
+        driver.findElement(By.id(String.format("deadlines%d.date", i))).sendKeys(date);
+        driver.findElement(By.id(String.format("deadlines%d.description", i))).sendKeys(description);
+    }
+
+    public void setLeader() {
+        WebElement webElement = driver.findElement(By.id("leaderId"));
+        Select selectLeader = new Select(webElement);
+        selectLeader.selectByVisibleText("Романов");
+    }
+
+    public void saveGrant() {
+        driver.findElement(By.id("sendMessageButton")).click();
+    }
+
+    public boolean checkBlankFields() {
+        return driver.findElements(By.className("alert-danger")).size() > 0;
+    }
+
+    public List<WebElement> getAttachedPapers() {
+        try {
+            return driver.findElement(By.className("div-selected-papers")).findElements(By.tagName("div"));
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+
+    public List<WebElement> attachPaper() {
+        WebElement selectPapers = driver.findElement(By.id("allPapers"));
+        Select select = new Select(selectPapers);
+        List<WebElement> selectedOptions = select.getAllSelectedOptions();
+        List<WebElement> allOptions = select.getOptions();
+        if (selectedOptions.size() >= allOptions.size()) {
+            for (int i = 0; i < allOptions.size(); i++) {
+                if (!allOptions.get(i).equals(selectedOptions.get(i))) {
+                    select.selectByVisibleText(allOptions.get(i).getText());
+                    selectedOptions.add(allOptions.get(i));
+                    return selectedOptions;
+                }
+            }
+        } else {
+            select.selectByVisibleText(allOptions.get(0).getText());
+            selectedOptions.add(allOptions.get(0));
+            return selectedOptions;
+        }
+        return null;
+    }
+
+    public List<WebElement> deletePaper() {
+        WebElement selectPapers = driver.findElement(By.id("allPapers"));
+        Select select = new Select(selectPapers);
+        select.deselectByVisibleText(select.getFirstSelectedOption().getText());
+        return select.getAllSelectedOptions();
+    }
+
+    public List<WebElement> getDeadlineList() {
+        return driver.findElements(By.id("deadlines"));
+    }
+
+    public Integer getDeadlineCount() {
+        return getDeadlineList().size();
+    }
+
+    public void addDeadline() {
+        driver.findElement(By.id("addDeadline")).click();
+    }
+
+    public boolean checkDeadline(String description, String dateValue) {
+        return getDeadlineList()
+                .stream()
+                .anyMatch(webElement -> {
+                    return webElement.findElement(By.className("div-deadline-description")).findElement(
+                            By.tagName("input")).getAttribute("value").equals(description)
+                            && webElement.findElement(By.className("form-deadline-date")).getAttribute("value").equals(dateValue);
+                });
+    }
+
+    public void deleteDeadline() {
+        driver.findElements(By.className("btn-delete-deadline")).get(0).click();
+    }
+
+    public List<WebElement> addAuthor() {
+        WebElement selectAuthors = driver.findElement(By.id("authors"));
+        Select select = new Select(selectAuthors);
+        List<WebElement> selectedOptions = select.getAllSelectedOptions();
+        List<WebElement> allOptions = select.getOptions();
+        int i = 0;
+        while (i < selectedOptions.size()) {
+            if (!allOptions.get(i).equals(selectedOptions.get(i))) {
+                select.selectByVisibleText(allOptions.get(i).getText());
+                selectedOptions.add(allOptions.get(i));
+                return selectedOptions;
+            } else {
+                i++;
+            }
+        }
+        if (selectedOptions.size() != allOptions.size()) {
+            select.selectByVisibleText(allOptions.get(i).getText());
+            selectedOptions.add(allOptions.get(i));
+        }
+        return selectedOptions;
+    }
+
+    public void deleteAuthor() {
+        WebElement selectAuthors = driver.findElement(By.id("authors"));
+        Select select = new Select(selectAuthors);
+        List<WebElement> selectedOptions = select.getAllSelectedOptions();
+        if (selectedOptions.size() != 0) {
+            select.deselectByVisibleText(selectedOptions.get(0).getText());
+        }
+    }
+
+    public void setDescription(String description) {
+        driver.findElement(By.id("comment")).clear();
+        driver.findElement(By.id("comment")).sendKeys(description);
+    }
+
+    public String getDescription() {
+        return driver.findElement(By.id("comment")).getText();
+    }
+}

src/test/java/grant/GrantsDashboardPage.java

@@ -0,0 +1,11 @@
+package grant;
+
+import core.PageObject;
+import org.openqa.selenium.By;
+
+public class GrantsDashboardPage extends PageObject {
+    @Override
+    public String getSubTitle() {
+        return driver.findElement(By.tagName("h2")).getText();
+    }
+}

src/test/java/grant/GrantsPage.java

@@ -0,0 +1,66 @@
+package grant;
+
+import core.PageObject;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+
+public class GrantsPage extends PageObject {
+    @Override
+    public String getSubTitle() {
+        return driver.findElement(By.tagName("h2")).getText();
+    }
+
+    public List<WebElement> getGrantsList() {
+        return driver.findElements(By.className("grant-row"));
+    }
+
+    public boolean findGrantByTitle(String grantTitle) {
+        return getGrantsList()
+                .stream()
+                .map(el -> el.findElement(By.cssSelector("span.h6")))
+                .anyMatch(webElement -> webElement.getText().equals(grantTitle));
+    }
+
+    public void deleteFirst() throws InterruptedException {
+        WebElement findDeleteButton = driver.findElement(By.xpath("//*[@id=\"grants\"]/div/div[2]/div[1]/div[1]/div"));
+        findDeleteButton.click();
+        Thread.sleep(3000);
+        WebElement grant = driver.findElement(By.xpath("//*[@id=\"grants\"]/div/div[2]/div[1]/div[1]/div/a[2]"));
+        grant.click();
+        WebElement ok = driver.findElement(By.id("dataConfirmOK"));
+        ok.click();
+    }
+
+    public void getFirstGrant() {
+        driver.findElement(By.xpath("//*[@id=\"grants\"]/div/div[2]/div[1]/div[1]/div/a[1]")).click();
+    }
+
+    public WebElement getFirstGrantWithoutClick() {
+        return driver.findElement(By.xpath("//*[@id=\"grants\"]/div/div[2]/div[1]/div[1]"));
+    }
+
+    public String getGrantTitle(WebElement webElement) {
+        return webElement.findElement(By.cssSelector("span.h6")).getText();
+    }
+
+    public WebElement getGrantByTitle(String title) {
+        List<WebElement> list = getGrantsList();
+        for (int i = 0; i < list.size(); i++) {
+            if (getGrantTitle(list.get(i)).equals(title)) {
+                return list.get(i);
+            }
+        }
+        return null;
+    }
+
+    public Integer getAuthorsCount(WebElement webElement) {
+        String authors = webElement.findElement(By.className("text-muted")).getText();
+        if (!authors.equals("")) {
+            String[] mas = authors.split(",");
+            return mas.length;
+        }
+        return 0;
+    }
+}

src/test/java/paper/PaperPage.java

@@ -2,10 +2,216 @@ package paper;
 
 import core.PageObject;
 import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.Select;
+
+import java.util.List;
 
 public class PaperPage extends PageObject {
 
+    @FindBy(id = "title")
+    private WebElement titleInput;
+
+    @FindBy(id = "sendMessageButton")
+    private WebElement sendMessageButton;
+
+    @FindBy(id = "id")
+    private WebElement idInput;
+
+    @FindBy(css = "#messages .alert-danger span")
+    private WebElement dangerMessage;
+
+    @FindBy(className = "deadline")
+    private List<WebElement> deadlines;
+
+    @FindBy(className = "deadline-date")
+    private List<WebElement> deadlineDates;
+
+    @FindBy(className = "deadline-desc")
+    private List<WebElement> deadlineDescs;
+
+    @FindBy(css = ".alert.alert-danger")
+    private List<WebElement> dangerAlerts;
+
+    @FindBy(className = "collapse-heading")
+    private WebElement firstCollapsedLink;
+
+    @FindBy(id = "nav-references-tab")
+    private WebElement referenceTab;
+
+    @FindBy(id = "nav-latex-tab")
+    private WebElement latexTab;
+
+    @FindBy(id = "latex-text")
+    private WebElement latexTextarea;
+
+    @FindBy(id = "addReference")
+    private WebElement addReferenceButton;
+
+    @FindBy(css = "input.author ")
+    private WebElement firstAuthorInput;
+
+    @FindBy(css = "input.publicationTitle")
+    private WebElement firstPublicationTitleInput;
+
+    @FindBy(css = "input.publicationYear")
+    private WebElement firstPublicationYearInput;
+
+    @FindBy(css = "input.publisher")
+    private WebElement firstPublisherInput;
+
+    @FindBy(css = "input.pages")
+    private WebElement firstPagesInput;
+
+    @FindBy(css = "input.journalOrCollectionTitle")
+    private WebElement firstJournalOrCollectionTitleInput;
+
+    @FindBy(id = "formatBtn")
+    private WebElement formatButton;
+
+    @FindBy(id = "formattedReferencesArea")
+    private WebElement formatArea;
+
+    @FindBy(id = "url")
+    private WebElement urlInput;
+
+    @FindBy(id = "pdfBtn")
+    private WebElement pdfButton;
+
+    @FindBy(css = "input.author ")
+    private List<WebElement> authorInputs;
+
     public String getSubTitle() {
         return driver.findElement(By.tagName("h2")).getText();
     }
+
+    public void clickReferenceTab() {
+        js.executeScript("document.getElementById('nav-references-tab').scrollIntoView(false);");
+        referenceTab.click();
+    }
+
+    public void clickLatexTab() {
+        latexTab.click();
+    }
+
+    public void showFirstReference() {
+        waiter.until(ExpectedConditions.elementToBeClickable(firstCollapsedLink));
+        firstCollapsedLink.click();
+    }
+
+    public void clickAddReferenceButton() {
+        js.executeScript("arguments[0].click()", addReferenceButton);
+    }
+
+    public void clickFormatButton() {
+        formatButton.click();
+    }
+
+    public void clickPdfButton() {
+        pdfButton.click();
+    }
+
+    public void setTitle(String title) {
+        titleInput.clear();
+        titleInput.sendKeys(title);
+    }
+
+    public void setLatexText(String text) {
+        waiter.until(ExpectedConditions.visibilityOf(latexTextarea));
+        latexTextarea.clear();
+        latexTextarea.sendKeys(text);
+    }
+
+    public void setFirstReferenceAuthors(String authors) {
+        waiter.until(ExpectedConditions.visibilityOf(firstAuthorInput));
+
+        firstAuthorInput.clear();
+        firstAuthorInput.sendKeys(authors);
+    }
+
+    public void setFirstReferencePublicationTitle(String title) {
+        firstPublicationTitleInput.clear();
+        firstPublicationTitleInput.sendKeys(title);
+    }
+
+    public void setFirstReferencePublicationYear(String year) {
+        firstPublicationYearInput.clear();
+        firstPublicationYearInput.sendKeys(year);
+    }
+
+    public void setFirstReferencePublisher(String publisher) {
+        firstPublisherInput.clear();
+        firstPublisherInput.sendKeys(publisher);
+    }
+
+    public void setFirstReferencePages(String pages) {
+        firstPagesInput.clear();
+        firstPagesInput.sendKeys(pages);
+    }
+
+    public void setFirstReferenceJournalOrCollectionTitle(String journal) {
+        firstJournalOrCollectionTitleInput.clear();
+        firstJournalOrCollectionTitleInput.sendKeys(journal);
+    }
+
+    public void setUrl(String url) {
+        urlInput.clear();
+        urlInput.sendKeys(url);
+    }
+
+    public void setFormatStandardSpringer() {
+        Select standards = new Select(driver.findElement(By.id("formatStandard")));
+        standards.selectByValue("SPRINGER");
+    }
+
+    public void setDeadlineDate(Integer deadlineNumber, String date) {
+        deadlineDates.get(deadlineNumber - 1).sendKeys(date);
+    }
+
+    public void setDeadlineDescription(Integer deadlineNumber, String desc) {
+        deadlineDescs.get(deadlineNumber - 1).clear();
+        deadlineDescs.get(deadlineNumber - 1).sendKeys(desc);
+    }
+
+    public boolean hasAlert(String alertMessage) {
+        return dangerAlerts
+                .stream()
+                .anyMatch(
+                        webElement -> webElement.getText().contains(alertMessage));
+    }
+
+    public void clickSaveBtn() {
+        sendMessageButton.click();
+    }
+
+    public String getId() {
+        return idInput.getAttribute("value");
+    }
+
+    public String getFormatString() {
+        waiter.until(ExpectedConditions.attributeToBeNotEmpty(formatArea, "value"));
+        return formatArea.getAttribute("value");
+    }
+
+    public boolean deadlineExist(String desc, String date) {
+        return deadlines
+                .stream()
+                .anyMatch(
+                        webElement -> webElement.findElement(By.className("deadline-desc")).getAttribute("value").equals(desc)
+                                && webElement.findElement(By.className("deadline-date")).getAttribute("value").equals(date));
+    }
+
+    public boolean authorsExists(String authors) {
+        return authorInputs
+                .stream()
+                .anyMatch(
+                        webElement -> webElement.getAttribute("value").equals(authors));
+    }
+
+    public boolean dangerMessageExist(String message) {
+        waiter.until(ExpectedConditions.visibilityOf(dangerMessage));
+        return dangerMessage.getText().equals(message);
+    }
 }

src/test/java/paper/PapersDashboardPage.java

@@ -2,10 +2,23 @@ package paper;
 
 import core.PageObject;
 import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+
+import java.util.List;
 
 public class PapersDashboardPage extends PageObject {
+    @FindBy(className = "externalLink")
+    private List<WebElement> externalLinks;
 
     public String getSubTitle() {
         return driver.findElement(By.tagName("h2")).getText();
     }
+
+    public boolean externalLinkExists(String link) {
+        return externalLinks
+                .stream()
+                .anyMatch(
+                        webElement -> webElement.getAttribute("href").equals(link));
+    }
 }

src/test/java/paper/PapersPage.java

@@ -2,10 +2,60 @@ package paper;
 
 import core.PageObject;
 import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+
+import java.util.List;
 
 public class PapersPage extends PageObject {
+    @FindBy(css = ".paper-row .h6")
+    private List<WebElement> paperTitles;
+
+    @FindBy(className = "paper-row")
+    private List<WebElement> paperItems;
+
+    @FindBy(className = "remove-paper")
+    private WebElement removeFirstPaperButton;
+
+    @FindBy(id = "dataConfirmOK")
+    private WebElement confirmDeleteButton;
+
+    @FindBy(id = "addDeadline")
+    private WebElement addDeadlineButton;
+
+    @FindBy(css = ".paper-row a:nth-child(2)")
+    private WebElement firstPaper;
 
     public String getSubTitle() {
         return driver.findElement(By.tagName("h2")).getText();
     }
+
+    public void clickFirstPaper() {
+        firstPaper.click();
+    }
+
+    public void clickAddDeadline() {
+        addDeadlineButton.click();
+    }
+
+    public void clickRemoveFirstPaperButton() {
+        js.executeScript("arguments[0].click()", removeFirstPaperButton);
+    }
+
+    public void clickConfirmDeleteButton() {
+        waiter.until(ExpectedConditions.visibilityOf(confirmDeleteButton));
+        confirmDeleteButton.click();
+    }
+
+    public boolean havePaperWithTitle(String title) {
+        return paperTitles
+                .stream()
+                .anyMatch(webElement -> webElement.getText().equals(title));
+    }
+
+    public int getPapersCount() {
+        return paperItems.size();
+    }
+
 }

src/test/java/project/ProjectDashboard.java

@@ -0,0 +1,11 @@
+package project;
+
+import core.PageObject;
+import org.openqa.selenium.By;
+
+public class ProjectDashboard extends PageObject {
+
+    public String getSubTitle() {
+        return driver.findElement(By.tagName("h2")).getText();
+    }
+}

src/test/java/project/ProjectPage.java

@@ -0,0 +1,141 @@
+package project;
+
+import core.PageObject;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+
+public class ProjectPage extends PageObject {
+
+    public String getSubTitle() {
+        return driver.findElement(By.tagName("h3")).getText();
+    }
+
+    public String getId() {
+        return driver.findElement(By.id("id")).getAttribute("value");
+    }
+
+    public void setName(String name) {
+        driver.findElement(By.id("title")).sendKeys(name);
+    }
+
+    public String getName() {
+        return driver.findElement(By.id("title")).getAttribute("value");
+    }
+
+    public void clearName() {
+        driver.findElement(By.id("title")).clear();
+    }
+
+    public void clickSave() {
+        driver.findElement(By.id("sendMessageButton")).click();
+    }
+
+    public void clickAddDeadline() {
+        driver.findElement(By.id("addDeadline")).click();
+    }
+
+    public void addDeadlineDate(String deadDate, Integer deadNum) {
+        driver.findElement(By.id(String.format("deadlines%d.date", deadNum))).sendKeys(deadDate);
+    }
+
+    public void addDeadlineDescription(String description) {
+        driver.findElement(By.id("deadlines0.description")).sendKeys(description);
+    }
+
+    public void setDeadlineCompletion() {
+        driver.findElement(By.id("deadlines0.done1")).click();
+    }
+
+    public void setStatus() {
+        driver.findElement(By.id("status")).click();
+        getFirstStatus();
+    }
+
+    public void getFirstStatus() {
+        driver.findElement(By.xpath("//*[@id=\"status\"]/option[1]")).click();
+    }
+
+    public void addDescription(String description) {
+        driver.findElement(By.id("description")).sendKeys(description);
+    }
+
+    public void addLink(String link) {
+        driver.findElement(By.id("repository")).sendKeys(link);
+    }
+
+    public List<WebElement> getDeadlineList() {
+        return driver.findElements(By.className("deadline"));
+    }
+
+    public Integer getDeadlineCount() {
+        return driver.findElements(By.className("deadline")).size();
+    }
+
+    public void setExecutors() {
+        driver.findElement(By.id("status")).click();
+        getFirstExecutor();
+    }
+
+    public void getFirstExecutor() {
+        driver.findElement(By.xpath("//*[@id=\"status\"]/option[1]")).click();
+    }
+
+    public void setDeadlineDescription(String description, Integer i) {
+        driver.findElement(By.id(String.format("deadlines%d.description", i))).sendKeys(description);
+    }
+
+    public void setDeadlineDate(String date, Integer i) {
+        driver.findElement(By.id(String.format("deadlines%d.date", i))).sendKeys(date);
+    }
+
+    public Boolean isTakePartButDisabledValueTrue() {
+        return driver.findElement(By.id("take-part")).getAttribute("disabled").equals("true");
+    }
+
+    public Integer getMemberCount() {
+        return driver.findElements(By.className("member")).size();
+    }
+
+    public void clickDeleteDeadline() {
+        driver.findElement(By.className("btn-danger")).click();
+    }
+
+    public void showAllowToAttachArticles() {
+        driver.findElement(By.cssSelector("button[data-id=\"paperIds\"]")).click();
+    }
+
+    public void clickAddPaperBut() {
+        driver.findElement(By.id("add-paper")).click();
+    }
+
+
+    public List<WebElement> getArticles() {
+        return driver.findElements(By.className("paper"));
+    }
+
+    public Integer getArticlesCount() {
+        return driver.findElements(By.className("paper")).size();
+    }
+
+    public WebElement selectArticle() {
+        WebElement webElement = driver.findElement(By.xpath("//*[@id=\"project-form\"]/div/div[2]/div[5]/div/div/div[2]/ul/li[1]/a"));
+        webElement.click();
+        return webElement;
+    }
+
+    public void clickUndockArticleBut() {
+        driver.findElement(By.name("removePaper")).click();
+    }
+
+    public boolean checkDeadline(String description, String dateValue) {
+        return getDeadlineList()
+                .stream()
+                .anyMatch(webElement -> {
+                    return webElement.findElement(By.className("deadline-text")).getAttribute("value").equals(description)
+                            && webElement.findElement(By.cssSelector("input[type=\"date\"]")).getAttribute("value").equals(dateValue);
+                });
+    }
+
+}

src/test/java/project/ProjectsPage.java

@@ -0,0 +1,41 @@
+package project;
+
+import core.PageObject;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+
+public class ProjectsPage extends PageObject {
+
+    public String getSubTitle() {
+        return driver.findElement(By.tagName("h2")).getText();
+    }
+
+    public List<WebElement> getProjectsList() {
+        return driver.findElements(By.cssSelector("span.h6"));
+    }
+
+    public void getFirstProject() {
+        driver.findElement(By.xpath("//*[@id=\"projects\"]/div/div[2]/div[1]/div[1]/div/a")).click();
+    }
+
+    public void selectMember() {
+        driver.findElements(By.className("bootstrap-select")).get(0).findElement(By.className("btn")).click();
+        driver.findElements(By.className("bootstrap-select")).get(0).findElements(By.className("dropdown-item")).get(1).click();
+    }
+
+    public void deleteFirst() {
+        js.executeScript("$('a[data-confirm]').click();");
+    }
+
+    public void clickConfirm() {
+        driver.findElement(By.id("dataConfirmOK")).click();
+    }
+
+    public boolean checkNameInList(String newProjectName) {
+        return getProjectsList()
+                .stream()
+                .anyMatch(webElement -> webElement.getText().equals(newProjectName));
+    }
+}

src/test/java/ru/ulstu/project/service/ProjectServiceTest.java

@@ -0,0 +1,151 @@
+package ru.ulstu.project.service;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.deadline.service.DeadlineService;
+import ru.ulstu.file.model.FileData;
+import ru.ulstu.file.service.FileService;
+import ru.ulstu.grant.model.GrantDto;
+import ru.ulstu.grant.service.GrantService;
+import ru.ulstu.project.model.Project;
+import ru.ulstu.project.model.ProjectDto;
+import ru.ulstu.project.repository.ProjectRepository;
+import ru.ulstu.timeline.service.EventService;
+import ru.ulstu.user.model.User;
+import ru.ulstu.user.service.UserService;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ProjectServiceTest {
+
+    @Mock
+    ProjectRepository projectRepository;
+
+    @Mock
+    DeadlineService deadlineService;
+
+    @Mock
+    EventService eventService;
+
+    @Mock
+    FileService fileService;
+
+    @Mock
+    UserService userService;
+
+    @Mock
+    GrantService grantService;
+
+    @InjectMocks
+    ProjectService projectService;
+
+    private final static String TITLE = "title";
+    private final static String DESCR = "descr";
+    private final static Integer ID = 1;
+    private final static Integer INDEX = 0;
+    private final static String NAME = "name";
+
+    private List<Project> projects;
+    private Project project;
+    private ProjectDto projectDto;
+    private Deadline deadline;
+    private List<Deadline> deadlines;
+    private FileData file;
+    private List<FileData> files;
+    private User user;
+    private GrantDto grant;
+    private List<GrantDto> grants;
+
+    @Before
+    public void setUp() throws Exception {
+        projects = new ArrayList<>();
+        project = new Project();
+
+        projects.add(project);
+        projectDto = new ProjectDto(project);
+
+        deadlines = new ArrayList<>();
+        deadline = new Deadline(new Date(), DESCR);
+        deadline.setId(ID);
+        deadlines.add(deadline);
+
+        user = new User();
+        user.setFirstName(NAME);
+
+        grants = new ArrayList<>();
+        grant = new GrantDto();
+        grant.setId(ID);
+        grants.add(grant);
+    }
+
+    @Test
+    public void findAll() {
+        when(projectRepository.findAll()).thenReturn(projects);
+        assertEquals(projects, projectService.findAll());
+    }
+
+    @Test
+    public void create() throws IOException {
+        when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines);
+        when(projectRepository.save(new Project())).thenReturn(project);
+        eventService.createFromObject(new Project(), Collections.emptyList(), false, "проекта");
+
+        projectDto.setTitle(TITLE);
+        projectDto.setDeadlines(deadlines);
+
+        project.setId(ID);
+        project.setTitle(TITLE);
+        project.setDescription(DESCR);
+        project.setDeadlines(deadlines);
+        project.setFiles(files);
+
+        assertEquals(project.getId(), (projectService.create(projectDto)).getId());
+    }
+
+    @Test
+    public void delete() throws IOException {
+        when(projectRepository.exists(ID)).thenReturn(true);
+        when(projectRepository.findOne(ID)).thenReturn(project);
+
+        assertTrue(projectService.delete(ID));
+    }
+
+    @Test
+    public void getProjectExecutors() {
+        List<User> executors = Collections.singletonList(user);
+        when(userService.findAll()).thenReturn(executors);
+
+        assertEquals(executors, projectService.getProjectExecutors(projectDto));
+    }
+
+    @Test
+    public void findById() {
+        when(projectRepository.findOne(ID)).thenReturn(project);
+        assertEquals(project, projectService.findById(ID));
+    }
+
+    @Test
+    public void removeDeadline() throws IOException {
+        ProjectDto newProjectDto = new ProjectDto();
+        newProjectDto.getRemovedDeadlineIds().add(INDEX);
+        projectDto.getDeadlines().add(deadline);
+        ProjectDto result = projectService.removeDeadline(projectDto, INDEX);
+
+        assertEquals(newProjectDto.getDeadlines(), result.getDeadlines());
+        assertEquals(newProjectDto.getRemovedDeadlineIds(), result.getRemovedDeadlineIds());
+    }
+}

src/test/java/ru/ulstu/students/service/TaskServiceTest.java

@@ -136,7 +136,7 @@ public class TaskServiceTest {
         when(tagService.saveOrCreate(new ArrayList<>())).thenReturn(tags);
         when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines);
         when(taskRepository.save(new Task())).thenReturn(task);
-        eventService.createFromTask(new Task());
+        eventService.createFromObject(new Task(), Collections.emptyList(), true, "задачи");
 
         taskDto.setTags(tags);
         taskDto.setDeadlines(deadlines);