.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: romanov73/is:ng-tracker-container-11
+image: romanov73/is:ng-tracker-container
 
 variables:
   GRADLE_OPTS: "-Dorg.gradle.daemon=false"

Jenkinsfile

@@ -1,19 +0,0 @@
-pipeline {
-    agent any
-    stages {
-        stage('Test') {
-            steps {
-                sh "./gradlew clean test --info"
-            }
-        }
-    }
-    post {
-        always {
-            script {
-                if (currentBuild.currentResult == 'FAILURE') {
-                    step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "a.romanov@ulstu.ru", sendToIndividuals: true])
-                }
-            }
-        }
-    }
-}

README.md

@@ -9,4 +9,6 @@
 4. Получить проект для обучения бакалавров современым технологиям разработки.
 5. Создать систему хранения и трансляции опыта между участниками научной группы.
 
-[Для разворачивания проекта и ведения разработки ознакомьтесь с wiki](https://git.athene.tech/romanov73/ng-tracker/wiki/home)
+[Демо версия доступна здесь](http://193.110.3.124:8080)
+
+[Для разворачивания проекта и ведения разработки ознакомьтесь с wiki](https://gitlab.com/romanov73/ng-tracker/wikis/home)

build.gradle

@@ -1,19 +1,34 @@
-plugins {
+buildscript {
-    id 'java'
+    ext {
-    id 'org.springframework.boot' version '3.2.4'
+        versionSpringBoot = '1.5.10.RELEASE'
-    id 'io.spring.dependency-management' version '1.1.4'
+    }
-    id 'checkstyle'
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: versionSpringBoot
+    }
 }
 
 group 'ru.ulstu'
 version '0.1.0-SNAPSHOT'
 
+apply plugin: 'application'
+apply plugin: 'java'
+apply plugin: 'org.springframework.boot'
+apply plugin: 'io.spring.dependency-management'
+apply plugin: 'checkstyle'
+
+mainClassName = 'ru.ulstu.NgTrackerApplication'
+
 build.dependsOn checkstyleMain
 bootRun.dependsOn checkstyleMain
 
-java {
+sourceCompatibility = 1.8
-    sourceCompatibility = '17'
+targetCompatibility = 1.8
-}
 
 bootRun {
     systemProperties = System.properties
@@ -61,16 +76,9 @@ task health(dependsOn: [
         'checkstyleMain'
 ])
 
-test {
-    useJUnitPlatform()
-}
 
 jar {
-    enabled = false
+    baseName = 'ng-tracker'
-}
-
-bootJar {
-    archiveFileName = String.format('%s-%s.jar', rootProject.name, version)
 }
 
 compileJava {
@@ -82,39 +90,42 @@ repositories {
     mavenCentral()
 }
 
+configurations {
+    compile.exclude module: "spring-boot-starter-tomcat"
+    compile.exclude module: "bcmail-jdk14"
+    compile.exclude module: "bcprov-jdk14"
+    compile.exclude module: "bctsp-jdk14"
+}
+
 dependencies {
-    implementation('org.springframework.boot:spring-boot-starter-web') {
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter-web'
-        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter-security'
-    }
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter-aop'
-    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security'
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter-mail'
-    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-aop'
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'
-    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail'
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa'
-    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf'
-    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa'
+    compile group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity4'
-    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf'
+    compile group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner'
-    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation'
+    compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-hibernate5'
-    implementation group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect'
+
-    implementation group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity6'
+    compile group: 'postgresql', name: 'postgresql', version: '9.1-901.jdbc4'
-    implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner'
+
-    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-hibernate5'
+    compile group: 'org.liquibase', name: 'liquibase-core', version: '3.5.3'
-
+    compile group: 'com.mattbertolini', name: 'liquibase-slf4j', version: '2.0.0'
-    implementation group: 'org.postgresql', name: 'postgresql', version: '42.2.5'
+
-
+    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
-    implementation group: 'org.liquibase', name: 'liquibase-core', version: '4.27.0'
+
-    implementation group: 'com.mattbertolini', name: 'liquibase-slf4j', version: '2.0.0'
+    compile group: 'org.webjars', name: 'bootstrap', version: '4.1.0'
-
+    compile group: 'org.webjars', name: 'bootstrap-select', version: '1.13.3'
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
+    compile group: 'org.webjars', name: 'jquery', version: '3.3.1-1'
-
+    compile group: 'org.webjars.npm', name: 'jquery.easing', version: '1.4.1'
-    implementation group: 'org.webjars', name: 'bootstrap', version: '5.3.3'
+    compile group: 'org.webjars', name: 'font-awesome', version: '4.7.0'
-    runtimeOnly group: 'org.webjars', name: 'bootstrap-select', version: '1.4.2'
+
-    implementation group: 'org.webjars', name: 'jquery', version: '3.7.1'
+    compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.6.0'
-    implementation group: 'org.webjars', name: 'jquery-easing', version: '1.4.1'
+    compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.6.0'
-    implementation group: 'org.webjars', name: 'font-awesome', version: '4.7.0'
+
-
+    testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test'
-    implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.8.0'
+    testCompile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1'
-    implementation group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.35.0'
+
-    implementation group: 'xalan', name: 'xalan', version: '2.7.2'
-
-    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.2'
 }

deploy/gdccloud/deploy.sh

@@ -18,6 +18,6 @@ fi
 
 ssh $USERSERVER "cd /tmp && rm -rf $ARTIFACT_NAME*.jar && echo `date` 'killed' >> log_$ARTIFACT_NAME"
 scp build/libs/$ARTIFACT_NAME-0.1.0-SNAPSHOT.jar $USERSERVER:/tmp/$ARTIFACT_NAME-0.1.0-SNAPSHOT.jar
-ssh $USERSERVER -f "cd /tmp/ && /opt/jdk-11/bin/java -jar $ARTIFACT_NAME-0.1.0-SNAPSHOT.jar -Xms 512m -Xmx 1024m  --server.port=8080 --server.http.port=8443 --ng-tracker.base-url=http://193.110.3.124:8080 --ng-tracker.dev-mode=false  --ng-tracker.driver-path=/home/user >> /home/user/logfile_$ARTIFACT_NAME" &
+ssh $USERSERVER -f "cd /tmp/ && /opt/jdk1.8.0_192/bin/java -jar $ARTIFACT_NAME-0.1.0-SNAPSHOT.jar -Xms 512m -Xmx 1024m  --server.port=8443 --server.http.port=8080 --ng-tracker.base-url=http://193.110.3.124:8080 >> /home/user/logfile_$ARTIFACT_NAME" &
 sleep 10
 echo "is deployed"

gradle/wrapper/gradle-wrapper.properties

@@ -2,6 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true

src/main/java/ru/ulstu/commit/controller/CommitController.java

@@ -4,17 +4,20 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import ru.ulstu.commit.model.CommitListDto;
-import ru.ulstu.commit.service.CommitService;
 import ru.ulstu.configuration.Constants;
 import ru.ulstu.core.model.response.PageableItems;
+import ru.ulstu.commit.model.CommitListDto;
+import ru.ulstu.commit.service.CommitService;
 import ru.ulstu.core.model.response.Response;
 import ru.ulstu.odin.controller.OdinController;
 import ru.ulstu.odin.model.OdinVoid;
 
+import static ru.ulstu.commit.controller.CommitController.URL;
+
 @RestController
-@RequestMapping(Constants.API_1_0 + "commits")
+@RequestMapping(URL)
 public class CommitController extends OdinController<CommitListDto, OdinVoid> {
+    public static final String URL = Constants.API_1_0 + "commits";
     private final CommitService commitService;
 
     public CommitController(CommitService commitService) {

src/main/java/ru/ulstu/conference/controller/ConferenceController.java

@@ -1,8 +1,6 @@
 package ru.ulstu.conference.controller;
 
 
-import io.swagger.v3.oas.annotations.Hidden;
-import jakarta.validation.Valid;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.Errors;
@@ -16,7 +14,9 @@ import ru.ulstu.conference.model.ConferenceFilterDto;
 import ru.ulstu.conference.model.ConferenceUser;
 import ru.ulstu.conference.service.ConferenceService;
 import ru.ulstu.user.model.User;
+import springfox.documentation.annotations.ApiIgnore;
 
+import javax.validation.Valid;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -29,7 +29,7 @@ import static ru.ulstu.core.controller.Navigation.REDIRECT_TO;
 
 @Controller()
 @RequestMapping(value = "/conferences")
-@Hidden
+@ApiIgnore
 public class ConferenceController {
 
     private final ConferenceService conferenceService;

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

@@ -1,40 +1,34 @@
 package ru.ulstu.conference.model;
 
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.DiscriminatorValue;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OrderBy;
-import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
-import jakarta.validation.constraints.NotBlank;
 import org.hibernate.annotations.Fetch;
 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.core.model.UserActivity;
 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;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 @Entity
 @Table(name = "conference")
-@DiscriminatorValue("CONFERENCE")
+public class Conference extends BaseEntity {
-public class Conference extends BaseEntity implements UserActivity, EventSource {
 
     @NotBlank
     private String title;
@@ -61,38 +55,22 @@ public class Conference extends BaseEntity implements UserActivity, EventSource
     @OrderBy("date")
     private List<Deadline> deadlines = new ArrayList<>();
 
-    @OneToMany(cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
+    @ManyToMany(cascade = CascadeType.MERGE, fetch = FetchType.EAGER)
-    @JoinColumn(name = "conference_id")
+    @JoinTable(name = "paper_conference",
+            joinColumns = {@JoinColumn(name = "conference_id")},
+            inverseJoinColumns = {@JoinColumn(name = "paper_id")})
+    @Fetch(FetchMode.SUBSELECT)
     private List<Paper> papers = new ArrayList<>();
 
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     @JoinColumn(name = "conference_id", unique = true)
+    @Fetch(FetchMode.SUBSELECT)
     private List<ConferenceUser> users = new ArrayList<>();
 
-    public Conference() {
-    }
-
-    public Conference(@NotBlank String title) {
-        this.title = title;
-    }
-
     public String getTitle() {
         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;
     }
@@ -169,9 +147,4 @@ public class Conference extends BaseEntity implements UserActivity, EventSource
                 .filter(d -> d.getDate().after(new Date()))
                 .findFirst();
     }
-
-    @Override
-    public Set<User> getActivityUsers() {
-        return getUsers().stream().map(ConferenceUser::getUser).collect(Collectors.toSet());
-    }
 }

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

@@ -2,16 +2,15 @@ package ru.ulstu.conference.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.persistence.Temporal;
+import org.hibernate.validator.constraints.NotEmpty;
-import jakarta.persistence.TemporalType;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Size;
 import org.springframework.format.annotation.DateTimeFormat;
-import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.name.NameContainer;
 import ru.ulstu.paper.model.Paper;
 
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -91,8 +90,8 @@ public class ConferenceDto extends NameContainer {
         this.beginDate = conference.getBeginDate();
         this.endDate = conference.getEndDate();
         this.deadlines = conference.getDeadlines();
-        this.userIds = convert(conference.getUsers(), BaseEntity::getId);
+        this.userIds = convert(conference.getUsers(), user -> user.getId());
-        this.paperIds = convert(conference.getPapers(), BaseEntity::getId);
+        this.paperIds = convert(conference.getPapers(), paper -> paper.getId());
         this.users = conference.getUsers();
         this.papers = conference.getPapers();
     }

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

@@ -2,17 +2,18 @@ package ru.ulstu.conference.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotNull;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.user.model.User;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
 @Entity
 @Table(name = "users_conference")
 public class ConferenceUser extends BaseEntity {
@@ -21,7 +22,7 @@ public class ConferenceUser extends BaseEntity {
         INTRAMURAL("Очная"),
         EXTRAMURAL("Заочная");
 
-        private final String participationName;
+        private String participationName;
 
         Participation(String name) {
             this.participationName = name;
@@ -37,7 +38,7 @@ public class ConferenceUser extends BaseEntity {
         REPORT("Доклад"),
         PRESENTATION("Презентация");
 
-        private final String depositName;
+        private String depositName;
 
         Deposit(String name) {
             this.depositName = name;
@@ -68,7 +69,6 @@ public class ConferenceUser extends BaseEntity {
 
     public ConferenceUser(User user) {
         this.user = user;
-        this.deposit = Deposit.REPORT;
     }
 
     @JsonCreator

src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 public interface ConferenceRepository extends JpaRepository<Conference, Integer>, BaseRepository {
     @Query("SELECT c FROM Conference c LEFT JOIN c.users u WHERE (:user IS NULL OR u.user = :user) " +
-            "AND (YEAR(c.beginDate) = :year OR :year IS NULL) ORDER BY c.beginDate DESC")
+            "AND (YEAR(c.beginDate) = :year OR :year IS NULL) ORDER BY begin_date DESC")
     List<Conference> findByUserAndYear(@Param("user") User user, @Param("year") Integer year);
 
     @Query("SELECT c FROM Conference c WHERE c.beginDate > :date")
@@ -28,9 +28,5 @@ public interface ConferenceRepository extends JpaRepository<Conference, Integer>
 
     @Override
     @Query("SELECT title FROM Conference c WHERE (c.title = :name) AND (:id IS NULL OR c.id != :id) ")
-    List<String> findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
+    String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
-
-    @Query("SELECT c FROM Conference c LEFT JOIN c.users u WHERE (:user IS NULL OR u.user = :user) " +
-            "AND (u.participation = 'INTRAMURAL') AND (c.beginDate <= CURRENT_DATE) AND (c.endDate >= CURRENT_DATE)")
-    Conference findActiveByUser(@Param("user") User user);
 }

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

@@ -1,5 +1,6 @@
 package ru.ulstu.conference.service;
 
+import com.google.common.collect.ImmutableMap;
 import org.springframework.stereotype.Service;
 import ru.ulstu.conference.model.Conference;
 import ru.ulstu.core.util.DateUtils;
@@ -56,27 +57,27 @@ public class ConferenceNotificationService {
     }
 
     private void sendMessageDeadline(Conference conference) {
-        Map<String, Object> variables = Map.of("conference", conference);
+        Map<String, Object> variables = ImmutableMap.of("conference", conference);
         sendForAllParticipants(variables, conference, TEMPLATE_DEADLINE, String.format(TITLE_DEADLINE, conference.getTitle()));
     }
 
     public void sendCreateNotification(Conference conference) {
-        Map<String, Object> variables = Map.of("conference", conference);
+        Map<String, Object> variables = ImmutableMap.of("conference", conference);
-        sendForAllUsers(variables, String.format(TITLE_CREATE, conference.getTitle()));
+        sendForAllUsers(variables, TEMPLATE_CREATE, String.format(TITLE_CREATE, conference.getTitle()));
     }
 
     public void updateDeadlineNotification(Conference conference) {
-        Map<String, Object> variables = Map.of("conference", conference);
+        Map<String, Object> variables = ImmutableMap.of("conference", conference);
         sendForAllParticipants(variables, conference, TEMPLATE_UPDATE_DEADLINES, String.format(TITLE_UPDATE_DEADLINES, conference.getTitle()));
     }
 
     public void updateConferencesDatesNotification(Conference conference, Date oldBeginDate, Date oldEndDate) {
-        Map<String, Object> variables = Map.of("conference", conference, "oldBeginDate", oldBeginDate, "oldEndDate", oldEndDate);
+        Map<String, Object> variables = ImmutableMap.of("conference", conference, "oldBeginDate", oldBeginDate, "oldEndDate", oldEndDate);
         sendForAllParticipants(variables, conference, TEMPLATE_UPDATE_DATES, String.format(TITLE_UPDATE_DATES, conference.getTitle()));
     }
 
-    private void sendForAllUsers(Map<String, Object> variables, String title) {
+    private void sendForAllUsers(Map<String, Object> variables, String template, String title) {
-        userService.findAll().forEach(user -> mailService.sendEmailFromTemplate(variables, user, ConferenceNotificationService.TEMPLATE_CREATE, title));
+        userService.findAll().forEach(user -> mailService.sendEmailFromTemplate(variables, user, template, title));
     }
 
     private void sendForAllParticipants(Map<String, Object> variables, Conference conference, String template, String title) {
@@ -106,7 +107,7 @@ public class ConferenceNotificationService {
     }
 
     private void sendMessagePing(Conference conference) {
-        Map<String, Object> variables = Map.of("conference", conference);
+        Map<String, Object> variables = ImmutableMap.of("conference", conference);
         sendForAllParticipants(variables, conference, TEMPLATE_PING, String.format(TITLE_PING, conference.getTitle()));
     }
 }

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

@@ -11,26 +11,24 @@ import ru.ulstu.conference.model.ConferenceDto;
 import ru.ulstu.conference.model.ConferenceFilterDto;
 import ru.ulstu.conference.model.ConferenceUser;
 import ru.ulstu.conference.repository.ConferenceRepository;
-import ru.ulstu.core.util.DateUtils;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.name.BaseService;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.service.PaperService;
+import ru.ulstu.ping.model.Ping;
 import ru.ulstu.ping.service.PingService;
 import ru.ulstu.timeline.service.EventService;
 import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
-import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static java.util.stream.Collectors.toList;
 import static org.springframework.util.ObjectUtils.isEmpty;
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 
@@ -67,7 +65,7 @@ public class ConferenceService extends BaseService {
     }
 
     public ConferenceDto getExistConferenceById(Integer id) {
-        ConferenceDto conferenceDto = new ConferenceDto(conferenceRepository.getOne(id));
+        ConferenceDto conferenceDto = new ConferenceDto(conferenceRepository.findOne(id));
         conferenceDto.setNotSelectedPapers(getNotSelectPapers(conferenceDto.getPaperIds()));
         conferenceDto.setDisabledTakePart(isCurrentUserParticipant(conferenceDto.getUsers()));
         return conferenceDto;
@@ -81,7 +79,7 @@ public class ConferenceService extends BaseService {
 
 
     public List<Conference> findAll() {
-        return conferenceRepository.findAll(Sort.by(Sort.Direction.DESC, "beginDate"));
+        return conferenceRepository.findAll(new Sort(Sort.Direction.DESC, "beginDate"));
     }
 
     public List<ConferenceDto> findAllDto() {
@@ -94,10 +92,10 @@ public class ConferenceService extends BaseService {
         conferenceDto.setName(conferenceDto.getTitle());
         filterEmptyDeadlines(conferenceDto);
         checkEmptyFieldsOfDeadline(conferenceDto, errors);
-        checkEmptyFieldsOfDates(conferenceDto, errors);
         checkUniqueName(conferenceDto,
                 errors,
                 conferenceDto.getId(),
+                "title",
                 "Конференция с таким именем уже существует");
         if (errors.hasErrors()) {
             return false;
@@ -112,63 +110,43 @@ public class ConferenceService extends BaseService {
         return true;
     }
 
-    public Conference save(Conference conference) {
-        if (isEmpty(conference.getId())) {
-            return create(conference);
-        } else {
-            return update(conference);
-        }
-    }
-
     @Transactional
     public Conference create(ConferenceDto conferenceDto) throws IOException {
-        return create(copyFromDto(new Conference(), conferenceDto));
+        Conference newConference = copyFromDto(new Conference(), conferenceDto);
+        newConference = conferenceRepository.save(newConference);
+        conferenceNotificationService.sendCreateNotification(newConference);
+        eventService.createFromConference(newConference);
+        return newConference;
     }
 
     @Transactional
-    public Conference create(Conference conference) {
+    public Conference update(ConferenceDto conferenceDto) throws IOException {
-        conference = conferenceRepository.save(conference);
+        Conference conference = conferenceRepository.findOne(conferenceDto.getId());
-        conferenceNotificationService.sendCreateNotification(conference);
+        List<Deadline> oldDeadlines = conference.getDeadlines().stream()
-        return conference;
-    }
-
-    @Transactional
-    private Conference update(ConferenceDto conferenceDto) throws IOException {
-        return update(copyFromDto(conferenceRepository.getOne(conferenceDto.getId()), conferenceDto));
-    }
-
-    @Transactional
-    private Conference update(Conference conference) {
-        Conference oldConference = conferenceRepository.getOne(conference.getId());
-        List<Deadline> oldDeadlines = oldConference.getDeadlines().stream()
                 .map(this::copyDeadline)
                 .collect(Collectors.toList());
         Date oldBeginDate = conference.getBeginDate();
         Date oldEndDate = conference.getEndDate();
-        conferenceRepository.save(conference);
+        conferenceRepository.save(copyFromDto(conference, conferenceDto));
+        eventService.updateConferenceDeadlines(conference);
         sendNotificationAfterUpdateDeadlines(conference, oldDeadlines);
         if (!conference.getBeginDate().equals(oldBeginDate) || !conference.getEndDate().equals(oldEndDate)) {
             conferenceNotificationService.updateConferencesDatesNotification(conference, oldBeginDate, oldEndDate);
         }
+        conferenceDto.getRemovedDeadlineIds().forEach(deadlineService::remove);
         return conference;
     }
 
     @Transactional
     public boolean delete(Integer conferenceId) {
-        if (conferenceRepository.existsById(conferenceId)) {
+        if (conferenceRepository.exists(conferenceId)) {
-            eventService.removeConferencesEvent(conferenceRepository.getOne(conferenceId));
+            eventService.removeConferencesEvent(conferenceRepository.findOne(conferenceId));
-            conferenceRepository.deleteById(conferenceId);
+            conferenceRepository.delete(conferenceId);
             return true;
         }
         return false;
     }
 
-    @Transactional
-    public boolean delete(List<Conference> conferences) {
-        conferences.forEach(conference -> delete(conference.getId()));
-        return true;
-    }
-
     public ConferenceDto addDeadline(ConferenceDto conferenceDto) {
         conferenceDto.getDeadlines().add(new Deadline());
         return conferenceDto;
@@ -254,7 +232,7 @@ public class ConferenceService extends BaseService {
         return convert(findAllActive(), ConferenceDto::new);
     }
 
-    public List<Conference> findAllActive() {
+    private List<Conference> findAllActive() {
         return conferenceRepository.findAllActive(new Date());
     }
 
@@ -263,13 +241,14 @@ public class ConferenceService extends BaseService {
     }
 
     @Transactional
-    public void ping(ConferenceDto conferenceDto) throws IOException {
+    public Ping ping(ConferenceDto conferenceDto) throws IOException {
-        pingService.addPing(findOne(conferenceDto.getId()));
+        Ping ping = pingService.addPing(findOne(conferenceDto.getId()));
         conferenceRepository.updatePingConference(conferenceDto.getId());
+        return ping;
     }
 
-    public Conference findOne(Integer conferenceId) {
+    private Conference findOne(Integer conferenceId) {
-        return conferenceRepository.getOne(conferenceId);
+        return conferenceRepository.findOne(conferenceId);
     }
 
     public void setChartData(ModelMap modelMap) {
@@ -314,7 +293,7 @@ public class ConferenceService extends BaseService {
         return newDeadline;
     }
 
-    private void checkEmptyFieldsOfDeadline(ConferenceDto conferenceDto, Errors errors) {
+    public void checkEmptyFieldsOfDeadline(ConferenceDto conferenceDto, Errors errors) {
         for (Deadline deadline : conferenceDto.getDeadlines()) {
             if (deadline.getDate() == null || deadline.getDescription().isEmpty()) {
                 errors.rejectValue("deadlines", "errorCode", "Все поля дедлайна должны быть заполнены");
@@ -322,37 +301,9 @@ public class ConferenceService extends BaseService {
         }
     }
 
-    private void checkEmptyFieldsOfDates(ConferenceDto conferenceDto, Errors errors) {
-        if (conferenceDto.getBeginDate() == null || conferenceDto.getEndDate() == null) {
-            errors.rejectValue("beginDate", "errorCode", "Даты должны быть заполнены");
-        }
-    }
-
     public void filterEmptyDeadlines(ConferenceDto conferenceDto) {
         conferenceDto.setDeadlines(conferenceDto.getDeadlines().stream()
                 .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription()))
                 .collect(Collectors.toList()));
     }
-
-    public Conference getActiveConferenceByUser(User user) {
-        return conferenceRepository.findActiveByUser(user);
-    }
-
-    public Conference createByTitle(String newConferenceTitle) {
-        Conference conference = new Conference(newConferenceTitle);
-        conference.setBeginDate(DateUtils.localDateToDate(DateUtils.convertToLocalDate(new Date()).plus(1, ChronoUnit.WEEKS)));
-        conference.setEndDate(DateUtils.localDateToDate(DateUtils.convertToLocalDate(new Date()).plus(2, ChronoUnit.WEEKS)));
-        conference.getUsers().add(new ConferenceUser(userService.getCurrentUser()));
-        conference.getDeadlines().add(deadlineService.createWithOffset(new Date(), 1, ChronoUnit.WEEKS));
-        return save(conference);
-    }
-
-    public List<Conference> findAllActiveByCurrentUser() {
-        return findAllActive()
-                .stream()
-                .filter(conference -> conference.getUsers()
-                        .stream()
-                        .anyMatch(user -> user.getUser().equals(userService.getCurrentUser())))
-                .collect(toList());
-    }
 }

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

@@ -26,8 +26,8 @@ public class ConferenceUserService {
     }
 
     @Transactional
-    private ConferenceUser update(ConferenceUser user) {
+    public ConferenceUser update(ConferenceUser user) {
-        ConferenceUser updateUser = conferenceUserRepository.getOne(user.getId());
+        ConferenceUser updateUser = conferenceUserRepository.findOne(user.getId());
         updateUser.setDeposit(user.getDeposit());
         updateUser.setParticipation(user.getParticipation());
         conferenceUserRepository.save(updateUser);
@@ -35,7 +35,7 @@ public class ConferenceUserService {
     }
 
     @Transactional
-    private ConferenceUser create(ConferenceUser user) {
+    public ConferenceUser create(ConferenceUser user) {
         ConferenceUser newUser = new ConferenceUser();
         newUser.setDeposit(user.getDeposit());
         newUser.setParticipation(user.getParticipation());
@@ -43,4 +43,6 @@ public class ConferenceUserService {
         newUser = conferenceUserRepository.save(newUser);
         return newUser;
     }
+
+
 }

src/main/java/ru/ulstu/configuration/ApplicationProperties.java

@@ -1,6 +1,6 @@
 package ru.ulstu.configuration;
 
-import jakarta.validation.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotBlank;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
@@ -21,10 +21,6 @@ public class ApplicationProperties {
 
     private boolean checkRun;
 
-    private String debugEmail;
-
-    private String driverPath;
-
     public boolean isUseHttps() {
         return useHttps;
     }
@@ -64,20 +60,4 @@ public class ApplicationProperties {
     public void setCheckRun(boolean checkRun) {
         this.checkRun = checkRun;
     }
-
-    public String getDebugEmail() {
-        return debugEmail;
-    }
-
-    public void setDebugEmail(String debugEmail) {
-        this.debugEmail = debugEmail;
-    }
-
-    public String getDriverPath() {
-        return driverPath;
-    }
-
-    public void setDriverPath(String driverPath) {
-        this.driverPath = driverPath;
-    }
 }

src/main/java/ru/ulstu/configuration/Constants.java

@@ -21,5 +21,4 @@ public class Constants {
     public static final String PASSWORD_RESET_REQUEST_PAGE = "/resetRequest";
     public static final String PASSWORD_RESET_PAGE = "/reset";
 
-    public static final int RESET_KEY_LENGTH = 6;
 }

src/main/java/ru/ulstu/configuration/HttpListenerConfiguration.java

@@ -0,0 +1,30 @@
+package ru.ulstu.configuration;
+
+import org.eclipse.jetty.server.ServerConnector;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
+import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.jetty.JettyServerCustomizer;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class HttpListenerConfiguration implements EmbeddedServletContainerCustomizer {
+    @Value("${server.http.port}")
+    private int httpPort;
+
+    private void configureJetty(JettyEmbeddedServletContainerFactory jettyFactory) {
+        jettyFactory.addServerCustomizers((JettyServerCustomizer) server -> {
+            ServerConnector serverConnector = new ServerConnector(server);
+            serverConnector.setPort(httpPort);
+            server.addConnector(serverConnector);
+        });
+    }
+
+    @Override
+    public void customize(ConfigurableEmbeddedServletContainer container) {
+        if (container instanceof JettyEmbeddedServletContainerFactory) {
+            configureJetty((JettyEmbeddedServletContainerFactory) container);
+        }
+    }
+}

src/main/java/ru/ulstu/configuration/MailTemplateConfiguration.java

@@ -1,10 +1,10 @@
 package ru.ulstu.configuration;
 
-import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect;
+import nz.net.ultraq.thymeleaf.LayoutDialect;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
+import org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect;
-import org.thymeleaf.spring6.SpringTemplateEngine;
+import org.thymeleaf.spring4.SpringTemplateEngine;
 import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver;
 import org.thymeleaf.templateresolver.ITemplateResolver;
 
@@ -17,17 +17,30 @@ public class MailTemplateConfiguration {
         final SpringTemplateEngine templateEngine = new SpringTemplateEngine();
         templateEngine.addTemplateResolver(templateResolver);
         templateEngine.addTemplateResolver(emailTemplateResolver());
+        templateEngine.addTemplateResolver(mvcTemplateResolver());
         templateEngine.addDialect(new LayoutDialect());
         templateEngine.addDialect(sec);
         return templateEngine;
     }
 
-    private ClassLoaderTemplateResolver emailTemplateResolver() {
+    public ClassLoaderTemplateResolver emailTemplateResolver() {
         ClassLoaderTemplateResolver emailTemplateResolver = new ClassLoaderTemplateResolver();
-        emailTemplateResolver.setPrefix("/mail_templates/");
+        emailTemplateResolver.setPrefix("mail_templates/");
-        emailTemplateResolver.setTemplateMode("HTML");
+        emailTemplateResolver.setTemplateMode("HTML5");
         emailTemplateResolver.setSuffix(".html");
+        emailTemplateResolver.setOrder(1);
         emailTemplateResolver.setCharacterEncoding(StandardCharsets.UTF_8.name());
         return emailTemplateResolver;
     }
+
+    public ClassLoaderTemplateResolver mvcTemplateResolver() {
+        ClassLoaderTemplateResolver emailTemplateResolver = new ClassLoaderTemplateResolver();
+        emailTemplateResolver.setPrefix("templates");
+        emailTemplateResolver.setTemplateMode("HTML5");
+        emailTemplateResolver.setSuffix(".html");
+        emailTemplateResolver.setOrder(2);
+        emailTemplateResolver.setCharacterEncoding(StandardCharsets.UTF_8.name());
+        return emailTemplateResolver;
+    }
+
 }

src/main/java/ru/ulstu/configuration/MvcConfiguration.java

@@ -3,10 +3,10 @@ package ru.ulstu.configuration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @Configuration
-public class MvcConfiguration implements WebMvcConfigurer {
+public class MvcConfiguration extends WebMvcConfigurerAdapter {
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
         registry.addViewController("/{articlename:\\w+}");

src/main/java/ru/ulstu/configuration/SecurityConfiguration.java

@@ -5,32 +5,26 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
-import ru.ulstu.core.model.AuthFailureHandler;
 import ru.ulstu.user.controller.UserController;
 import ru.ulstu.user.model.UserRoleConstants;
 import ru.ulstu.user.service.UserService;
 
 @Configuration
 @EnableWebSecurity
-public class SecurityConfiguration {
+@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
     private final Logger log = LoggerFactory.getLogger(SecurityConfiguration.class);
 
-    @Autowired
-    private Environment env;
-
     @Value("${server.http.port}")
     private int httpPort;
     @Value("${server.port}")
@@ -41,77 +35,76 @@ public class SecurityConfiguration {
     private final AuthenticationSuccessHandler authenticationSuccessHandler;
     private final LogoutSuccessHandler logoutSuccessHandler;
     private final ApplicationProperties applicationProperties;
-    private final AuthenticationFailureHandler authenticationFailureHandler;
 
     public SecurityConfiguration(UserService userService,
                                  BCryptPasswordEncoder bCryptPasswordEncoder,
                                  AuthenticationSuccessHandler authenticationSuccessHandler,
                                  LogoutSuccessHandler logoutSuccessHandler,
-                                 ApplicationProperties applicationProperties,
+                                 ApplicationProperties applicationProperties) {
-                                 AuthFailureHandler authenticationFailureHandler) {
         this.userService = userService;
         this.bCryptPasswordEncoder = bCryptPasswordEncoder;
         this.authenticationSuccessHandler = authenticationSuccessHandler;
         this.logoutSuccessHandler = logoutSuccessHandler;
         this.applicationProperties = applicationProperties;
-        this.authenticationFailureHandler = authenticationFailureHandler;
     }
 
-    @Bean
+    @Override
-    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+    protected void configure(HttpSecurity http) throws Exception {
-        http.csrf(AbstractHttpConfigurer::disable);
+        http.csrf()
+                .disable();
         if (applicationProperties.isDevMode()) {
             log.debug("Security disabled");
-            http.authorizeHttpRequests((authz) -> authz
+            http.authorizeRequests()
                     .anyRequest()
-                    .permitAll()
+                    .permitAll();
-            );
+            http.anonymous()
-            http.anonymous((anonymousCustomizer) -> anonymousCustomizer
                     .principal("admin")
-                    .authorities(UserRoleConstants.ADMIN)
+                    .authorities(UserRoleConstants.ADMIN);
-            );
         } else {
             log.debug("Security enabled");
-            http.authorizeHttpRequests((authz) -> authz
+            http.authorizeRequests()
-                            .requestMatchers(UserController.ACTIVATE_URL).permitAll()
+                    .antMatchers(UserController.ACTIVATE_URL).permitAll()
-                            .requestMatchers(Constants.PASSWORD_RESET_REQUEST_PAGE).permitAll()
+                    .antMatchers(Constants.PASSWORD_RESET_REQUEST_PAGE).permitAll()
-                            .requestMatchers(Constants.PASSWORD_RESET_PAGE).permitAll()
+                    .antMatchers(Constants.PASSWORD_RESET_PAGE).permitAll()
-                            .requestMatchers("/users/block").permitAll()
+                    .antMatchers(UserController.URL + UserController.REGISTER_URL).permitAll()
-                            .requestMatchers(UserController.URL + UserController.REGISTER_URL).permitAll()
+                    .antMatchers(UserController.URL + UserController.ACTIVATE_URL).permitAll()
-                            .requestMatchers(UserController.URL + UserController.ACTIVATE_URL).permitAll()
+                    .antMatchers(UserController.URL + UserController.PASSWORD_RESET_REQUEST_URL).permitAll()
-                            .requestMatchers(UserController.URL + UserController.PASSWORD_RESET_REQUEST_URL).permitAll()
+                    .antMatchers(UserController.URL + UserController.PASSWORD_RESET_URL).permitAll()
-                            .requestMatchers(UserController.URL + UserController.PASSWORD_RESET_URL).permitAll()
+                    .antMatchers("/swagger-ui.html").hasAuthority(UserRoleConstants.ADMIN)
-                            .requestMatchers("/swagger-ui.html").hasAuthority(UserRoleConstants.ADMIN)
+                    .anyRequest().authenticated()
-                            .anyRequest().authenticated())
+                    .and()
-                    .formLogin((formLoginCustomizer) -> formLoginCustomizer
+                    .formLogin()
                     .loginPage("/login")
                     .successHandler(authenticationSuccessHandler)
-                            .failureHandler(authenticationFailureHandler)
                     .permitAll()
-                    )
+                    .and()
-                    .rememberMe(rememberMe -> rememberMe.key("uniqueAndSecret"))
+                    .logout()
-                    .logout((logoutCustomizer) -> logoutCustomizer
                     .logoutSuccessHandler(logoutSuccessHandler)
                     .logoutSuccessUrl(Constants.LOGOUT_URL)
                     .invalidateHttpSession(false)
                     .clearAuthentication(true)
                     .deleteCookies(Constants.COOKIES_NAME)
-                            .permitAll()
+                    .permitAll();
-                    );
-            http.csrf(AbstractHttpConfigurer::disable);
         }
-        return http.build();
+        if (applicationProperties.isUseHttps()) {
+            http.portMapper()
+                    .http(httpPort)
+                    .mapsTo(httpsPort)
+                    .and()
+                    .requiresChannel()
+                    .anyRequest()
+                    .requiresSecure();
         }
 
-    @Bean
+    }
-    public WebSecurityCustomizer webSecurityCustomizer() {
+
-        return (web) -> web.ignoring()
+    @Override
-                .requestMatchers("/css/**",
+    public void configure(WebSecurity web) {
-                        "/javax.faces.resource/**",
+        web.ignoring()
-                        "/js/**",
+                .antMatchers("/css/**")
-                        "/templates/**",
+                .antMatchers("/js/**")
-                        "/webjars/**",
+                .antMatchers("/templates/**")
-                        "/img/**");
+                .antMatchers("/webjars/**");
     }
 
     @Autowired

src/main/java/ru/ulstu/configuration/SwaggerConfiguration.java

@@ -0,0 +1,23 @@
+package ru.ulstu.configuration;
+
+import com.google.common.base.Predicates;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfiguration {
+    @Bean
+    public Docket swaggerApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .select()
+                .apis(RequestHandlerSelectors.any())
+                .paths(Predicates.not(PathSelectors.regex("/error")))
+                .build();
+    }
+}

src/main/java/ru/ulstu/core/controller/AdviceController.java

@@ -4,6 +4,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import ru.ulstu.core.error.EntityIdIsNullException;
@@ -25,7 +26,7 @@ import ru.ulstu.user.service.UserService;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-//@ControllerAdvice
+@ControllerAdvice
 public class AdviceController {
     private final Logger log = LoggerFactory.getLogger(AdviceController.class);
     private final UserService userService;
@@ -34,6 +35,11 @@ public class AdviceController {
         this.userService = userService;
     }
 
+    @ModelAttribute("currentUser")
+    public String getCurrentUser() {
+        return userService.getCurrentUser().getUserAbbreviate();
+    }
+
     @ModelAttribute("flashMessage")
     public String getFlashMessage() {
         return null;

src/main/java/ru/ulstu/core/jpa/OffsetablePageRequest.java

@@ -6,19 +6,19 @@ import org.springframework.data.domain.Sort;
 import java.io.Serializable;
 
 public class OffsetablePageRequest implements Pageable, Serializable {
-    private final long offset;
+    private final int offset;
     private final int count;
     private final Sort sort;
 
-    public OffsetablePageRequest(long offset, int count) {
+    public OffsetablePageRequest(int offset, int count) {
         this(offset, count, null);
     }
 
-    public OffsetablePageRequest(long offset, int count, Sort.Direction direction, String... properties) {
+    public OffsetablePageRequest(int offset, int count, Sort.Direction direction, String... properties) {
-        this(offset, count, Sort.by(direction, properties));
+        this(offset, count, new Sort(direction, properties));
     }
 
-    public OffsetablePageRequest(long offset, int count, Sort sort) {
+    public OffsetablePageRequest(int offset, int count, Sort sort) {
         if (offset < 0) {
             throw new IllegalArgumentException("Offset value must not be less than zero!");
         }
@@ -30,12 +30,6 @@ public class OffsetablePageRequest implements Pageable, Serializable {
         this.sort = sort;
     }
 
-    @Override
-    public Pageable withPage(int pageNumber) {
-        //TODO
-        return null;
-    }
-
     @Override
     public Sort getSort() {
         return sort;
@@ -48,11 +42,11 @@ public class OffsetablePageRequest implements Pageable, Serializable {
 
     @Override
     public int getPageNumber() {
-        return (int) (offset / count);
+        return offset / count;
     }
 
     @Override
-    public long getOffset() {
+    public int getOffset() {
         return offset;
     }
 
@@ -71,7 +65,7 @@ public class OffsetablePageRequest implements Pageable, Serializable {
         return hasPrevious() ? previous() : first();
     }
 
-    private Pageable previous() {
+    public Pageable previous() {
         return getOffset() == 0 ? this : new OffsetablePageRequest(getOffset() - getPageSize(), getPageSize(), getSort());
     }
 
@@ -95,9 +89,9 @@ public class OffsetablePageRequest implements Pageable, Serializable {
     @Override
     public int hashCode() {
         final int prime = 31;
-        long result = 1;
+        int result = 1;
         result = prime * result + offset;
         result = prime * result + count;
-        return (int) result;
+        return result;
     }
 }

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

@@ -1,21 +0,0 @@
-package ru.ulstu.core.model;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.authentication.AuthenticationFailureHandler;
-import org.springframework.stereotype.Component;
-import ru.ulstu.user.error.UserBlockedException;
-
-import java.io.IOException;
-
-@Component
-public class AuthFailureHandler implements AuthenticationFailureHandler {
-    @Override
-    public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
-                                        AuthenticationException ex) throws IOException {
-        if (ex.getClass() == UserBlockedException.class) {
-            response.sendRedirect("/users/block");
-        }
-    }
-}

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

@@ -1,16 +1,14 @@
 package ru.ulstu.core.model;
 
-import jakarta.persistence.GeneratedValue;
+import javax.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
+import javax.persistence.GenerationType;
-import jakarta.persistence.Id;
+import javax.persistence.Id;
-import jakarta.persistence.MappedSuperclass;
+import javax.persistence.MappedSuperclass;
-import jakarta.persistence.Version;
+import javax.persistence.Version;
-import jakarta.validation.constraints.NotNull;
-
 import java.io.Serializable;
 
 @MappedSuperclass
-public abstract class BaseEntity implements Serializable, Comparable<BaseEntity> {
+public abstract class BaseEntity implements Serializable, Comparable {
     @Id
     @GeneratedValue(strategy = GenerationType.TABLE)
     private Integer id;
@@ -18,6 +16,14 @@ public abstract class BaseEntity implements Serializable, Comparable<BaseEntity>
     @Version
     private Integer version;
 
+    public BaseEntity() {
+    }
+
+    public BaseEntity(Integer id, Integer version) {
+        this.id = id;
+        this.version = version;
+    }
+
     public Integer getId() {
         return id;
     }
@@ -69,8 +75,8 @@ public abstract class BaseEntity implements Serializable, Comparable<BaseEntity>
     }
 
     @Override
-    public int compareTo(@NotNull BaseEntity o) {
+    public int compareTo(Object o) {
-        return id != null ? id.compareTo(o.getId()) : -1;
+        return id != null ? id.compareTo(((BaseEntity) o).getId()) : -1;
     }
 
     public void reset() {

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

@@ -9,15 +9,15 @@ public enum ErrorConstants {
     USER_EMAIL_EXISTS(102, "Пользователь с таким почтовым ящиком уже существует"),
     USER_LOGIN_EXISTS(103, "Пользователь с таким логином уже существует"),
     USER_PASSWORDS_NOT_VALID_OR_NOT_MATCH(104, "Пароли введены неверно"),
-    USER_NOT_FOUND(105, "Аккаунт не найден"),
+    USER_NOT_FOUND(105, "User is not found"),
     USER_NOT_ACTIVATED(106, "User is not activated"),
-    USER_RESET_ERROR(107, "Некорректный ключ подтверждения"),
+    USER_RESET_ERROR(107, "Invalid reset key"),
     USER_UNDEAD_ERROR(108, "Can't edit/delete that user"),
     FILE_UPLOAD_ERROR(110, "File upload error"),
     USER_SENDING_MAIL_EXCEPTION(111, "Во время отправки приглашения пользователю произошла ошибка");
 
-    private final int code;
+    private int code;
-    private final String message;
+    private String message;
 
     ErrorConstants(int code, String message) {
         this.code = code;

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

@@ -1,17 +0,0 @@
-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/core/model/TreeDto.java

@@ -0,0 +1,34 @@
+package ru.ulstu.core.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TreeDto {
+    private Integer id;
+    private String text;
+    private List<TreeDto> children = new ArrayList<>();
+
+    public TreeDto() {
+    }
+
+    public <T extends TreeEntity> TreeDto(TreeEntity item) {
+        this.text = item.toString();
+        this.id = item.getId();
+    }
+
+    public TreeDto(String rootName) {
+        this.text = rootName;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public List<TreeDto> getChildren() {
+        return children;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+}

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

@@ -0,0 +1,16 @@
+package ru.ulstu.core.model;
+
+import java.util.List;
+
+public interface TreeEntity<T> {
+
+    Integer getId();
+
+    List<T> getChildren();
+
+    void setChildren(List<T> children);
+
+    T getParent();
+
+    void setParent(T parent);
+}

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

@@ -1,11 +0,0 @@
-package ru.ulstu.core.model;
-
-import ru.ulstu.user.model.User;
-
-import java.util.Set;
-
-public interface UserActivity {
-    String getTitle();
-
-    Set<User> getActivityUsers();
-}

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

@@ -0,0 +1,9 @@
+package ru.ulstu.core.model;
+
+import ru.ulstu.user.model.User;
+
+import java.util.Set;
+
+public interface UserContainer {
+    Set<User> getUsers();
+}

src/main/java/ru/ulstu/core/model/response/ControllerResponse.java

@@ -1,8 +1,8 @@
 package ru.ulstu.core.model.response;
 
 class ControllerResponse<D, E> {
-    private final D data;
+    private D data;
-    private final ControllerResponseError<E> error;
+    private ControllerResponseError<E> error;
 
     ControllerResponse(D data) {
         this.data = data;

src/main/java/ru/ulstu/core/model/response/ControllerResponseError.java

@@ -3,8 +3,8 @@ package ru.ulstu.core.model.response;
 import ru.ulstu.core.model.ErrorConstants;
 
 class ControllerResponseError<D> {
-    private final ErrorConstants description;
+    private ErrorConstants description;
-    private final D data;
+    private D data;
 
     ControllerResponseError(ErrorConstants description, D data) {
         this.description = description;

src/main/java/ru/ulstu/core/navigation/Page.java

@@ -1,69 +0,0 @@
-package ru.ulstu.core.navigation;
-
-public class Page {
-    public static final String INDEX = "/index.html";
-    public static final String PAPER = "/paper/paper.html";
-    public static final String PAPER_LIST = "/paper/papers.html";
-    public static final String PAPER_DASHBOARD = "/paper/dashboard.html";
-    public static final String GRANT = "/grant/grant.html";
-    public static final String GRANT_LIST = "/grant/grants.html";
-    public static final String GRANT_DASHBOARD = "/grant/dashboard.html";
-    public static final String USER_LIST = "/admin/users.html";
-    public static final String LOGOUT = "/logout";
-    public static final String CONFERENCE = "/conference/conference.html";
-    public static final String CONFERENCE_DASHBOARD = "/conference/dashboard.html";
-    public static final String CONFERENCE_LIST = "/conference/conferences.html";
-    public static final String PROJECT_DASHBOARD = "/conference/dashboard.html";
-
-    public String getIndex() {
-        return INDEX;
-    }
-
-    public String getPaperList() {
-        return PAPER_LIST;
-    }
-
-    public String getPaperDashboard() {
-        return PAPER_DASHBOARD;
-    }
-
-    public String getUserList() {
-        return USER_LIST;
-    }
-
-    public String getLogout() {
-        return LOGOUT;
-    }
-
-    public String getGrantList() {
-        return GRANT_LIST;
-    }
-
-    public String getGrantDashboard() {
-        return GRANT_DASHBOARD;
-    }
-
-    public String getPaper() {
-        return PAPER;
-    }
-
-    public String getGrant() {
-        return GRANT;
-    }
-
-    public String getConferenceDashboard() {
-        return CONFERENCE_DASHBOARD;
-    }
-
-    public String getProjectDashboard() {
-        return PROJECT_DASHBOARD;
-    }
-
-    public String getConference() {
-        return CONFERENCE;
-    }
-
-    public String getConferenceList() {
-        return CONFERENCE_LIST;
-    }
-}

src/main/java/ru/ulstu/core/repository/JpaDetachableRepositoryImpl.java

@@ -1,14 +1,14 @@
 package ru.ulstu.core.repository;
 
-import jakarta.persistence.EntityManager;
 import org.springframework.data.jpa.repository.support.JpaEntityInformation;
 import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
 
+import javax.persistence.EntityManager;
 import java.io.Serializable;
 
 public class JpaDetachableRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRepository<T, ID>
         implements JpaDetachableRepository<T, ID> {
-    private final EntityManager entityManager;
+    private EntityManager entityManager;
 
     public JpaDetachableRepositoryImpl(JpaEntityInformation<T, ?> entityInformation, EntityManager entityManager) {
         super(entityInformation, entityManager);

src/main/java/ru/ulstu/core/util/DateUtils.java

@@ -14,12 +14,9 @@ import java.util.List;
 public class DateUtils {
 
     public static Date clearTime(Date date) {
-        if (date == null) {
-            return null;
-        }
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
-        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.HOUR, 0);
         calendar.set(Calendar.MINUTE, 0);
         calendar.set(Calendar.SECOND, 0);
         calendar.set(Calendar.MILLISECOND, 0);
@@ -63,10 +60,4 @@ public class DateUtils {
         cal.add(Calendar.YEAR, count);
         return cal.getTime();
     }
-
-    public static LocalDate convertToLocalDate(Date dateToConvert) {
-        return dateToConvert.toInstant()
-                .atZone(ZoneId.systemDefault())
-                .toLocalDate();
-    }
 }

src/main/java/ru/ulstu/core/util/NumberUtils.java

@@ -0,0 +1,17 @@
+package ru.ulstu.core.util;
+
+public class NumberUtils {
+    public static Double ceil(Double number) {
+        if (number == null) {
+            return 0.0;
+        }
+        return Double.valueOf(Math.ceil(number));
+    }
+
+    public static Double round(Double number) {
+        if (number == null) {
+            return 0.0;
+        }
+        return Double.valueOf(Math.ceil(number * 100)) / 100;
+    }
+}

src/main/java/ru/ulstu/core/util/StreamApiUtils.java

@@ -11,12 +11,12 @@ public class StreamApiUtils {
     public static <T, R> List<T> convert(List<R> entities, Function<R, T> converter) {
         return entities == null
                 ? Collections.emptyList()
-                : entities.stream().map(converter).collect(Collectors.toList());
+                : entities.stream().map(e -> converter.apply(e)).collect(Collectors.toList());
     }
 
     public static <T, R> Set<T> convert(Set<R> entities, Function<R, T> converter) {
         return entities == null
                 ? Collections.emptySet()
-                : entities.stream().map(converter).collect(Collectors.toSet());
+                : entities.stream().map(e -> converter.apply(e)).collect(Collectors.toSet());
     }
 }

src/main/java/ru/ulstu/deadline/model/Deadline.java

@@ -2,17 +2,13 @@ package ru.ulstu.deadline.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.core.model.BaseEntity;
-import ru.ulstu.user.model.User;
 
+import javax.persistence.Entity;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import java.util.Date;
-import java.util.List;
 import java.util.Objects;
 
 @Entity
@@ -20,15 +16,10 @@ public class Deadline extends BaseEntity {
 
     private String description;
 
-    @Temporal(value = TemporalType.DATE)
+    @Temporal(value = TemporalType.TIMESTAMP)
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
-    @OneToMany(targetEntity = User.class, fetch = FetchType.EAGER)
-    private List<User> executors;
-
-    private Boolean done;
-
     public Deadline() {
     }
 
@@ -37,24 +28,13 @@ public class Deadline extends BaseEntity {
         this.description = description;
     }
 
-    public Deadline(Date deadlineDate, String description, List<User> executors, Boolean done) {
-        this.date = deadlineDate;
-        this.description = description;
-        this.executors = executors;
-        this.done = done;
-    }
-
     @JsonCreator
     public Deadline(@JsonProperty("id") Integer id,
                     @JsonProperty("description") String description,
-                    @JsonProperty("date") Date date,
+                    @JsonProperty("date") Date date) {
-                    @JsonProperty("executors") List<User> executors,
-                    @JsonProperty("done") Boolean done) {
         this.setId(id);
         this.description = description;
         this.date = date;
-        this.executors = executors;
-        this.done = done;
     }
 
     public String getDescription() {
@@ -73,22 +53,6 @@ public class Deadline extends BaseEntity {
         this.date = date;
     }
 
-    public List<User> getExecutors() {
-        return executors;
-    }
-
-    public void setExecutors(List<User> executors) {
-        this.executors = executors;
-    }
-
-    public Boolean getDone() {
-        return done;
-    }
-
-    public void setDone(Boolean done) {
-        this.done = done;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -113,6 +77,6 @@ public class Deadline extends BaseEntity {
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), description, date, executors, done);
+        return Objects.hash(super.hashCode(), description, date);
     }
 }

src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java

@@ -2,14 +2,8 @@ package ru.ulstu.deadline.repository;
 
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import ru.ulstu.deadline.model.Deadline;
 
-import java.util.Date;
-
 public interface DeadlineRepository extends JpaRepository<Deadline, Integer> {
 
-    @Query("SELECT d.date FROM Grant g JOIN g.deadlines d WHERE (g.id = :id) AND (d.date = :date)")
-    Date findByGrantIdAndDate(@Param("id") Integer grantId, @Param("date") Date date);
 }

src/main/java/ru/ulstu/deadline/service/DeadlineService.java

@@ -2,12 +2,9 @@ package ru.ulstu.deadline.service;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ru.ulstu.core.util.DateUtils;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.repository.DeadlineRepository;
 
-import java.time.temporal.ChronoUnit;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -28,12 +25,10 @@ public class DeadlineService {
     }
 
     @Transactional
-    private Deadline update(Deadline deadline) {
+    public Deadline update(Deadline deadline) {
-        Deadline updateDeadline = deadlineRepository.getOne(deadline.getId());
+        Deadline updateDeadline = deadlineRepository.findOne(deadline.getId());
         updateDeadline.setDate(deadline.getDate());
         updateDeadline.setDescription(deadline.getDescription());
-        updateDeadline.setExecutors(deadline.getExecutors());
-        updateDeadline.setDone(deadline.getDone());
         deadlineRepository.save(updateDeadline);
         return updateDeadline;
     }
@@ -43,39 +38,12 @@ public class DeadlineService {
         Deadline newDeadline = new Deadline();
         newDeadline.setDate(deadline.getDate());
         newDeadline.setDescription(deadline.getDescription());
-        newDeadline.setExecutors(deadline.getExecutors());
-        newDeadline.setDone(deadline.getDone());
         newDeadline = deadlineRepository.save(newDeadline);
         return newDeadline;
     }
 
-    public Deadline create(Date date) {
-        Deadline deadline = new Deadline();
-        deadline.setDate(date);
-        return create(deadline);
-    }
-
-    public Deadline create(String description, Date date) {
-        Deadline deadline = new Deadline();
-        deadline.setDate(date);
-        deadline.setDescription(description);
-        return create(deadline);
-    }
-
     @Transactional
     public void remove(Integer deadlineId) {
-        deadlineRepository.deleteById(deadlineId);
+        deadlineRepository.delete(deadlineId);
-    }
-
-    public Date findByGrantIdAndDate(Integer id, Date date) {
-        return deadlineRepository.findByGrantIdAndDate(id, date);
-    }
-
-    public Deadline createWithOffset(Date date, long value, ChronoUnit chronoUnit) {
-        return create(DateUtils.localDateToDate(DateUtils.convertToLocalDate(date).plus(value, chronoUnit)));
-    }
-
-    public void delete(List<Deadline> deadlines) {
-        deadlineRepository.deleteInBatch(deadlines);
     }
 }

src/main/java/ru/ulstu/file/FileController.java

@@ -21,10 +21,13 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static ru.ulstu.file.FileController.URL;
 
 @RestController
-@RequestMapping(Constants.API_1_0 + "files")
+@RequestMapping(URL)
 public class FileController {
+    public static final String URL = Constants.API_1_0 + "files";
+
     private final FileService fileService;
 
     public FileController(FileService fileService) {
@@ -50,6 +53,6 @@ public class FileController {
 
     @PostMapping("/uploadTmpFile")
     public Response<FileDataDto> upload(@RequestParam("file") MultipartFile multipartFile) throws IOException {
-        return new Response<>(fileService.createFromMultipartFile(multipartFile));
+        return new Response(fileService.createFromMultipartFile(multipartFile));
     }
 }

src/main/java/ru/ulstu/file/model/FileData.java

@@ -1,10 +1,10 @@
 package ru.ulstu.file.model;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
 import ru.ulstu.core.model.BaseEntity;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
 import java.util.Date;
 
 @Entity

src/main/java/ru/ulstu/file/service/FileService.java

@@ -27,15 +27,15 @@ public class FileService {
     private final static int META_FILE_NAME_INDEX = 0;
     private final static int META_FILE_SIZE_INDEX = 1;
 
-    private final String tmpDir;
+    private String tmpDir;
-    private final FileRepository fileRepository;
+    private FileRepository fileRepository;
 
     public FileService(FileRepository fileRepository) {
         tmpDir = System.getProperty("java.io.tmpdir");
         this.fileRepository = fileRepository;
     }
 
-    private FileData createFileFromTmp(String tmpFileName) throws IOException {
+    public FileData createFileFromTmp(String tmpFileName) throws IOException {
         FileData fileData = new FileData();
         fileData.setData(getTmpFile(tmpFileName));
         fileData.setSize(getTmpFileSize(tmpFileName));
@@ -43,7 +43,7 @@ public class FileService {
         return fileRepository.save(fileData);
     }
 
-    private String uploadToTmpDir(MultipartFile multipartFile) throws IOException {
+    public String uploadToTmpDir(MultipartFile multipartFile) throws IOException {
         String tmpFileName = String.valueOf(System.currentTimeMillis()) + UUID.randomUUID();
         Files.write(getTmpFilePath(tmpFileName), multipartFile.getBytes());
         String meta = multipartFile.getOriginalFilename() + "\n" + multipartFile.getSize();
@@ -56,7 +56,7 @@ public class FileService {
                 .split("\n");
     }
 
-    private long getTmpFileSize(String tmpFileName) throws IOException {
+    public long getTmpFileSize(String tmpFileName) throws IOException {
         return Long.valueOf(getMeta(tmpFileName)[META_FILE_SIZE_INDEX]).longValue();
     }
 
@@ -69,7 +69,7 @@ public class FileService {
     }
 
     public FileData getFile(Integer fileId) {
-        return fileRepository.getOne(fileId);
+        return fileRepository.findOne(fileId);
     }
 
     public void deleteTmpFile(String tmpFileName) throws IOException {
@@ -97,13 +97,13 @@ public class FileService {
     }
 
     @Transactional
-    private FileData update(FileDataDto fileDataDto) {
+    public FileData update(FileDataDto fileDataDto) {
-        FileData file = fileRepository.getOne(fileDataDto.getId());
+        FileData file = fileRepository.findOne(fileDataDto.getId());
         return fileRepository.save(copyFromDto(file, fileDataDto));
     }
 
     @Transactional
-    private FileData create(FileDataDto fileDataDto) throws IOException {
+    public FileData create(FileDataDto fileDataDto) throws IOException {
         FileData newFile = createFileFromTmp(fileDataDto.getTmpFileName());
         copyFromDto(newFile, fileDataDto);
         return fileRepository.save(newFile);
@@ -117,7 +117,7 @@ public class FileService {
 
     @Transactional
     public void delete(Integer fileId) {
-        fileRepository.delete(fileRepository.getOne(fileId));
+        fileRepository.delete(fileRepository.findOne(fileId));
     }
 
     public FileDataDto createFromMultipartFile(MultipartFile multipartFile) throws IOException {
@@ -134,7 +134,7 @@ public class FileService {
                 File renamed = getTmpFilePath(fileDataDto.getName()).toFile();
                 oldFile.renameTo(renamed);
             } else {
-                Files.write(getTmpFilePath(fileDataDto.getName()), fileRepository.getOne(fileDataDto.getId()).getData());
+                Files.write(getTmpFilePath(fileDataDto.getName()), fileRepository.findOne(fileDataDto.getId()).getData());
             }
         }
     }

src/main/java/ru/ulstu/grant/controller/GrantController.java

@@ -1,7 +1,5 @@
 package ru.ulstu.grant.controller;
 
-import io.swagger.v3.oas.annotations.Hidden;
-import jakarta.validation.Valid;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.Errors;
@@ -11,17 +9,20 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.service.GrantService;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.user.model.User;
+import springfox.documentation.annotations.ApiIgnore;
 
+import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import static org.springframework.util.StringUtils.isEmpty;
 import static ru.ulstu.core.controller.Navigation.GRANTS_PAGE;
 import static ru.ulstu.core.controller.Navigation.GRANT_PAGE;
 import static ru.ulstu.core.controller.Navigation.REDIRECT_TO;
@@ -29,7 +30,7 @@ import static ru.ulstu.core.controller.Navigation.REDIRECT_TO;
 
 @Controller()
 @RequestMapping(value = "/grants")
-@Hidden
+@ApiIgnore
 public class GrantController {
     private final GrantService grantService;
 
@@ -44,13 +45,13 @@ public class GrantController {
 
     @GetMapping("/dashboard")
     public void getDashboard(ModelMap modelMap) {
-        modelMap.put("grants", grantService.findAllActiveDto());
+        modelMap.put("grants", grantService.findAllDto());
     }
 
     @GetMapping("/grant")
     public void getGrant(ModelMap modelMap, @RequestParam(value = "id") Integer id) {
         if (id != null && id > 0) {
-            GrantDto grantDto = grantService.getExistGrantById(id);
+            GrantDto grantDto = grantService.findOneDto(id);
             attachPaper(grantDto);
             modelMap.put("grantDto", grantDto);
         } else {
@@ -61,9 +62,17 @@ public class GrantController {
     @PostMapping(value = "/grant", params = "save")
     public String save(@Valid GrantDto grantDto, Errors errors)
             throws IOException {
-        if (!grantService.save(grantDto, errors)) {
+        filterEmptyDeadlines(grantDto);
+        if (grantDto.getDeadlines().isEmpty()) {
+            errors.rejectValue("deadlines", "errorCode", "Не может быть пусто");
+        }
+        if (grantDto.getLeaderId().equals(-1)) {
+            errors.rejectValue("leaderId", "errorCode", "Укажите руководителя");
+        }
+        if (errors.hasErrors()) {
             return GRANT_PAGE;
         }
+        grantService.save(grantDto);
         return String.format(REDIRECT_TO, GRANTS_PAGE);
     }
 
@@ -80,7 +89,7 @@ public class GrantController {
 
     @PostMapping(value = "/grant", params = "addDeadline")
     public String addDeadline(@Valid GrantDto grantDto, Errors errors) {
-        grantService.filterEmptyDeadlines(grantDto);
+        filterEmptyDeadlines(grantDto);
         if (errors.hasErrors()) {
             return GRANT_PAGE;
         }
@@ -125,9 +134,9 @@ public class GrantController {
         return grantService.getAllUncompletedPapers();
     }
 
-    @ResponseBody
+    private void filterEmptyDeadlines(GrantDto grantDto) {
-    @PostMapping(value = "/ping")
+        grantDto.setDeadlines(grantDto.getDeadlines().stream()
-    public void ping(@RequestParam("grantId") int grantId) throws IOException {
+                .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
-        grantService.ping(grantId);
+                .collect(Collectors.toList()));
     }
 }

src/main/java/ru/ulstu/grant/controller/GrantRestController.java

@@ -1,29 +0,0 @@
-package ru.ulstu.grant.controller;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import ru.ulstu.configuration.Constants;
-import ru.ulstu.grant.service.GrantService;
-
-import java.io.IOException;
-import java.text.ParseException;
-
-import static ru.ulstu.paper.controller.PaperRestController.URL;
-
-@RestController
-@RequestMapping(URL)
-public class GrantRestController {
-    public static final String URL = Constants.API_1_0 + "grants";
-
-    private final GrantService grantService;
-
-    public GrantRestController(GrantService grantService) {
-        this.grantService = grantService;
-    }
-
-    @GetMapping("/grab")
-    public void grab() throws IOException, ParseException {
-        grantService.createFromKias();
-    }
-}

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

@@ -1,25 +1,10 @@
 package ru.ulstu.grant.model;
 
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.DiscriminatorValue;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OrderBy;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 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.core.model.UserActivity;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
 import ru.ulstu.paper.model.Paper;
@@ -27,8 +12,20 @@ import ru.ulstu.project.model.Project;
 import ru.ulstu.timeline.model.Event;
 import ru.ulstu.user.model.User;
 
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+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;
@@ -38,33 +35,25 @@ import java.util.Set;
 
 @Entity
 @Table(name = "grants")
-@DiscriminatorValue("GRANT")
+public class Grant extends BaseEntity implements UserContainer {
-public class Grant extends BaseEntity implements UserActivity, EventSource {
     public enum GrantStatus {
-        APPLICATION("Заявка", "text-draft"),
+        APPLICATION("Заявка"),
-        ON_COMPETITION("Отправлен на конкурс", "text-review"),
+        ON_COMPETITION("Отправлен на конкурс"),
-        SUCCESSFUL_PASSAGE("Успешное прохождение", "text-accepted"),
+        SUCCESSFUL_PASSAGE("Успешное прохождение"),
-        IN_WORK("В работе", "text-primary"),
+        IN_WORK("В работе"),
-        COMPLETED("Завершен", "text-success"),
+        COMPLETED("Завершен"),
-        FAILED("Провалены сроки", "text-failed"),
+        FAILED("Провалены сроки"),
-        LOADED_FROM_KIAS("Загружен автоматически", "text-warning"),
+        LOADED_FROM_KIAS("Загружен автоматически");
-        SKIPPED("Не интересует", "text-not-accepted");
 
-        private final String statusName;
+        private String statusName;
-        private final String elementClass;
 
-        GrantStatus(String statusName, String elementClass) {
+        GrantStatus(String statusName) {
             this.statusName = statusName;
-            this.elementClass = elementClass;
         }
 
         public String getStatusName() {
             return statusName;
         }
-
-        public String getElementClass() {
-            return elementClass;
-        }
     }
 
     @NotBlank
@@ -73,14 +62,14 @@ public class Grant extends BaseEntity implements UserActivity, EventSource {
     @Enumerated(value = EnumType.STRING)
     private GrantStatus status = GrantStatus.APPLICATION;
 
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "grant_id")
     @OrderBy("date")
     private List<Deadline> deadlines = new ArrayList<>();
 
     private String comment;
 
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     @JoinColumn(name = "grant_id", unique = true)
     @Fetch(FetchMode.SUBSELECT)
     private List<FileData> files = new ArrayList<>();
@@ -144,16 +133,6 @@ public class Grant extends BaseEntity implements UserActivity, EventSource {
         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;
     }
@@ -175,7 +154,7 @@ public class Grant extends BaseEntity implements UserActivity, EventSource {
     }
 
     @Override
-    public Set<User> getActivityUsers() {
+    public Set<User> getUsers() {
         return getAuthors();
     }
 

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

@@ -2,24 +2,22 @@ package ru.ulstu.grant.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.NotEmpty;
 import org.apache.commons.lang3.StringUtils;
+import org.hibernate.validator.constraints.NotEmpty;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileDataDto;
-import ru.ulstu.name.NameContainer;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.user.model.UserDto;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 
-public class GrantDto extends NameContainer {
+public class GrantDto {
     private final static int MAX_AUTHORS_LENGTH = 60;
 
     private Integer id;
@@ -97,12 +95,6 @@ public class GrantDto extends NameContainer {
         this.papers = convert(grant.getPapers(), PaperDto::new);
     }
 
-    public GrantDto(String grantTitle, Date deadLineDate) {
-        this.title = grantTitle;
-        deadlines.add(new Deadline(deadLineDate, "Окончание приёма заявок"));
-        status = Grant.GrantStatus.LOADED_FROM_KIAS;
-    }
-
     public Integer getId() {
         return id;
     }

src/main/java/ru/ulstu/grant/page/KiasPage.java

@@ -1,55 +0,0 @@
-package ru.ulstu.grant.page;
-
-import com.gargoylesoftware.htmlunit.html.DomNode;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-public class KiasPage {
-    private final static String KIAS_GRANT_DATE_FORMAT = "dd.MM.yyyy HH:mm";
-    private final HtmlPage page;
-
-    public KiasPage(HtmlPage page) {
-        this.page = page;
-    }
-
-    public boolean goToNextPage() {
-        try {
-            HtmlElement nextPageLink = page.getHtmlElementById("js-ctrlNext");
-            if (nextPageLink.isDisplayed()) {
-                nextPageLink.click();
-                return true;
-            }
-        } finally {
-            return false;
-        }
-    }
-
-    public List<DomNode> getPageOfGrants() {
-        return page.getByXPath("/html/body/div[2]/div/div[2]/main/div[1]/table/tbody/tr");
-    }
-
-    public String getGrantTitle(DomNode grant) {
-        return ((DomNode) grant.getFirstByXPath("td[2]")).getTextContent() + " "
-                + ((DomNode) grant.getFirstByXPath("td[@class='tertiary']/a")).getTextContent();
-    }
-
-    public Date parseDeadLineDate(DomNode grantElement) throws ParseException {
-        String deadlineDate = getFirstDeadline(grantElement); //10.06.2019 23:59
-        SimpleDateFormat formatter = new SimpleDateFormat(KIAS_GRANT_DATE_FORMAT);
-        return formatter.parse(deadlineDate);
-    }
-
-    private String getFirstDeadline(DomNode grantElement) {
-        return ((DomNode) grantElement.getFirstByXPath("td[5]")).getTextContent();
-    }
-
-    public boolean isTableRowGrantLine(DomNode grantElement) {
-        return !((HtmlTableRow) grantElement).getAttribute("class").contains("pagerSavedHeightSpacer");
-    }
-}

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

@@ -1,25 +1,11 @@
 package ru.ulstu.grant.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import ru.ulstu.grant.model.Grant;
-import ru.ulstu.name.BaseRepository;
 
 import java.util.List;
 
-public interface GrantRepository extends JpaRepository<Grant, Integer>, BaseRepository {
+public interface GrantRepository extends JpaRepository<Grant, Integer> {
 
     List<Grant> findByStatus(Grant.GrantStatus status);
-
-    Grant findFirstByTitle(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) ")
-    List<String> findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
-
-    @Query("SELECT g FROM Grant g WHERE (g.status <> 'SKIPPED') AND (g.status <> 'COMPLETED')")
-    List<Grant> findAllActive();
 }

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

@@ -1,5 +1,6 @@
 package ru.ulstu.grant.service;
 
+import com.google.common.collect.ImmutableMap;
 import org.springframework.stereotype.Service;
 import ru.ulstu.core.util.DateUtils;
 import ru.ulstu.grant.model.Grant;
@@ -45,22 +46,22 @@ public class GrantNotificationService {
     }
 
     private void sendMessageDeadline(Grant grant) {
-        Map<String, Object> variables = Map.of("grant", grant);
+        Map<String, Object> variables = ImmutableMap.of("grant", grant);
         sendForAllAuthors(variables, grant, TEMPLATE_DEADLINE, String.format(TITLE_DEADLINE, grant.getTitle()));
     }
 
     public void sendCreateNotification(Grant grant) {
-        Map<String, Object> variables = Map.of("grant", grant);
+        Map<String, Object> variables = ImmutableMap.of("grant", grant);
         sendForAllAuthors(variables, grant, TEMPLATE_CREATE, String.format(TITLE_CREATE, grant.getTitle()));
     }
 
     public void sendAuthorsChangeNotification(Grant grant, Set<User> oldAuthors) {
-        Map<String, Object> variables = Map.of("grant", grant, "oldAuthors", oldAuthors);
+        Map<String, Object> variables = ImmutableMap.of("grant", grant, "oldAuthors", oldAuthors);
         sendForAllAuthors(variables, grant, TEMPLATE_AUTHORS_CHANGED, String.format(TITLE_AUTHORS_CHANGED, grant.getTitle()));
     }
 
     public void sendLeaderChangeNotification(Grant grant, User oldLeader) {
-        Map<String, Object> variables = Map.of("grant", grant, "oldLeader", oldLeader);
+        Map<String, Object> variables = ImmutableMap.of("grant", grant, "oldLeader", oldLeader);
         sendForAllAuthors(variables, grant, TEMPLATE_LEADER_CHANGED, String.format(TITLE_LEADER_CHANGED, grant.getTitle()));
     }
 

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

@@ -24,18 +24,7 @@ public class GrantScheduler {
     @Scheduled(cron = "0 0 8 * * MON", zone = "Europe/Samara")
     public void checkDeadlineBeforeWeek() {
         log.debug("GrantScheduler.checkDeadlineBeforeWeek started");
-        grantNotificationService.sendDeadlineNotifications(grantService.findAllActive(), IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
+        grantNotificationService.sendDeadlineNotifications(grantService.findAll(), IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
         log.debug("GrantScheduler.checkDeadlineBeforeWeek finished");
     }
-
-    @Scheduled(cron = "0 0 8 * * ?", zone = "Europe/Samara")
-    public void loadGrantsFromKias() {
-        log.debug("GrantScheduler.loadGrantsFromKias started");
-//        try {
-//            grantService.createFromKias();
-//        } catch (ParseException | IOException e) {
-//            e.printStackTrace();
-//        }
-        log.debug("GrantScheduler.loadGrantsFromKias finished");
-    }
 }

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

@@ -1,12 +1,8 @@
 package ru.ulstu.grant.service;
 
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.Errors;
-import ru.ulstu.core.util.DateUtils;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.file.model.FileDataDto;
@@ -14,11 +10,10 @@ import ru.ulstu.file.service.FileService;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.repository.GrantRepository;
-import ru.ulstu.name.BaseService;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.paper.service.PaperService;
-import ru.ulstu.ping.service.PingService;
+import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.project.service.ProjectService;
 import ru.ulstu.timeline.service.EventService;
@@ -26,15 +21,12 @@ import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
-import java.text.ParseException;
-import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toList;
 import static org.springframework.util.ObjectUtils.isEmpty;
@@ -42,8 +34,8 @@ import static ru.ulstu.core.util.StreamApiUtils.convert;
 import static ru.ulstu.grant.model.Grant.GrantStatus.APPLICATION;
 
 @Service
-public class GrantService extends BaseService {
+public class GrantService {
-    private final Logger log = LoggerFactory.getLogger(GrantService.class);
+    private final static int MAX_DISPLAY_SIZE = 50;
 
     private final GrantRepository grantRepository;
     private final ProjectService projectService;
@@ -53,8 +45,6 @@ public class GrantService extends BaseService {
     private final PaperService paperService;
     private final EventService eventService;
     private final GrantNotificationService grantNotificationService;
-    private final KiasService kiasService;
-    private final PingService pingService;
 
     public GrantService(GrantRepository grantRepository,
                         FileService fileService,
@@ -63,12 +53,8 @@ public class GrantService extends BaseService {
                         UserService userService,
                         PaperService paperService,
                         EventService eventService,
-                        GrantNotificationService grantNotificationService,
+                        GrantNotificationService grantNotificationService) {
-                        KiasService kiasService,
-                        PingService pingService) {
         this.grantRepository = grantRepository;
-        this.kiasService = kiasService;
-        this.baseRepository = grantRepository;
         this.fileService = fileService;
         this.deadlineService = deadlineService;
         this.projectService = projectService;
@@ -76,11 +62,6 @@ public class GrantService extends BaseService {
         this.paperService = paperService;
         this.eventService = eventService;
         this.grantNotificationService = grantNotificationService;
-        this.pingService = pingService;
-    }
-
-    public GrantDto getExistGrantById(Integer id) {
-        return new GrantDto(findById(id));
     }
 
     public List<Grant> findAll() {
@@ -88,16 +69,22 @@ public class GrantService extends BaseService {
     }
 
     public List<GrantDto> findAllDto() {
-        return convert(findAll(), GrantDto::new);
+        List<GrantDto> grants = convert(findAll(), GrantDto::new);
+        grants.forEach(grantDto -> grantDto.setTitle(StringUtils.abbreviate(grantDto.getTitle(), MAX_DISPLAY_SIZE)));
+        return grants;
+    }
+
+    public GrantDto findOneDto(Integer id) {
+        return new GrantDto(grantRepository.findOne(id));
     }
 
     @Transactional
-    public Grant create(GrantDto grantDto) throws IOException {
+    public Integer create(GrantDto grantDto) throws IOException {
         Grant newGrant = copyFromDto(new Grant(), grantDto);
         newGrant = grantRepository.save(newGrant);
-        eventService.createFromObject(newGrant, Collections.emptyList(), false, "гранта");
+        eventService.createFromGrant(newGrant);
         grantNotificationService.sendCreateNotification(newGrant);
-        return newGrant;
+        return newGrant.getId();
     }
 
     private Grant copyFromDto(Grant grant, GrantDto grantDto) throws IOException {
@@ -108,11 +95,9 @@ public class GrantService extends BaseService {
             grant.setProject(projectService.findById(grantDto.getProject().getId()));
         }
         grant.setDeadlines(deadlineService.saveOrCreate(grantDto.getDeadlines()));
-        if (!grant.getFiles().isEmpty()) {
         grant.setFiles(fileService.saveOrCreate(grantDto.getFiles().stream()
                 .filter(f -> !f.isDeleted())
                 .collect(toList())));
-        }
         grant.getAuthors().clear();
         if (grantDto.getAuthorIds() != null && !grantDto.getAuthorIds().isEmpty()) {
             grantDto.getAuthorIds().forEach(authorIds -> grant.getAuthors().add(userService.findById(authorIds)));
@@ -127,15 +112,14 @@ public class GrantService extends BaseService {
         return grant;
     }
 
-
     public void createProject(GrantDto grantDto) throws IOException {
         grantDto.setProject(
                 new ProjectDto(projectService.save(new ProjectDto(grantDto.getTitle()))));
     }
 
     @Transactional
-    private Integer update(GrantDto grantDto) throws IOException {
+    public Integer update(GrantDto grantDto) throws IOException {
-        Grant grant = findById(grantDto.getId());
+        Grant grant = grantRepository.findOne(grantDto.getId());
         Set<User> oldAuthors = new HashSet<>(grant.getAuthors());
         User oldLeader = grant.getLeader();
         for (FileDataDto file : grantDto.getFiles().stream()
@@ -164,69 +148,40 @@ public class GrantService extends BaseService {
     }
 
     @Transactional
-    public boolean delete(Integer grantId) throws IOException {
+    public void delete(Integer grantId) throws IOException {
-        Grant grant = findById(grantId);
+        Grant grant = grantRepository.findOne(grantId);
-        if (grant != null) {
         grantRepository.delete(grant);
-            return true;
-        }
-        return false;
     }
 
     public List<Grant.GrantStatus> getGrantStatuses() {
         return Arrays.asList(Grant.GrantStatus.values());
     }
 
-    public boolean save(GrantDto grantDto, Errors errors) throws IOException {
+    @Transactional
-        grantDto.setName(grantDto.getTitle());
+    public Grant create(String title, Project projectId, Date deadlineDate, User user, Paper paper) {
-        filterEmptyDeadlines(grantDto);
+        Grant grant = new Grant();
-        checkEmptyDeadlines(grantDto, errors);
+        grant.setTitle(title);
-        checkEmptyLeader(grantDto, errors);
+        grant.setComment("Комментарий к гранту 1");
-        checkUniqueName(grantDto, errors, grantDto.getId(), "Грант с таким именем уже существует");
+        grant.setProject(projectId);
-        if (errors.hasErrors()) {
+        grant.setStatus(APPLICATION);
-            return false;
+        grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
+        grant.getAuthors().add(user);
+        grant.setLeader(user);
+        grant.getPapers().add(paper);
+        grant = grantRepository.save(grant);
+
+        eventService.createFromGrant(grant);
+        grantNotificationService.sendCreateNotification(grant);
+
+        return grant;
     }
+
+    public void save(GrantDto grantDto) throws IOException {
         if (isEmpty(grantDto.getId())) {
             create(grantDto);
         } else {
             update(grantDto);
         }
-        return true;
-    }
-
-    private boolean saveFromKias(GrantDto grantDto) throws IOException {
-        grantDto.setName(grantDto.getTitle());
-        String title = checkUniqueName(grantDto, grantDto.getId()); //проверка уникальности имени
-        if (title != null) {
-            Grant grantFromDB = grantRepository.findFirstByTitle(title); //грант с таким же названием из бд
-            if (checkSameDeadline(grantDto, grantFromDB.getId())) { //если дедайны тоже совпадают
-                return false;
-            } else { //иначе грант уже был в системе, но в другом году, поэтому надо создать
-                create(grantDto);
-                return true;
-            }
-        } else { //иначе такого гранта ещё нет, поэтому надо создать
-            create(grantDto);
-            return true;
-        }
-    }
-
-    private void checkEmptyLeader(GrantDto grantDto, Errors errors) {
-        if (grantDto.getLeaderId().equals(-1)) {
-            errors.rejectValue("leaderId", "errorCode", "Укажите руководителя");
-        }
-    }
-
-    private void checkEmptyDeadlines(GrantDto grantDto, Errors errors) {
-        if (grantDto.getDeadlines().isEmpty()) {
-            errors.rejectValue("deadlines", "errorCode", "Не может быть пусто");
-        }
-    }
-
-    private boolean checkSameDeadline(GrantDto grantDto, Integer id) {
-        Date date = DateUtils.clearTime(grantDto.getDeadlines().get(0).getDate()); //дата с сайта киас
-        Date foundGrantDate = DateUtils.clearTime(deadlineService.findByGrantIdAndDate(id, date));
-        return foundGrantDate != null && foundGrantDate.compareTo(date) == 0;
     }
 
     public List<User> getGrantAuthors(GrantDto grantDto) {
@@ -261,25 +216,27 @@ public class GrantService extends BaseService {
     }
 
     public List<PaperDto> getAllUncompletedPapers() {
-        return paperService.findAllNotCompleted();
+        List<PaperDto> papers = paperService.findAllNotCompleted();
+        papers.stream()
+                .forEach(paper ->
+                        paper.setTitle(StringUtils.abbreviate(paper.getTitle(), MAX_DISPLAY_SIZE)));
+        return papers;
     }
 
-    public List<PaperDto> attachPaper(GrantDto grantDto) {
+    public void attachPaper(GrantDto grantDto) {
         if (!grantDto.getPaperIds().isEmpty()) {
             grantDto.getPapers().clear();
             grantDto.setPapers(getGrantPapers(grantDto.getPaperIds()));
         } else {
             grantDto.getPapers().clear();
         }
-        return grantDto.getPapers();
     }
 
-    public GrantDto removeDeadline(GrantDto grantDto, Integer deadlineId) {
+    public void removeDeadline(GrantDto grantDto, Integer deadlineId) {
         if (grantDto.getDeadlines().get(deadlineId).getId() != null) {
             grantDto.getRemovedDeadlineIds().add(grantDto.getDeadlines().get(deadlineId).getId());
         }
         grantDto.getDeadlines().remove((int) deadlineId);
-        return grantDto;
     }
 
     private List<User> getCompletedPapersAuthors(Paper.PaperType type) {
@@ -304,100 +261,4 @@ public class GrantService extends BaseService {
                 .filter(author -> Collections.frequency(authors, author) > 3)
                 .collect(toList());
     }
-
-    public List<Deadline> filterEmptyDeadlines(GrantDto grantDto) {
-        grantDto.setDeadlines(grantDto.getDeadlines().stream()
-                .filter(dto -> dto.getDate() != null || !StringUtils.isEmpty(dto.getDescription()))
-                .collect(Collectors.toList()));
-        return grantDto.getDeadlines();
-    }
-
-    @Transactional
-    public void createFromKias() throws IOException, ParseException {
-        for (GrantDto grantDto : kiasService.getNewGrantsDto()) {
-            if (saveFromKias(grantDto)) {
-                log.debug("GrantScheduler.loadGrantsFromKias new grant was loaded");
-            } else {
-                log.debug("GrantScheduler.loadGrantsFromKias grant wasn't loaded, cause it's already exists");
-            }
-        }
-    }
-
-    public List<GrantDto> findAllActiveDto() {
-        return convert(findAllActive(), GrantDto::new);
-    }
-
-    public List<Grant> findAllActive() {
-        return grantRepository.findAllActive();
-    }
-
-    public Grant findById(Integer id) {
-        return grantRepository.getOne(id);
-    }
-
-    @Transactional
-    public void ping(int grantId) throws IOException {
-        pingService.addPing(findById(grantId));
-    }
-
-    public void save(Grant grant) {
-        if (isEmpty(grant.getId())) {
-            create(grant);
-        } else {
-            update(grant);
-        }
-    }
-
-    @Transactional
-    public Grant create(Grant grant) {
-        Grant newGrant = grantRepository.save(grant);
-        grantNotificationService.sendCreateNotification(newGrant);
-        return newGrant;
-    }
-
-    @Transactional
-    public Integer update(Grant newGrant) {
-        Grant oldGrant = grantRepository.getOne(newGrant.getId());
-        //Grant.GrantStatus oldStatus = oldGrant.getStatus();
-        Set<User> oldAuthors = new HashSet<>(oldGrant.getAuthors());
-        newGrant = grantRepository.save(newGrant);
-        for (User author : newGrant.getAuthors()) {
-            if (!oldAuthors.contains(author)) {
-                grantNotificationService.sendCreateNotification(newGrant);
-            }
-        }
-
-//        if (newGrant.getStatus() != oldStatus) {
-//            grantNotificationService.statusChangeNotification(newPaper, oldStatus);
-//        }
-
-        return newGrant.getId();
-    }
-
-    public void createByTitle(String newGrantTitle) {
-        Grant grant = new Grant();
-        grant.setTitle(newGrantTitle);
-        grant.setStatus(APPLICATION);
-        grant.getAuthors().add(userService.getCurrentUser());
-        grant.setLeader(userService.getCurrentUser());
-        grant.getDeadlines().add(deadlineService.createWithOffset(new Date(), 1, ChronoUnit.WEEKS));
-        create(grant);
-    }
-
-    public List<Grant> findAllActiveByCurrentUser() {
-        return findAllActive()
-                .stream()
-                .filter(grant -> grant.getAuthors().contains(userService.getCurrentUser()) ||
-                        grant.getLeader().equals(userService.getCurrentUser()))
-                .collect(toList());
-    }
-
-    public void delete(List<Grant> grants) {
-        grants.forEach(grant -> delete(grant));
-    }
-
-    public void delete(Grant grant) {
-        deadlineService.delete(grant.getDeadlines());
-        grantRepository.delete(grant);
-    }
 }

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

@@ -1,73 +0,0 @@
-package ru.ulstu.grant.service;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.DomNode;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import org.springframework.stereotype.Service;
-import ru.ulstu.configuration.ApplicationProperties;
-import ru.ulstu.grant.model.GrantDto;
-import ru.ulstu.grant.page.KiasPage;
-import ru.ulstu.user.service.UserService;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.List;
-
-@Service
-public class KiasService {
-    private final static String BASE_URL = "https://www.rfbr.ru/rffi/ru/contest_search?CONTEST_STATUS_ID=%s&CONTEST_TYPE=%s&CONTEST_YEAR=%s";
-    private final static String CONTEST_STATUS_ID = "1";
-    private final static String CONTEST_TYPE = "-1";
-
-    private final UserService userService;
-
-    public KiasService(UserService userService,
-                       ApplicationProperties applicationProperties) {
-        this.userService = userService;
-    }
-
-    public List<GrantDto> getNewGrantsDto() throws ParseException, IOException {
-        Integer leaderId = userService.findOneByLoginIgnoreCase("admin").getId();
-        List<GrantDto> grants = new ArrayList<>();
-        try (WebClient webClient = new WebClient()) {
-            webClient.setJavaScriptTimeout(60 * 1000);
-            webClient.getOptions().setThrowExceptionOnScriptError(false);
-            for (Integer year : generateGrantYears()) {
-                final HtmlPage page = webClient.getPage(String.format(BASE_URL, CONTEST_STATUS_ID, CONTEST_TYPE, year));
-                grants.addAll(getKiasGrants(page));
-            }
-        }
-        grants.forEach(grantDto -> grantDto.setLeaderId(leaderId));
-        return grants;
-    }
-
-    private List<GrantDto> getKiasGrants(HtmlPage page) throws ParseException {
-        List<GrantDto> newGrants = new ArrayList<>();
-        KiasPage kiasPage = new KiasPage(page);
-        do {
-            newGrants.addAll(getGrantsFromPage(kiasPage));
-        } while (kiasPage.goToNextPage()); //проверка существования следующей страницы с грантами
-        return newGrants;
-    }
-
-    private List<GrantDto> getGrantsFromPage(KiasPage kiasPage) throws ParseException {
-        List<GrantDto> grants = new ArrayList<>();
-        for (DomNode grantElement : kiasPage.getPageOfGrants()) {
-            if (kiasPage.isTableRowGrantLine(grantElement)) {
-                GrantDto grantDto = new GrantDto(
-                        kiasPage.getGrantTitle(grantElement),
-                        kiasPage.parseDeadLineDate(grantElement));
-                grants.add(grantDto);
-            }
-        }
-        return grants;
-    }
-
-    private List<Integer> generateGrantYears() {
-        return Arrays.asList(Calendar.getInstance().get(Calendar.YEAR),
-                Calendar.getInstance().get(Calendar.YEAR) + 1);
-    }
-}

src/main/java/ru/ulstu/index/controller/IndexController.java

@@ -1,16 +1,16 @@
 package ru.ulstu.index.controller;
 
-import io.swagger.v3.oas.annotations.Hidden;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import ru.ulstu.core.controller.AdviceController;
 import ru.ulstu.user.service.UserService;
+import springfox.documentation.annotations.ApiIgnore;
 
 @Controller()
 @RequestMapping(value = "/index")
-@Hidden
+@ApiIgnore
 public class IndexController extends AdviceController {
     public IndexController(UserService userService) {
         super(userService);

src/main/java/ru/ulstu/index/model/Section.java

@@ -1,25 +0,0 @@
-package ru.ulstu.index.model;
-
-public class Section {
-    private final String title;
-    private final String image;
-    private final String href;
-
-    public Section(String title, String href, String image) {
-        this.title = title;
-        this.image = image;
-        this.href = href;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public String getImage() {
-        return image;
-    }
-
-    public String getHref() {
-        return href;
-    }
-}

src/main/java/ru/ulstu/name/BaseRepository.java

@@ -2,8 +2,6 @@ package ru.ulstu.name;
 
 import org.springframework.data.repository.query.Param;
 
-import java.util.List;
-
 public interface BaseRepository {
-    List<String> findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
+    String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
 }

src/main/java/ru/ulstu/name/BaseService.java

@@ -3,34 +3,14 @@ package ru.ulstu.name;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.Errors;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
 @Service
 public abstract class BaseService {
 
     public BaseRepository baseRepository;
 
-    protected void checkUniqueName(NameContainer nameContainer, Errors errors, Integer id, String errorMessage) {
+    public void checkUniqueName(NameContainer nameContainer, Errors errors, Integer id, String checkField, String errorMessage) {
-        if (nameContainer.getName().equals(getUnique(baseRepository.findByNameAndNotId(nameContainer.getName(), id)))) {
+        if (nameContainer.getName().equals(baseRepository.findByNameAndNotId(nameContainer.getName(), id))) {
-            errors.rejectValue("title", "errorCode", errorMessage);
+            errors.rejectValue(checkField, "errorCode", errorMessage);
         }
     }
-
-    protected String checkUniqueName(NameContainer nameContainer, Integer id) {
-        String foundName = getUnique(baseRepository.findByNameAndNotId(nameContainer.getName(), id));
-        if (nameContainer.getName().equals(foundName)) {
-            return foundName;
-        }
-        return null;
-    }
-
-    private String getUnique(List<String> names) {
-        return Optional.ofNullable(names)
-                .orElse(new ArrayList<>())
-                .stream()
-                .findAny()
-                .orElse(null);
-    }
 }

src/main/java/ru/ulstu/odin/controller/OdinController.java

@@ -9,10 +9,10 @@ import ru.ulstu.odin.service.OdinService;
 
 public abstract class OdinController<L, E extends OdinDto> {
     public static final String META_LIST_URL = "/meta/list";
-    private static final String META_ELEMENT_URL = "/meta/element";
+    public static final String META_ELEMENT_URL = "/meta/element";
 
-    private final Class<L> listDtoClass;
+    private Class<L> listDtoClass;
-    private final Class<E> elementDtoClass;
+    private Class<E> elementDtoClass;
     @Autowired
     private OdinService<L, E> odinService;
 

src/main/java/ru/ulstu/odin/model/OdinCollectionField.java

@@ -3,7 +3,6 @@ package ru.ulstu.odin.model;
 import ru.ulstu.core.error.OdinException;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
@@ -15,9 +14,9 @@ public class OdinCollectionField extends OdinField {
         ParameterizedType genericType = (ParameterizedType) field.getGenericType();
         Type fieldElementClass = genericType.getActualTypeArguments()[0];
         try {
-            OdinDto someInstance = (OdinDto) ((Class) (fieldElementClass)).getDeclaredConstructor().newInstance();
+            OdinDto someInstance = (OdinDto) ((Class) (fieldElementClass)).newInstance();
             this.path = someInstance.getControllerPath();
-        } catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) {
+        } catch (IllegalAccessException | InstantiationException e) {
             throw new OdinException(String.format("Can't create new instance, check default constructor of %s",
                     fieldElementClass.getTypeName()));
         }

src/main/java/ru/ulstu/odin/model/OdinField.java

@@ -1,14 +1,14 @@
 package ru.ulstu.odin.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
+import org.hibernate.validator.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
 import ru.ulstu.core.error.OdinException;
 import ru.ulstu.odin.model.annotation.OdinCaption;
 import ru.ulstu.odin.model.annotation.OdinReadOnly;
 import ru.ulstu.odin.model.annotation.OdinVisible;
 
+import javax.validation.constraints.NotNull;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -31,16 +31,15 @@ public abstract class OdinField implements Comparable {
             return this.name().toLowerCase();
         }
     }
+    protected final OdinFieldType fieldType;
+    protected final String fieldName;
+    protected final String caption;
+    protected final OdinVisible.OdinVisibleType visible;
+    protected final boolean readOnly;
+    protected final boolean notEmpty;
+    private Field field;
 
-    private final OdinFieldType fieldType;
+    public OdinField(Field field, OdinFieldType fieldType) {
-    private final String fieldName;
-    private final String caption;
-    private final OdinVisible.OdinVisibleType visible;
-    private final boolean readOnly;
-    private final boolean notEmpty;
-    private final Field field;
-
-    OdinField(Field field, OdinFieldType fieldType) {
         this.field = field;
         this.fieldName = getFieldName(field);
         this.caption = Optional.ofNullable(getValueFromAnnotation(OdinCaption.class, "value"))
@@ -93,7 +92,7 @@ public abstract class OdinField implements Comparable {
         }
     }
 
-    <T> T getValue(Class<? extends Annotation> annotationClass, String valueName, Class<T> clazz) {
+    protected <T> T getValue(Class<? extends Annotation> annotationClass, String valueName, Class<T> clazz) {
         if (field.isAnnotationPresent(annotationClass)) {
             return cast(getValueFromAnnotation(annotationClass, valueName), clazz);
         }

src/main/java/ru/ulstu/odin/model/OdinObjectField.java

@@ -3,7 +3,6 @@ package ru.ulstu.odin.model;
 import ru.ulstu.core.error.OdinException;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;
 
 public class OdinObjectField extends OdinField {
@@ -13,9 +12,9 @@ public class OdinObjectField extends OdinField {
         super(field, OdinFieldType.OBJECT);
         Type fieldElementClass = field.getType();
         try {
-            OdinDto someInstance = (OdinDto) ((Class) (fieldElementClass)).getDeclaredConstructor().newInstance();
+            OdinDto someInstance = (OdinDto) ((Class) (fieldElementClass)).newInstance();
             this.path = someInstance.getControllerPath();
-        } catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) {
+        } catch (IllegalAccessException | InstantiationException e) {
             throw new OdinException(String.format("Can't create new instance, check default constructor of %s",
                     fieldElementClass.getTypeName()));
         }

src/main/java/ru/ulstu/odin/model/OdinStringField.java

@@ -1,10 +1,10 @@
 package ru.ulstu.odin.model;
 
-import jakarta.validation.constraints.Email;
+import org.hibernate.validator.constraints.Email;
-import jakarta.validation.constraints.Size;
 import ru.ulstu.odin.model.annotation.OdinString;
 import ru.ulstu.odin.model.annotation.OdinString.OdinStringType;
 
+import javax.validation.constraints.Size;
 import java.lang.reflect.Field;
 
 import static ru.ulstu.odin.model.annotation.OdinString.OdinStringType.EMAIL;

src/main/java/ru/ulstu/odinexample/controller/OdinExampleController.java

@@ -0,0 +1,4 @@
+package ru.ulstu.odinexample.controller;
+
+public class OdinExampleController {
+}

src/main/java/ru/ulstu/odinexample/model/OdinExampleDto.java

@@ -0,0 +1,4 @@
+package ru.ulstu.odinexample.model;
+
+public class OdinExampleDto {
+}

src/main/java/ru/ulstu/odinexample/model/OdinExampleListDto.java

@@ -0,0 +1,103 @@
+package ru.ulstu.odinexample.model;
+
+import ru.ulstu.core.util.DateUtils;
+import ru.ulstu.odin.model.annotation.OdinCaption;
+import ru.ulstu.odin.model.annotation.OdinDate;
+import ru.ulstu.odin.model.annotation.OdinNumeric;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Date;
+
+public class OdinExampleListDto {
+    @OdinCaption("instant")
+    @OdinDate(type = OdinDate.OdinDateType.DATETIME)
+    private Instant instant;
+    @OdinCaption("date")
+    private Date date;
+    @OdinCaption("localdate")
+    private LocalDate localDate;
+    @OdinCaption("localtime")
+    @OdinDate(type = OdinDate.OdinDateType.TIME)
+    private LocalTime localTime;
+    @OdinCaption("localdatetime")
+    @OdinDate(type = OdinDate.OdinDateType.DATETIME)
+    private LocalDateTime localDateTime;
+    @OdinCaption("int")
+    private int intval;
+    @OdinCaption("int+settings")
+    @OdinNumeric(precision = 5, scale = 2)
+    private int intvalset;
+    @OdinCaption("float")
+    private float floatval;
+    @OdinCaption("double")
+    private double aDouble;
+    @OdinCaption("double+set")
+    @OdinNumeric(precision = 5, scale = 3)
+    private double aDoubles;
+    @OdinCaption("int+positive")
+    @OdinNumeric(positiveOnly = true, scale = 2)
+    private int invalpos;
+
+    public OdinExampleListDto() {
+        this.instant = Instant.now();
+        this.date = new Date();
+        this.localDate = LocalDate.now();
+        this.localTime = LocalTime.now();
+        this.localDateTime = LocalDateTime.now();
+        intval = -134;
+        intvalset = 1343423232;
+        floatval = 2323.44F;
+        aDouble = -232323.43434;
+        aDoubles = 0.456456456;
+        invalpos = -23232323;
+    }
+
+
+    public Date getInstant() {
+        return DateUtils.instantToDate(instant);
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public Date getLocalDate() {
+        return DateUtils.localDateToDate(localDate);
+    }
+
+    public Date getLocalTime() {
+        return DateUtils.localTimeToDate(localTime);
+    }
+
+    public Date getLocalDateTime() {
+        return DateUtils.localDateTimeToDate(localDateTime);
+    }
+
+    public int getIntval() {
+        return intval;
+    }
+
+    public int getIntvalset() {
+        return intvalset;
+    }
+
+    public float getFloatval() {
+        return floatval;
+    }
+
+    public double getaDouble() {
+        return aDouble;
+    }
+
+    public double getaDoubles() {
+        return aDoubles;
+    }
+
+    public int getInvalpos() {
+        return invalpos;
+    }
+
+}

src/main/java/ru/ulstu/odinexample/service/OdinExampleService.java

@@ -0,0 +1,4 @@
+package ru.ulstu.odinexample.service;
+
+public class OdinExampleService {
+}

src/main/java/ru/ulstu/paper/controller/PaperController.java

@@ -1,7 +1,8 @@
 package ru.ulstu.paper.controller;
 
-import io.swagger.v3.oas.annotations.Hidden;
+import org.springframework.http.HttpHeaders;
-import jakarta.validation.Valid;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.Errors;
@@ -12,24 +13,29 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import ru.ulstu.conference.service.ConferenceService;
 import ru.ulstu.deadline.model.Deadline;
-import ru.ulstu.paper.model.AutoCompleteData;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.paper.model.PaperListDto;
 import ru.ulstu.paper.service.LatexService;
 import ru.ulstu.paper.service.PaperService;
 import ru.ulstu.user.model.User;
+import springfox.documentation.annotations.ApiIgnore;
 
+import javax.validation.Valid;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.springframework.util.StringUtils.isEmpty;
+
 
 @Controller()
 @RequestMapping(value = "/papers")
-@Hidden
+@ApiIgnore
 public class PaperController {
     private final PaperService paperService;
     private final ConferenceService conferenceService;
@@ -68,7 +74,7 @@ public class PaperController {
     }
 
     @GetMapping("/paper")
-    public void getPaper(ModelMap modelMap, @RequestParam(value = "id") Integer id) {
+    public void getPapers(ModelMap modelMap, @RequestParam(value = "id") Integer id) {
         if (id != null && id > 0) {
             modelMap.put("paperDto", paperService.findOneDto(id));
         } else {
@@ -123,14 +129,17 @@ public class PaperController {
         return years;
     }
 
-    @ModelAttribute("autocompleteData")
+    @PostMapping("/generatePdf")
-    public AutoCompleteData getAutocompleteData() {
+    public ResponseEntity<byte[]> getPdfFile(PaperDto paper) throws IOException, InterruptedException {
-        return paperService.getAutoCompleteData();
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Disposition", "attachment; filename='" +
+                URLEncoder.encode(paper.getTitle() + ".pdf", UTF_8.toString()) + "'");
+        return new ResponseEntity<>(latexService.generatePdfFromLatexFile(paper), headers, HttpStatus.OK);
     }
 
     private void filterEmptyDeadlines(PaperDto paperDto) {
         paperDto.setDeadlines(paperDto.getDeadlines().stream()
-                .filter(dto -> dto.getDate() != null || !dto.getDescription().isEmpty())
+                .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
                 .collect(Collectors.toList()));
     }
 }

src/main/java/ru/ulstu/paper/controller/PaperRestController.java

@@ -1,6 +1,5 @@
 package ru.ulstu.paper.controller;
 
-import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -8,7 +7,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import ru.ulstu.configuration.Constants;
 import ru.ulstu.core.model.response.Response;
@@ -17,6 +15,7 @@ import ru.ulstu.paper.model.PaperListDto;
 import ru.ulstu.paper.model.ReferenceDto;
 import ru.ulstu.paper.service.PaperService;
 
+import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 
@@ -40,7 +39,7 @@ public class PaperRestController {
 
     @GetMapping("/{paper-id}")
     public Response<PaperDto> getPaper(@PathVariable("paper-id") Integer paperId) {
-        return new Response<>(paperService.findById(paperId));
+        return new Response(paperService.findById(paperId));
     }
 
     @PostMapping
@@ -56,7 +55,7 @@ public class PaperRestController {
     @DeleteMapping("/{paper-id}")
     public Response<Boolean> delete(@PathVariable("paper-id") Integer paperId) throws IOException {
         paperService.delete(paperId);
-        return new Response<>(Boolean.TRUE);
+        return new Response<>(true);
     }
 
     @PostMapping("/filter")
@@ -73,9 +72,4 @@ public class PaperRestController {
     public Response<String> getFormattedReference(@RequestBody @Valid ReferenceDto referenceDto) {
         return new Response<>(paperService.getFormattedReference(referenceDto));
     }
-
-    @PostMapping(value = "/ping")
-    public void ping(@RequestParam("paperId") int paperId) throws IOException {
-        paperService.ping(paperId);
-    }
 }

src/main/java/ru/ulstu/paper/error/PaperConferenceRelationExistException.java

@@ -0,0 +1,7 @@
+package ru.ulstu.paper.error;
+
+public class PaperConferenceRelationExistException extends RuntimeException {
+    public PaperConferenceRelationExistException(String message) {
+        super(message);
+    }
+}

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

@@ -1,43 +0,0 @@
-package ru.ulstu.paper.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class AutoCompleteData {
-    private List<String> authors = new ArrayList<>();
-    private List<String> publicationTitles = new ArrayList<>();
-    private List<String> publishers = new ArrayList<>();
-    private List<String> journalOrCollectionTitles = new ArrayList<>();
-
-    public List<String> getAuthors() {
-        return authors;
-    }
-
-    public void setAuthors(List<String> authors) {
-        this.authors = authors;
-    }
-
-    public List<String> getPublicationTitles() {
-        return publicationTitles;
-    }
-
-    public void setPublicationTitles(List<String> publicationTitles) {
-        this.publicationTitles = publicationTitles;
-    }
-
-    public List<String> getPublishers() {
-        return publishers;
-    }
-
-    public void setPublishers(List<String> publishers) {
-        this.publishers = publishers;
-    }
-
-    public List<String> getJournalOrCollectionTitles() {
-        return journalOrCollectionTitles;
-    }
-
-    public void setJournalOrCollectionTitles(List<String> journalOrCollectionTitles) {
-        this.journalOrCollectionTitles = journalOrCollectionTitles;
-    }
-}

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

@@ -1,33 +1,29 @@
 package ru.ulstu.paper.model;
 
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.DiscriminatorValue;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OrderBy;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
-import jakarta.validation.constraints.NotBlank;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
-import org.springframework.format.annotation.DateTimeFormat;
+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.core.model.UserActivity;
 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;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
@@ -38,33 +34,26 @@ import java.util.Optional;
 import java.util.Set;
 
 @Entity
-@DiscriminatorValue("PAPER")
+public class Paper extends BaseEntity implements UserContainer {
-public class Paper extends BaseEntity implements UserActivity, EventSource {
     public enum PaperStatus {
-        ATTENTION("Обратить внимание", "text-warning"),
+        ATTENTION("Обратить внимание"),
-        ON_PREPARATION("На подготовке", "text-primary"),
+        ON_PREPARATION("На подготовке"),
-        ON_REVIEW("Отправлена на проверку", "text-review"),
+        ON_REVIEW("Отправлена на проверку"),
-        ACCEPTED("Принята", "text-accepted"),
+        ACCEPTED("Принята"),
-        NOT_ACCEPTED("Не принята", "text-not-accepted"),
+        NOT_ACCEPTED("Не принята"),
-        COMPLETED("Завершена (опубликована)", "text-success"),
+        COMPLETED("Завершена (опубликована)"),
-        DRAFT("Черновик", "text-draft"),
+        DRAFT("Черновик"),
-        FAILED("Провалены сроки", "text-failed");
+        FAILED("Провалены сроки");
 
-        private final String statusName;
+        private String statusName;
-        private final String elementClass;
 
-        PaperStatus(String name, String elementClass) {
+        PaperStatus(String name) {
             this.statusName = name;
-            this.elementClass = elementClass;
         }
 
         public String getStatusName() {
             return statusName;
         }
-
-        public String getElementClass() {
-            return elementClass;
-        }
     }
 
     public enum PaperType {
@@ -73,7 +62,7 @@ public class Paper extends BaseEntity implements UserActivity, EventSource {
         SCOPUS("Scopus"),
         WEB_OF_SCIENCE("Web Of Science");
 
-        private final String typeName;
+        private String typeName;
 
         PaperType(String name) {
             this.typeName = name;
@@ -95,15 +84,13 @@ public class Paper extends BaseEntity implements UserActivity, EventSource {
 
     @Column(name = "create_date")
     @Temporal(TemporalType.TIMESTAMP)
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSSXXX")
     private Date createDate = new Date();
 
     @Column(name = "update_date")
     @Temporal(TemporalType.TIMESTAMP)
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSSXXX")
     private Date updateDate = new Date();
 
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     @JoinColumn(name = "paper_id", unique = true)
     @Fetch(FetchMode.SUBSELECT)
     @OrderBy("date")
@@ -126,18 +113,16 @@ public class Paper extends BaseEntity implements UserActivity, EventSource {
 
     @ManyToMany(fetch = FetchType.EAGER)
     private Set<User> authors = new HashSet<>();
-    @ManyToOne()
+
-    @JoinColumn(name = "conference_id")
+    @Column(name = "latex_text")
-    private Conference conference;
+    private String latexText;
+
+    @ManyToMany(mappedBy = "papers")
+    private List<Conference> conferences;
 
     @ManyToMany(mappedBy = "papers")
     private List<Grant> grants;
 
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-    @JoinColumn(name = "paper_id", unique = true)
-    @Fetch(FetchMode.SUBSELECT)
-    private List<Reference> references = new ArrayList<>();
-
     public PaperStatus getStatus() {
         return status;
     }
@@ -206,16 +191,6 @@ public class Paper extends BaseEntity implements UserActivity, EventSource {
         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;
     }
@@ -244,12 +219,20 @@ public class Paper extends BaseEntity implements UserActivity, EventSource {
         this.url = url;
     }
 
-    public Conference getConference() {
+    public String getLatexText() {
-        return conference;
+        return latexText;
     }
 
-    public void setConference(Conference conference) {
+    public void setLatexText(String latexText) {
-        this.conference = conference;
+        this.latexText = latexText;
+    }
+
+    public List<Conference> getConferences() {
+        return conferences;
+    }
+
+    public void setConferences(List<Conference> conferences) {
+        this.conferences = conferences;
     }
 
     public List<Grant> getGrants() {
@@ -261,18 +244,10 @@ public class Paper extends BaseEntity implements UserActivity, EventSource {
     }
 
     @Override
-    public Set<User> getActivityUsers() {
+    public Set<User> getUsers() {
         return getAuthors();
     }
 
-    public List<Reference> getReferences() {
-        return references;
-    }
-
-    public void setReferences(List<Reference> references) {
-        this.references = references;
-    }
-
     public Optional<Deadline> getNextDeadline() {
         return deadlines
                 .stream()
@@ -313,12 +288,13 @@ public class Paper extends BaseEntity implements UserActivity, EventSource {
                 Objects.equals(events, paper.events) &&
                 Objects.equals(files, paper.files) &&
                 Objects.equals(authors, paper.authors) &&
-                Objects.equals(conference, paper.conference) &&
+                Objects.equals(latexText, paper.latexText) &&
+                Objects.equals(conferences, paper.conferences) &&
                 Objects.equals(grants, paper.grants);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), title, status, type, createDate, updateDate, deadlines, comment, url, locked, events, files, authors, conference, grants);
+        return Objects.hash(super.hashCode(), title, status, type, createDate, updateDate, deadlines, comment, url, locked, events, files, authors, latexText, conferences, grants);
     }
 }

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

@@ -2,15 +2,13 @@ package ru.ulstu.paper.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Size;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.format.annotation.DateTimeFormat;
+import org.hibernate.validator.constraints.NotEmpty;
-import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileDataDto;
 import ru.ulstu.user.model.UserDto;
 
+import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -28,9 +26,7 @@ public class PaperDto {
     private String title;
     private Paper.PaperStatus status;
     private Paper.PaperType type;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSSXXX")
     private Date createDate;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSSXXX")
     private Date updateDate;
     @NotEmpty
     private List<Deadline> deadlines = new ArrayList<>();
@@ -42,8 +38,6 @@ public class PaperDto {
     private Set<UserDto> authors;
     private Integer filterAuthorId;
     private String latexText;
-    private List<ReferenceDto> references = new ArrayList<>();
-    private ReferenceDto.FormatStandard formatStandard = ReferenceDto.FormatStandard.GOST;
 
     public PaperDto() {
         deadlines.add(new Deadline());
@@ -63,9 +57,7 @@ public class PaperDto {
                     @JsonProperty("locked") Boolean locked,
                     @JsonProperty("files") List<FileDataDto> files,
                     @JsonProperty("authorIds") Set<Integer> authorIds,
-                    @JsonProperty("authors") Set<UserDto> authors,
+                    @JsonProperty("authors") Set<UserDto> authors) {
-                    @JsonProperty("references") List<ReferenceDto> references,
-                    @JsonProperty("formatStandard") ReferenceDto.FormatStandard formatStandard) {
         this.id = id;
         this.title = title;
         this.status = status;
@@ -79,8 +71,6 @@ public class PaperDto {
         this.locked = locked;
         this.files = files;
         this.authors = authors;
-        this.references = references;
-        this.formatStandard = formatStandard;
     }
 
     public PaperDto(Paper paper) {
@@ -93,11 +83,11 @@ public class PaperDto {
         this.deadlines = paper.getDeadlines();
         this.comment = paper.getComment();
         this.url = paper.getUrl();
+        this.latexText = paper.getLatexText();
         this.locked = paper.getLocked();
         this.files = convert(paper.getFiles(), FileDataDto::new);
-        this.authorIds = convert(paper.getAuthors(), BaseEntity::getId);
+        this.authorIds = convert(paper.getAuthors(), user -> user.getId());
         this.authors = convert(paper.getAuthors(), UserDto::new);
-        this.references = convert(paper.getReferences(), ReferenceDto::new);
     }
 
     public Integer getId() {
@@ -215,7 +205,7 @@ public class PaperDto {
     public String getAuthorsString() {
         return StringUtils.abbreviate(authors
                 .stream()
-                .map(UserDto::getLastName)
+                .map(author -> author.getLastName())
                 .collect(Collectors.joining(", ")), MAX_AUTHORS_LENGTH);
     }
 
@@ -226,20 +216,4 @@ public class PaperDto {
     public void setFilterAuthorId(Integer filterAuthorId) {
         this.filterAuthorId = filterAuthorId;
     }
-
-    public List<ReferenceDto> getReferences() {
-        return references;
-    }
-
-    public void setReferences(List<ReferenceDto> references) {
-        this.references = references;
-    }
-
-    public ReferenceDto.FormatStandard getFormatStandard() {
-        return formatStandard;
-    }
-
-    public void setFormatStandard(ReferenceDto.FormatStandard formatStandard) {
-        this.formatStandard = formatStandard;
-    }
 }

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

@@ -1,87 +0,0 @@
-package ru.ulstu.paper.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import ru.ulstu.core.model.BaseEntity;
-
-@Entity
-public class Reference extends BaseEntity {
-
-    private String authors;
-
-    @Column(name = "publication_title")
-    private String publicationTitle;
-
-    @Column(name = "publication_year")
-    private Integer publicationYear;
-
-    private String publisher;
-
-    private String pages;
-
-    @Column(name = "journal_or_collection_title")
-    private String journalOrCollectionTitle;
-
-    @Enumerated(value = EnumType.STRING)
-    @Column(name = "reference_type")
-    private ReferenceDto.ReferenceType referenceType = ReferenceDto.ReferenceType.ARTICLE;
-
-    public String getAuthors() {
-        return authors;
-    }
-
-    public void setAuthors(String authors) {
-        this.authors = authors;
-    }
-
-    public String getPublicationTitle() {
-        return publicationTitle;
-    }
-
-    public void setPublicationTitle(String publicationTitle) {
-        this.publicationTitle = publicationTitle;
-    }
-
-    public Integer getPublicationYear() {
-        return publicationYear;
-    }
-
-    public void setPublicationYear(Integer publicationYear) {
-        this.publicationYear = publicationYear;
-    }
-
-    public String getPublisher() {
-        return publisher;
-    }
-
-    public void setPublisher(String publisher) {
-        this.publisher = publisher;
-    }
-
-    public String getPages() {
-        return pages;
-    }
-
-    public void setPages(String pages) {
-        this.pages = pages;
-    }
-
-    public String getJournalOrCollectionTitle() {
-        return journalOrCollectionTitle;
-    }
-
-    public void setJournalOrCollectionTitle(String journalOrCollectionTitle) {
-        this.journalOrCollectionTitle = journalOrCollectionTitle;
-    }
-
-    public ReferenceDto.ReferenceType getReferenceType() {
-        return referenceType;
-    }
-
-    public void setReferenceType(ReferenceDto.ReferenceType referenceType) {
-        this.referenceType = referenceType;
-    }
-
-}

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

@@ -8,7 +8,7 @@ public class ReferenceDto {
         ARTICLE("Статья"),
         BOOK("Книга");
 
-        private final String typeName;
+        private String typeName;
 
         ReferenceType(String name) {
             this.typeName = name;
@@ -23,7 +23,7 @@ public class ReferenceDto {
         GOST("ГОСТ"),
         SPRINGER("Springer");
 
-        private final String standardName;
+        private String standardName;
 
         FormatStandard(String name) {
             this.standardName = name;
@@ -34,7 +34,6 @@ public class ReferenceDto {
         }
     }
 
-    private Integer id;
     private String authors;
     private String publicationTitle;
     private Integer publicationYear;
@@ -43,11 +42,9 @@ public class ReferenceDto {
     private String journalOrCollectionTitle;
     private ReferenceType referenceType;
     private FormatStandard formatStandard;
-    private boolean deleted;
 
     @JsonCreator
     public ReferenceDto(
-            @JsonProperty("id") Integer id,
             @JsonProperty("authors") String authors,
             @JsonProperty("publicationTitle") String publicationTitle,
             @JsonProperty("publicationYear") Integer publicationYear,
@@ -55,9 +52,7 @@ public class ReferenceDto {
             @JsonProperty("pages") String pages,
             @JsonProperty("journalOrCollectionTitle") String journalOrCollectionTitle,
             @JsonProperty("referenceType") ReferenceType referenceType,
-            @JsonProperty("formatStandard") FormatStandard formatStandard,
+            @JsonProperty("formatStandard") FormatStandard formatStandard) {
-            @JsonProperty("isDeleted") boolean deleted) {
-        this.id = id;
         this.authors = authors;
         this.publicationTitle = publicationTitle;
         this.publicationYear = publicationYear;
@@ -66,22 +61,6 @@ public class ReferenceDto {
         this.journalOrCollectionTitle = journalOrCollectionTitle;
         this.referenceType = referenceType;
         this.formatStandard = formatStandard;
-        this.deleted = deleted;
-    }
-
-    public ReferenceDto(Reference reference) {
-        this.id = reference.getId();
-        this.authors = reference.getAuthors();
-        this.publicationTitle = reference.getPublicationTitle();
-        this.publicationYear = reference.getPublicationYear();
-        this.publisher = reference.getPublisher();
-        this.pages = reference.getPages();
-        this.journalOrCollectionTitle = reference.getJournalOrCollectionTitle();
-        this.referenceType = reference.getReferenceType();
-    }
-
-    public ReferenceDto() {
-        referenceType = ReferenceType.ARTICLE;
     }
 
     public String getAuthors() {
@@ -147,20 +126,4 @@ public class ReferenceDto {
     public void setFormatStandard(FormatStandard formatStandard) {
         this.formatStandard = formatStandard;
     }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public boolean getDeleted() {
-        return deleted;
-    }
-
-    public void setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
 }

src/main/java/ru/ulstu/paper/repository/PaperRepository.java

@@ -21,7 +21,7 @@ public interface PaperRepository extends JpaRepository<Paper, Integer> {
 
     List<Paper> findByStatusNot(Paper.PaperStatus status);
 
-    List<Paper> findByConferenceIsNullAndStatusNot(Paper.PaperStatus status);
+    List<Paper> findByConferencesIsNullAndStatusNot(Paper.PaperStatus status);
 
-    List<Paper> findByIdNotInAndConferenceIsNullAndStatusNot(List<Integer> paperIds, Paper.PaperStatus status);
+    List<Paper> findByIdNotInAndConferencesIsNullAndStatusNot(List<Integer> paperIds, Paper.PaperStatus status);
 }

src/main/java/ru/ulstu/paper/repository/ReferenceRepository.java

@@ -1,23 +0,0 @@
-package ru.ulstu.paper.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import ru.ulstu.paper.model.Reference;
-
-import java.util.List;
-
-public interface ReferenceRepository extends JpaRepository<Reference, Integer> {
-    void deleteById(Integer id);
-
-    @Query("SELECT DISTINCT r.authors FROM Reference r")
-    List<String> findDistinctAuthors();
-
-    @Query("SELECT DISTINCT r.publicationTitle FROM Reference r")
-    List<String> findDistinctPublicationTitles();
-
-    @Query("SELECT DISTINCT r.publisher FROM Reference r")
-    List<String> findDistinctPublishers();
-
-    @Query("SELECT DISTINCT r.journalOrCollectionTitle FROM Reference r where r.journalOrCollectionTitle <> ''")
-    List<String> findDistinctJournalOrCollectionTitles();
-}

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

@@ -12,11 +12,11 @@ import java.nio.file.Files;
 
 @Service
 public class LatexService {
-    private static final String PDF_LATEX_ERROR = "Errors occurred while executing pdfLaTeX.";
+    private final String pdfLatexError = "Errors occurred while executing pdfLaTeX.";
-    private static final String BIBTEX_ERROR = "Errors occurred while executing bibtex.";
+    private final String bibtexError = "Errors occurred while executing bibtex.";
     private String errorMessage;
     private File pdfFile;
-    private final FileService fileService;
+    private FileService fileService;
 
     public LatexService(FileService fileService) {
         this.fileService = fileService;
@@ -42,9 +42,8 @@ public class LatexService {
         InputStreamReader inputStreamReader = new InputStreamReader(process.getInputStream());
 
         try (BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) {
-            String line = bufferedReader.readLine();
+            while ((bufferedReader.readLine()) != null) {
-            while (line != null) {
+                //
-                line = bufferedReader.readLine();
             }
         }
 
@@ -56,9 +55,9 @@ public class LatexService {
     }
 
     private boolean generate(String filename, File dir) throws IOException, InterruptedException {
-        startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, PDF_LATEX_ERROR);
+        startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, pdfLatexError);
-        startProcess(new String[]{"bibtex", filename}, dir, BIBTEX_ERROR);
+        startProcess(new String[]{"bibtex", filename}, dir, bibtexError);
-        if (startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, PDF_LATEX_ERROR) != 0) {
+        if (startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, pdfLatexError) != 0) {
             return false;
         }
         return checkPdf(filename, dir);

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

@@ -1,5 +1,6 @@
 package ru.ulstu.paper.service;
 
+import com.google.common.collect.ImmutableMap;
 import org.springframework.stereotype.Service;
 import ru.ulstu.core.util.DateUtils;
 import ru.ulstu.paper.model.Paper;
@@ -45,22 +46,22 @@ public class PaperNotificationService {
     }
 
     private void sendMessageDeadline(Paper paper) {
-        Map<String, Object> variables = Map.of("paper", paper);
+        Map<String, Object> variables = ImmutableMap.of("paper", paper);
         sendForAllAuhtors(variables, paper, TEMPLATE_DEADLINE, TITLE_DEADLINE);
     }
 
     public void sendCreateNotification(Paper paper) {
-        Map<String, Object> variables = Map.of("paper", paper);
+        Map<String, Object> variables = ImmutableMap.of("paper", paper);
         sendForAllAuhtors(variables, paper, TEMPLATE_CREATE, TITLE_CREATE);
     }
 
     public void statusChangeNotification(Paper paper, Paper.PaperStatus oldStatus) {
-        Map<String, Object> variables = Map.of("paper", paper, "oldStatus", oldStatus);
+        Map<String, Object> variables = ImmutableMap.of("paper", paper, "oldStatus", oldStatus);
         sendForAllAuhtors(variables, paper, TEMPLATE_STATUS_CHANGED, TITLE_STATUS_CHANGED);
     }
 
     public void sendFailedNotification(Paper paper, Paper.PaperStatus oldStatus) {
-        Map<String, Object> variables = Map.of("paper", paper, "oldStatus", oldStatus);
+        Map<String, Object> variables = ImmutableMap.of("paper", paper, "oldStatus", oldStatus);
         sendForAllAuhtors(variables, paper, TEMPLATE_FAILED, TITLE_FAILED);
     }
 

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

@@ -7,22 +7,17 @@ import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.file.model.FileDataDto;
 import ru.ulstu.file.service.FileService;
-import ru.ulstu.paper.model.AutoCompleteData;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.paper.model.PaperListDto;
-import ru.ulstu.paper.model.Reference;
 import ru.ulstu.paper.model.ReferenceDto;
 import ru.ulstu.paper.repository.PaperRepository;
-import ru.ulstu.paper.repository.ReferenceRepository;
-import ru.ulstu.ping.service.PingService;
 import ru.ulstu.timeline.service.EventService;
 import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
 import java.text.MessageFormat;
-import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
@@ -44,7 +39,6 @@ import static ru.ulstu.paper.model.ReferenceDto.ReferenceType.ARTICLE;
 import static ru.ulstu.paper.model.ReferenceDto.ReferenceType.BOOK;
 
 @Service
-@Transactional
 public class PaperService {
     private final static int MAX_DISPLAY_SIZE = 40;
     private final static String PAPER_FORMATTED_TEMPLATE = "%s %s";
@@ -55,25 +49,19 @@ public class PaperService {
     private final DeadlineService deadlineService;
     private final FileService fileService;
     private final EventService eventService;
-    private final ReferenceRepository referenceRepository;
-    private final PingService pingService;
 
     public PaperService(PaperRepository paperRepository,
-                        ReferenceRepository referenceRepository,
                         FileService fileService,
                         PaperNotificationService paperNotificationService,
                         UserService userService,
                         DeadlineService deadlineService,
-                        EventService eventService,
+                        EventService eventService) {
-                        PingService pingService) {
         this.paperRepository = paperRepository;
-        this.referenceRepository = referenceRepository;
         this.fileService = fileService;
         this.paperNotificationService = paperNotificationService;
         this.userService = userService;
         this.deadlineService = deadlineService;
         this.eventService = eventService;
-        this.pingService = pingService;
     }
 
     public List<Paper> findAll() {
@@ -81,7 +69,9 @@ public class PaperService {
     }
 
     public List<PaperDto> findAllDto() {
-        return convert(findAll(), PaperDto::new);
+        List<PaperDto> papers = convert(findAll(), PaperDto::new);
+        papers.forEach(paperDto -> paperDto.setTitle(StringUtils.abbreviate(paperDto.getTitle(), MAX_DISPLAY_SIZE)));
+        return papers;
     }
 
     public List<Paper> findAllActive() {
@@ -91,38 +81,35 @@ public class PaperService {
                 .collect(toList());
     }
 
-    public List<Paper> findAllActiveByCurrentUser() {
-        return findAllActive()
-                .stream()
-                .filter(paper -> paper.getAuthors().contains(userService.getCurrentUser()))
-                .collect(toList());
-    }
-
     public List<PaperDto> findAllActiveDto() {
         return convert(findAllActive(), PaperDto::new);
     }
 
     public PaperDto findOneDto(Integer id) {
-        return new PaperDto(paperRepository.findById(id).orElseThrow());
+        return new PaperDto(paperRepository.findOne(id));
     }
 
     @Transactional
     public Integer create(PaperDto paperDto) throws IOException {
         Paper newPaper = copyFromDto(new Paper(), paperDto);
-        return create(newPaper).getId();
+        newPaper = paperRepository.save(newPaper);
+        paperNotificationService.sendCreateNotification(newPaper);
+        eventService.createFromPaper(newPaper);
+        return newPaper.getId();
     }
 
     @Transactional
     public Paper create(Paper paper) {
         Paper newPaper = paperRepository.save(paper);
-        newPaper.setCreateDate(new Date());
         paperNotificationService.sendCreateNotification(newPaper);
+        eventService.createFromPaper(newPaper);
         return newPaper;
     }
 
     private Paper copyFromDto(Paper paper, PaperDto paperDto) throws IOException {
         paper.setComment(paperDto.getComment());
         paper.setUrl(paperDto.getUrl());
+        paper.setLatexText(paperDto.getLatexText());
         paper.setCreateDate(paper.getCreateDate() == null ? new Date() : paper.getCreateDate());
         paper.setLocked(paperDto.getLocked());
         paper.setStatus(paperDto.getStatus() == null ? DRAFT : paperDto.getStatus());
@@ -130,7 +117,6 @@ public class PaperService {
         paper.setTitle(paperDto.getTitle());
         paper.setUpdateDate(new Date());
         paper.setDeadlines(deadlineService.saveOrCreate(paperDto.getDeadlines()));
-        paper.setReferences(saveOrCreateReferences(paperDto.getReferences()));
         paper.setFiles(fileService.saveOrCreate(paperDto.getFiles().stream()
                 .filter(f -> !f.isDeleted())
                 .collect(toList())));
@@ -141,44 +127,9 @@ public class PaperService {
         return paper;
     }
 
-    private List<Reference> saveOrCreateReferences(List<ReferenceDto> references) {
-        return references
-                .stream()
-                .filter(reference -> !reference.getDeleted())
-                .map(reference -> reference.getId() != null ? updateReference(reference) : createReference(reference))
-                .collect(Collectors.toList());
-    }
-
-    @Transactional
-    private Reference updateReference(ReferenceDto referenceDto) {
-        Reference updateReference = referenceRepository.getOne(referenceDto.getId());
-        copyFromDto(updateReference, referenceDto);
-        referenceRepository.save(updateReference);
-        return updateReference;
-    }
-
-    @Transactional
-    private Reference createReference(ReferenceDto referenceDto) {
-        Reference newReference = new Reference();
-        copyFromDto(newReference, referenceDto);
-        newReference = referenceRepository.save(newReference);
-        return newReference;
-    }
-
-    private Reference copyFromDto(Reference reference, ReferenceDto referenceDto) {
-        reference.setAuthors(referenceDto.getAuthors());
-        reference.setJournalOrCollectionTitle(referenceDto.getJournalOrCollectionTitle());
-        reference.setPages(referenceDto.getPages());
-        reference.setPublicationTitle(referenceDto.getPublicationTitle());
-        reference.setPublicationYear(referenceDto.getPublicationYear());
-        reference.setPublisher(referenceDto.getPublisher());
-        reference.setReferenceType(referenceDto.getReferenceType());
-        return reference;
-    }
-
     @Transactional
     public Integer update(PaperDto paperDto) throws IOException {
-        Paper paper = paperRepository.getOne(paperDto.getId());
+        Paper paper = paperRepository.findOne(paperDto.getId());
         Paper.PaperStatus oldStatus = paper.getStatus();
         Set<User> oldAuthors = new HashSet<>(paper.getAuthors());
 
@@ -188,11 +139,6 @@ public class PaperService {
             fileService.delete(file.getId());
         }
         paperRepository.save(copyFromDto(paper, paperDto));
-        for (ReferenceDto referenceDto : paperDto.getReferences().stream()
-                .filter(f -> f.getDeleted() && f.getId() != null)
-                .collect(toList())) {
-            referenceRepository.deleteById(referenceDto.getId());
-        }
         eventService.updatePaperDeadlines(paper);
 
         paper.getAuthors().forEach(author -> {
@@ -208,29 +154,10 @@ public class PaperService {
         return paper.getId();
     }
 
-    @Transactional
-    public Integer update(Paper newPaper) {
-        Paper oldPaper = paperRepository.getOne(newPaper.getId());
-        Paper.PaperStatus oldStatus = oldPaper.getStatus();
-        Set<User> oldAuthors = new HashSet<>(oldPaper.getAuthors());
-        newPaper.setUpdateDate(new Date());
-        newPaper = paperRepository.save(newPaper);
-        for (User author : newPaper.getAuthors()) {
-            if (!oldAuthors.contains(author)) {
-                paperNotificationService.sendCreateNotification(newPaper);
-            }
-        }
-
-        if (newPaper.getStatus() != oldStatus) {
-            paperNotificationService.statusChangeNotification(newPaper, oldStatus);
-        }
-
-        return newPaper.getId();
-    }
-
     @Transactional
     public void delete(Integer paperId) {
-        delete(paperRepository.getOne(paperId));
+        Paper paper = paperRepository.findOne(paperId);
+        paperRepository.delete(paper);
     }
 
     public List<Paper.PaperStatus> getPaperStatuses() {
@@ -241,14 +168,6 @@ public class PaperService {
         return Arrays.asList(Paper.PaperType.values());
     }
 
-    public List<ReferenceDto.FormatStandard> getFormatStandards() {
-        return Arrays.asList(ReferenceDto.FormatStandard.values());
-    }
-
-    public List<ReferenceDto.ReferenceType> getReferenceTypes() {
-        return Arrays.asList(ReferenceDto.ReferenceType.values());
-    }
-
     @Transactional
     public Paper create(String title, User user, Date deadlineDate) {
         Paper paper = new Paper();
@@ -313,27 +232,19 @@ public class PaperService {
         }
     }
 
-    public void save(Paper paper) {
-        if (isEmpty(paper.getId())) {
-            create(paper);
-        } else {
-            update(paper);
-        }
-    }
-
     public PaperDto findById(Integer paperId) {
-        return new PaperDto(paperRepository.getOne(paperId));
+        return new PaperDto(paperRepository.findOne(paperId));
     }
 
     public Paper findPaperById(Integer paperId) {
-        return paperRepository.getOne(paperId);
+        return paperRepository.findOne(paperId);
     }
 
     public List<Paper> findAllNotSelect(List<Integer> paperIds) {
         if (!paperIds.isEmpty()) {
-            return sortPapers(paperRepository.findByIdNotInAndConferenceIsNullAndStatusNot(paperIds, COMPLETED));
+            return sortPapers(paperRepository.findByIdNotInAndConferencesIsNullAndStatusNot(paperIds, COMPLETED));
         } else {
-            return sortPapers(paperRepository.findByConferenceIsNullAndStatusNot(COMPLETED));
+            return sortPapers(paperRepository.findByConferencesIsNullAndStatusNot(COMPLETED));
         }
     }
 
@@ -376,31 +287,20 @@ public class PaperService {
                 : getSpringerReference(referenceDto);
     }
 
-    public String getFormattedReferences(PaperDto paperDto) {
+    public String getGostReference(ReferenceDto referenceDto) {
-        return String.join("\r\n", paperDto.getReferences()
-                .stream()
-                .filter(r -> !r.getDeleted())
-                .map(r -> {
-                    r.setFormatStandard(paperDto.getFormatStandard());
-                    return getFormattedReference(r);
-                })
-                .collect(Collectors.toList()));
-    }
-
-    private String getGostReference(ReferenceDto referenceDto) {
         return MessageFormat.format(referenceDto.getReferenceType() == BOOK ? "{0} {1} - {2}{3}. - {4}с." : "{0} {1}{5} {2}{3}. С. {4}.",
                 referenceDto.getAuthors(),
                 referenceDto.getPublicationTitle(),
                 StringUtils.isEmpty(referenceDto.getPublisher()) ? "" : referenceDto.getPublisher() + ", ",
-                referenceDto.getPublicationYear() != null ? referenceDto.getPublicationYear().toString() : "",
+                referenceDto.getPublicationYear().toString(),
                 referenceDto.getPages(),
                 StringUtils.isEmpty(referenceDto.getJournalOrCollectionTitle()) ? "." : " // " + referenceDto.getJournalOrCollectionTitle() + ".");
     }
 
-    private String getSpringerReference(ReferenceDto referenceDto) {
+    public String getSpringerReference(ReferenceDto referenceDto) {
         return MessageFormat.format("{0} ({1}) {2}.{3} {4}pp {5}",
                 referenceDto.getAuthors(),
-                referenceDto.getPublicationYear() != null ? referenceDto.getPublicationYear().toString() : "",
+                referenceDto.getPublicationYear().toString(),
                 referenceDto.getPublicationTitle(),
                 referenceDto.getReferenceType() == ARTICLE ? " " + referenceDto.getJournalOrCollectionTitle() + "," : "",
                 StringUtils.isEmpty(referenceDto.getPublisher()) ? "" : referenceDto.getPublisher() + ", ",
@@ -410,36 +310,4 @@ public class PaperService {
     public List<Paper> findAllCompletedByType(Paper.PaperType type) {
         return paperRepository.findByTypeAndStatus(type, Paper.PaperStatus.COMPLETED);
     }
-
-    public AutoCompleteData getAutoCompleteData() {
-        AutoCompleteData autoCompleteData = new AutoCompleteData();
-        autoCompleteData.setAuthors(referenceRepository.findDistinctAuthors());
-        autoCompleteData.setJournalOrCollectionTitles(referenceRepository.findDistinctJournalOrCollectionTitles());
-        autoCompleteData.setPublicationTitles(referenceRepository.findDistinctPublicationTitles());
-        autoCompleteData.setPublishers(referenceRepository.findDistinctPublishers());
-        return autoCompleteData;
-    }
-
-    @Transactional
-    public void ping(int paperId) throws IOException {
-        pingService.addPing(findPaperById(paperId));
-    }
-
-    public void createByTitle(String newPaperTitle) {
-        Paper paper = new Paper();
-        paper.setTitle(newPaperTitle);
-        paper.setStatus(DRAFT);
-        paper.getAuthors().add(userService.getCurrentUser());
-        paper.getDeadlines().add(deadlineService.createWithOffset(new Date(), 1, ChronoUnit.WEEKS));
-        create(paper);
-    }
-
-    public void delete(List<Paper> papers) {
-        papers.forEach(paper -> delete(paper));
-    }
-
-    public void delete(Paper paper) {
-        deadlineService.delete(paper.getDeadlines());
-        paperRepository.delete(paper);
-    }
 }

src/main/java/ru/ulstu/ping/model/Ping.java

@@ -1,26 +1,17 @@
 package ru.ulstu.ping.model;
 
-import jakarta.persistence.Column;
+import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.persistence.DiscriminatorType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
-import org.hibernate.annotations.Any;
-import org.hibernate.annotations.AnyDiscriminator;
-import org.hibernate.annotations.AnyDiscriminatorValue;
-import org.hibernate.annotations.AnyKeyJavaClass;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.conference.model.Conference;
 import ru.ulstu.core.model.BaseEntity;
-import ru.ulstu.core.model.UserActivity;
-import ru.ulstu.grant.model.Grant;
-import ru.ulstu.paper.model.Paper;
-import ru.ulstu.project.model.Project;
 import ru.ulstu.user.model.User;
 
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import java.util.Date;
 
 @Entity
@@ -34,19 +25,9 @@ public class Ping extends BaseEntity {
     @JoinColumn(name = "users_id")
     private User user;
 
-    @Column(name = "activity_type", insertable = false, updatable = false)
+    @ManyToOne(optional = false)
-    private String activityType;
+    @JoinColumn(name = "conference_id")
-
+    private Conference conference;
-    @Any
-    @AnyDiscriminator(DiscriminatorType.STRING)
-    @AnyKeyJavaClass(Integer.class)
-    @JoinColumn(name = "activity_id")
-    @Column(name = "activity_type")
-    @AnyDiscriminatorValue(entity = Conference.class, discriminator = "CONFERENCE")
-    @AnyDiscriminatorValue(entity = Paper.class, discriminator = "PAPER")
-    @AnyDiscriminatorValue(entity = Project.class, discriminator = "PROJECT")
-    @AnyDiscriminatorValue(entity = Grant.class, discriminator = "GRANT")
-    private UserActivity activity;
 
     public Ping() {
     }
@@ -56,6 +37,16 @@ public class Ping extends BaseEntity {
         this.user = user;
     }
 
+    public Ping(@JsonProperty("id") Integer id,
+                @JsonProperty("date") Date date,
+                @JsonProperty("user") User user,
+                @JsonProperty("conference") Conference conference) {
+        setId(id);
+        this.date = date;
+        this.user = user;
+        this.conference = conference;
+    }
+
     public Date getDate() {
         return date;
     }
@@ -72,11 +63,11 @@ public class Ping extends BaseEntity {
         this.user = user;
     }
 
-    public UserActivity getActivity() {
+    public Conference getConference() {
-        return this.activity;
+        return conference;
     }
 
-    public void setActivity(UserActivity activity) {
+    public void setConference(Conference conference) {
-        this.activity = activity;
+        this.conference = conference;
     }
 }

src/main/java/ru/ulstu/ping/model/PingInfo.java

@@ -1,35 +0,0 @@
-package ru.ulstu.ping.model;
-
-import ru.ulstu.user.model.User;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PingInfo {
-    private User user;
-    private List<Ping> pings = new ArrayList<>();
-
-    public PingInfo(User user) {
-        this.user = user;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public List<Ping> getPings() {
-        return pings;
-    }
-
-    public void setPings(List<Ping> pings) {
-        this.pings = pings;
-    }
-
-    public void addPing(Ping ping) {
-        this.pings.add(ping);
-    }
-}

src/main/java/ru/ulstu/ping/repository/PingRepository.java

@@ -6,17 +6,8 @@ import org.springframework.data.repository.query.Param;
 import ru.ulstu.conference.model.Conference;
 import ru.ulstu.ping.model.Ping;
 
-import java.util.Date;
-import java.util.List;
-
 public interface PingRepository extends JpaRepository<Ping, Integer> {
 
-    @Query("SELECT count(*) FROM Ping p WHERE (DAY(p.date) = :day) AND (MONTH(p.date) = :month) AND (YEAR(p.date) = :year) AND (p.activityType = 'conference') AND (p.activity = :conference)")
+    @Query("SELECT count(*) FROM Ping p WHERE (DAY(p.date) = :day) AND (MONTH(p.date) = :month) AND (YEAR(p.date) = :year) AND (p.conference = :conference)")
     long countByConferenceAndDate(@Param("conference") Conference conference, @Param("day") Integer day, @Param("month") Integer month, @Param("year") Integer year);
-
-    @Query("SELECT p FROM Ping p WHERE (:activity = '' OR p.activityType = :activity)")
-    List<Ping> getPings(@Param("activity") String activity);
-
-    @Query("SELECT p FROM Ping p WHERE (:dateFrom <  date)")
-    List<Ping> findByDate(@Param("dateFrom") Date dateFrom);
 }

src/main/java/ru/ulstu/ping/service/PingScheduler.java

@@ -1,58 +0,0 @@
-package ru.ulstu.ping.service;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-import ru.ulstu.core.model.UserActivity;
-import ru.ulstu.ping.model.Ping;
-import ru.ulstu.ping.model.PingInfo;
-import ru.ulstu.ping.repository.PingRepository;
-import ru.ulstu.user.model.User;
-import ru.ulstu.user.service.MailService;
-
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-@Service
-public class PingScheduler {
-    private final Logger log = LoggerFactory.getLogger(PingScheduler.class);
-    private final PingRepository pingRepository;
-    private final MailService mailService;
-    private final static String PING_MAIL_SUBJECT = "Ping статистика";
-
-    public PingScheduler(PingRepository pingRepository, MailService mailService) {
-        this.pingRepository = pingRepository;
-        this.mailService = mailService;
-    }
-
-
-    @Scheduled(cron = "0 0 * * 1 ?")
-    public void sendPingsInfo() {
-        log.debug("Scheduler.sendPingsInfo started");
-
-        List<PingInfo> pingInfos = new ArrayList<>();
-
-        for (Ping ping : pingRepository.findByDate(java.sql.Date.valueOf(LocalDate.now().minusWeeks(1)))) {
-            UserActivity pingActivity = ping.getActivity();
-            Set<User> users = pingActivity.getActivityUsers();
-
-            for (User user : users) {
-                PingInfo userPing = pingInfos.stream().filter(u -> u.getUser() == user).findFirst().orElse(null);
-                if (userPing == null) {
-                    userPing = new PingInfo(user);
-                    pingInfos.add(userPing);
-                }
-                userPing.addPing(ping);
-            }
-        }
-
-        for (PingInfo pingInfo : pingInfos) {
-            mailService.sendEmailFromTemplate(Map.of("pings", pingInfo.getPings()),
-                    pingInfo.getUser(), "pingsInfoWeekEmail", PING_MAIL_SUBJECT);
-        }
-    }
-}

src/main/java/ru/ulstu/ping/service/PingService.java

@@ -3,7 +3,6 @@ package ru.ulstu.ping.service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.ulstu.conference.model.Conference;
-import ru.ulstu.core.model.UserActivity;
 import ru.ulstu.ping.model.Ping;
 import ru.ulstu.ping.repository.PingRepository;
 import ru.ulstu.user.service.UserService;
@@ -11,7 +10,6 @@ import ru.ulstu.user.service.UserService;
 import java.io.IOException;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
 
 @Service
 public class PingService {
@@ -19,16 +17,15 @@ public class PingService {
     private final UserService userService;
 
     public PingService(PingRepository pingRepository,
-                       UserService userService,
+                       UserService userService) {
-                       PingScheduler pingScheduler) {
         this.pingRepository = pingRepository;
         this.userService = userService;
     }
 
     @Transactional
-    public Ping addPing(UserActivity activity) throws IOException {
+    public Ping addPing(Conference conference) throws IOException {
         Ping newPing = new Ping(new Date(), userService.getCurrentUser());
-        //newPing.setActivity(activity);
+        newPing.setConference(conference);
         return pingRepository.save(newPing);
     }
 
@@ -36,8 +33,4 @@ public class PingService {
         return Math.toIntExact(pingRepository.countByConferenceAndDate(conference, calendar.get(Calendar.DAY_OF_MONTH),
                 calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.YEAR)));
     }
-
-    public List<Ping> getPings(String activity) {
-        return pingRepository.getPings(activity);
-    }
 }

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

@@ -1,7 +1,5 @@
 package ru.ulstu.project.controller;
 
-import io.swagger.v3.oas.annotations.Hidden;
-import jakarta.validation.Valid;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.Errors;
@@ -11,14 +9,13 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 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;
-import ru.ulstu.user.model.User;
+import springfox.documentation.annotations.ApiIgnore;
 
+import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,7 +24,7 @@ import static org.springframework.util.StringUtils.isEmpty;
 
 @Controller()
 @RequestMapping(value = "/projects")
-@Hidden
+@ApiIgnore
 public class ProjectController {
     private final ProjectService projectService;
 
@@ -48,8 +45,6 @@ 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());
@@ -74,12 +69,6 @@ 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);
@@ -90,38 +79,15 @@ public class ProjectController {
         return "/projects/project";
     }
 
-    @PostMapping(value = "/project", params = "removeDeadline")
-    public String removeDeadline(ProjectDto projectDto,
-                                 @RequestParam(value = "removeDeadline") Integer deadlineId) {
-        projectService.removeDeadline(projectDto, deadlineId);
-        return "/projects/project";
-    }
-
     @GetMapping("/delete/{project-id}")
     public String delete(@PathVariable("project-id") Integer projectId) throws IOException {
         projectService.delete(projectId);
         return String.format("redirect:%s", "/projects/projects");
     }
 
-    @ModelAttribute("allExecutors")
-    public List<User> getAllExecutors(ProjectDto projectDto) {
-        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()))
                 .collect(Collectors.toList()));
     }
-
-    @ResponseBody
-    @PostMapping(value = "/ping")
-    public void ping(@RequestParam("projectId") int projectId) throws IOException {
-        projectService.ping(projectId);
-    }
 }

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

@@ -1,48 +1,33 @@
 package ru.ulstu.project.model;
 
-import jakarta.persistence.CascadeType;
+import org.hibernate.validator.constraints.NotBlank;
-import jakarta.persistence.DiscriminatorValue;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
 import ru.ulstu.core.model.BaseEntity;
-import ru.ulstu.core.model.EventSource;
-import ru.ulstu.core.model.UserActivity;
 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;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.JoinColumn;
+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
-@DiscriminatorValue("PROJECT")
+public class Project extends BaseEntity {
-public class Project extends BaseEntity implements UserActivity, EventSource {
-
     public enum ProjectStatus {
-        TECHNICAL_TASK("Техническое задание"),
+        APPLICATION("Заявка"),
-        OPEN("Открыт"),
+        ON_COMPETITION("Отправлен на конкурс"),
+        SUCCESSFUL_PASSAGE("Успешное прохождение"),
         IN_WORK("В работе"),
-        CERTIFICATE_ISSUED("Оформление свидетельства"),
+        COMPLETED("Завершен"),
-        CLOSED("Закрыт"),
         FAILED("Провалены сроки");
 
-        private final String statusName;
+        private String statusName;
 
         ProjectStatus(String statusName) {
             this.statusName = statusName;
@@ -57,7 +42,7 @@ public class Project extends BaseEntity implements UserActivity, EventSource {
     private String title;
 
     @Enumerated(value = EnumType.STRING)
-    private ProjectStatus status = ProjectStatus.TECHNICAL_TASK;
+    private ProjectStatus status = ProjectStatus.APPLICATION;
 
     @NotNull
     private String description;
@@ -73,39 +58,14 @@ public class Project extends BaseEntity implements UserActivity, EventSource {
     @NotNull
     private String repository;
 
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @ManyToOne
-    @JoinColumn(name = "project_id", unique = true)
+    @JoinColumn(name = "file_id")
-    @Fetch(FetchMode.SUBSELECT)
+    private FileData application;
-    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;
     }
@@ -150,44 +110,11 @@ public class Project extends BaseEntity implements UserActivity, EventSource {
         this.deadlines = deadlines;
     }
 
-    public List<FileData> getFiles() {
+    public FileData getApplication() {
-        return files;
+        return application;
     }
 
-    public void setFiles(List<FileData> files) {
+    public void setApplication(FileData application) {
-        this.files = files;
+        this.application = application;
-    }
-
-    public List<Event> getEvents() {
-        return events;
-    }
-
-    public void setEvents(List<Event> events) {
-        this.events = events;
-    }
-
-    public List<User> getExecutors() {
-        return executors;
-    }
-
-    public void setExecutors(List<User> executors) {
-        this.executors = executors;
-    }
-
-    public Set<User> getUsers() {
-        return new HashSet<>(getExecutors());
-    }
-
-    @Override
-    public Set<User> getActivityUsers() {
-        return new HashSet<>();
-    }
-
-    public List<Grant> getGrants() {
-        return grants;
-    }
-
-    public void setGrants(List<Grant> grants) {
-        this.grants = grants;
     }
 }

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

@@ -2,21 +2,12 @@ package ru.ulstu.project.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.NotEmpty;
+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;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static ru.ulstu.core.util.StreamApiUtils.convert;
 
 public class ProjectDto {
     private Integer id;
@@ -28,14 +19,7 @@ public class ProjectDto {
     private List<Deadline> deadlines = new ArrayList<>();
     private GrantDto grant;
     private String repository;
-    private List<FileDataDto> files = new ArrayList<>();
+    private String applicationFileName;
-    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;
 
     public ProjectDto() {
     }
@@ -51,12 +35,7 @@ public class ProjectDto {
                       @JsonProperty("description") String description,
                       @JsonProperty("grant") GrantDto grant,
                       @JsonProperty("repository") String repository,
-                      @JsonProperty("files") List<FileDataDto> files,
+                      @JsonProperty("deadlines") List<Deadline> deadlines) {
-                      @JsonProperty("deadlines") List<Deadline> deadlines,
-                      @JsonProperty("executorIds") Set<Integer> executorIds,
-                      @JsonProperty("executors") List<UserDto> executors,
-                      @JsonProperty("grantIds") List<Integer> grantIds,
-                      @JsonProperty("grants") List<GrantDto> grants) {
         this.id = id;
         this.title = title;
         this.status = status;
@@ -64,28 +43,19 @@ public class ProjectDto {
         this.grant = grant;
         this.repository = repository;
         this.deadlines = deadlines;
-        this.files = files;
+        this.applicationFileName = null;
-        this.executorIds = executorIds;
-        this.executors = executors;
-        this.grantIds = grantIds;
-        this.grants = grants;
     }
 
 
     public ProjectDto(Project project) {
-        Set<User> users = new HashSet<User>(project.getExecutors());
         this.id = project.getId();
         this.title = project.getTitle();
         this.status = project.getStatus();
         this.description = project.getDescription();
-        this.files = convert(project.getFiles(), FileDataDto::new);
+        this.applicationFileName = project.getApplication() == null ? null : project.getApplication().getName();
         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() {
@@ -144,58 +114,11 @@ public class ProjectDto {
         this.deadlines = deadlines;
     }
 
-    public List<FileDataDto> getFiles() {
+    public String getApplicationFileName() {
-        return files;
+        return applicationFileName;
     }
 
-    public void setFiles(List<FileDataDto> files) {
+    public void setApplicationFileName(String applicationFileName) {
-        this.files = files;
+        this.applicationFileName = applicationFileName;
-    }
-
-    public List<Integer> getRemovedDeadlineIds() {
-        return removedDeadlineIds;
-    }
-
-    public void setRemovedDeadlineIds(List<Integer> removedDeadlineIds) {
-        this.removedDeadlineIds = removedDeadlineIds;
-    }
-
-    public Set<Integer> getExecutorIds() {
-        return executorIds;
-    }
-
-    public void setExecutorIds(Set<Integer> executorIds) {
-        this.executorIds = executorIds;
-    }
-
-    public List<UserDto> getExecutors() {
-        return executors;
-    }
-
-    public void setExecutors(List<UserDto> executors) {
-        this.executors = executors;
-    }
-
-    public String getExecutorsString() {
-        return StringUtils.abbreviate(executors
-                .stream()
-                .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,27 +4,19 @@ 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.ping.service.PingService;
 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;
+import static ru.ulstu.project.model.Project.ProjectStatus.APPLICATION;
 
 @Service
 public class ProjectService {
@@ -34,24 +26,15 @@ public class ProjectService {
     private final DeadlineService deadlineService;
     private final GrantRepository grantRepository;
     private final FileService fileService;
-    private final EventService eventService;
-    private final UserService userService;
-    private final PingService pingService;
 
     public ProjectService(ProjectRepository projectRepository,
                           DeadlineService deadlineService,
                           GrantRepository grantRepository,
-                          FileService fileService,
+                          FileService fileService) {
-                          EventService eventService,
-                          UserService userService,
-                          PingService pingService) {
         this.projectRepository = projectRepository;
         this.deadlineService = deadlineService;
         this.grantRepository = grantRepository;
         this.fileService = fileService;
-        this.eventService = eventService;
-        this.userService = userService;
-        this.pingService = pingService;
     }
 
     public List<Project> findAll() {
@@ -65,7 +48,7 @@ public class ProjectService {
     }
 
     public ProjectDto findOneDto(Integer id) {
-        return new ProjectDto(projectRepository.getOne(id));
+        return new ProjectDto(projectRepository.findOne(id));
     }
 
     public List<Project.ProjectStatus> getProjectStatuses() {
@@ -76,48 +59,39 @@ 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
-    private Project update(ProjectDto projectDto) throws IOException {
+    public Project update(ProjectDto projectDto) throws IOException {
-        Project project = projectRepository.getOne(projectDto.getId());
+        Project project = projectRepository.findOne(projectDto.getId());
-        projectRepository.save(copyFromDto(project, projectDto));
+        if (projectDto.getApplicationFileName() != null && project.getApplication() != null) {
-        eventService.updateProjectDeadlines(project);
+            fileService.deleteFile(project.getApplication());
-        for (FileDataDto file : projectDto.getFiles().stream()
-                .filter(f -> f.isDeleted() && f.getId() != null)
-                .collect(toList())) {
-            fileService.delete(file.getId());
         }
+        projectRepository.save(copyFromDto(project, projectDto));
         return project;
     }
 
     @Transactional
-    public boolean delete(Integer projectId) throws IOException {
+    public void delete(Integer projectId) throws IOException {
-        if (projectRepository.existsById(projectId)) {
+        Project project = projectRepository.findOne(projectId);
-            Project project = projectRepository.getOne(projectId);
+        if (project.getApplication() != null) {
-            projectRepository.delete(project);
+            fileService.deleteFile(project.getApplication());
-            return true;
         }
-        return false;
+        projectRepository.delete(project);
     }
 
     private Project copyFromDto(Project project, ProjectDto projectDto) throws IOException {
         project.setDescription(projectDto.getDescription());
-        project.setStatus(projectDto.getStatus() == null ? TECHNICAL_TASK : projectDto.getStatus());
+        project.setStatus(projectDto.getStatus() == null ? APPLICATION : projectDto.getStatus());
         project.setTitle(projectDto.getTitle());
         if (projectDto.getGrant() != null && projectDto.getGrant().getId() != null) {
-            project.setGrant(grantRepository.getOne(projectDto.getGrant().getId()));
+            project.setGrant(grantRepository.findOne(projectDto.getGrant().getId()));
         }
         project.setRepository(projectDto.getRepository());
         project.setDeadlines(deadlineService.saveOrCreate(projectDto.getDeadlines()));
-        project.setFiles(fileService.saveOrCreate(projectDto.getFiles().stream()
+        if (projectDto.getApplicationFileName() != null) {
-                .filter(f -> !f.isDeleted())
+            project.setApplication(fileService.createFileFromTmp(projectDto.getApplicationFileName()));
-                .collect(toList())));
-        project.getGrants().clear();
-        if (projectDto.getGrantIds() != null && !projectDto.getGrantIds().isEmpty()) {
-            projectDto.getGrantIds().forEach(grantIds -> project.getGrants().add(grantRepository.findGrantById(grantIds)));
         }
         return project;
     }
@@ -130,42 +104,8 @@ public class ProjectService {
         }
     }
 
-    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) {
-        return projectRepository.getOne(id);
+        return projectRepository.findOne(id);
-    }
-
-    public List<User> getProjectExecutors(ProjectDto projectDto) {
-        return userService.findAll();
-    }
-
-    @Transactional
-    public void ping(int projectId) throws IOException {
-        pingService.addPing(findById(projectId));
-    }
-
-    public List<GrantDto> getAllGrants() {
-        return convert(grantRepository.findAll(), GrantDto::new);
-    }
-
-    private List<GrantDto> getProjectGrants(List<Integer> grantIds) {
-        return convert(grantRepository.findAllById(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/strategy/api/EntityCreateStrategy.java

@@ -1,21 +1,21 @@
 package ru.ulstu.strategy.api;
 
-import ru.ulstu.core.model.UserActivity;
+import ru.ulstu.core.model.UserContainer;
 import ru.ulstu.user.model.User;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-public abstract class EntityCreateStrategy<T extends UserActivity> {
+public abstract class EntityCreateStrategy<T extends UserContainer> {
     protected abstract List<T> getActiveEntities();
 
     protected abstract void createEntity(User user);
 
-    private void createDefaultEntityIfNeed(List<User> allUsers, List<? extends UserActivity> entities) {
+    protected void createDefaultEntityIfNeed(List<User> allUsers, List<? extends UserContainer> entities) {
         allUsers.forEach(user -> {
             if (entities
                     .stream()
-                    .filter(entity -> entity.getActivityUsers().contains(user))
+                    .filter(entity -> entity.getUsers().contains(user))
                     .collect(Collectors.toSet()).isEmpty()) {
                 createEntity(user);
             }

src/main/java/ru/ulstu/students/controller/Navigation.java

@@ -2,7 +2,7 @@ package ru.ulstu.students.controller;
 
 import org.springframework.validation.Errors;
 
-class Navigation {
+public class Navigation {
     public static final String REDIRECT_TO = "redirect:%s";
     public static final String TASKS_PAGE = "/students/tasks";
     public static final String TASK_PAGE = "/students/task";

src/main/java/ru/ulstu/students/controller/TaskController.java

@@ -1,7 +1,5 @@
 package ru.ulstu.students.controller;
 
-import io.swagger.v3.oas.annotations.Hidden;
-import jakarta.validation.Valid;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.Errors;
@@ -17,7 +15,9 @@ import ru.ulstu.students.model.TaskDto;
 import ru.ulstu.students.model.TaskFilterDto;
 import ru.ulstu.students.service.TaskService;
 import ru.ulstu.tags.model.Tag;
+import springfox.documentation.annotations.ApiIgnore;
 
+import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -29,7 +29,7 @@ import static ru.ulstu.students.controller.Navigation.TASK_PAGE;
 
 @Controller()
 @RequestMapping(value = "/students")
-@Hidden
+@ApiIgnore
 public class TaskController {
 
     private final TaskService taskService;

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

@@ -1,14 +1,14 @@
 package ru.ulstu.students.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.core.model.BaseEntity;
 
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import java.util.Date;
 
 @Entity

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

@@ -1,35 +1,31 @@
 package ru.ulstu.students.model;
 
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OrderBy;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
-import jakarta.validation.constraints.NotBlank;
 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 javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+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.OneToMany;
+import javax.persistence.OrderBy;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
 @Entity
-public class Task extends BaseEntity implements EventSource {
+public class Task extends BaseEntity {
 
     public enum TaskStatus {
         IN_WORK("В работе"),
@@ -37,7 +33,7 @@ public class Task extends BaseEntity implements EventSource {
         FAILED("Провалены сроки"),
         LOADED_FROM_KIAS("Загружен автоматически");
 
-        private final String statusName;
+        private String statusName;
 
         TaskStatus(String name) {
             this.statusName = name;
@@ -53,10 +49,6 @@ public class Task extends BaseEntity implements EventSource {
 
     private String description;
 
-    public Task() {
-
-    }
-
     @Enumerated(value = EnumType.STRING)
     private TaskStatus status = TaskStatus.IN_WORK;
 
@@ -85,16 +77,6 @@ public class Task extends BaseEntity implements EventSource {
         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/model/TaskDto.java

@@ -2,15 +2,14 @@ package ru.ulstu.students.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.NotEmpty;
 import org.apache.commons.lang3.StringUtils;
+import org.hibernate.validator.constraints.NotEmpty;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.tags.model.Tag;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -136,29 +135,6 @@ public class TaskDto {
         this.tags = tags;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TaskDto taskDto = (TaskDto) o;
-        return Objects.equals(id, taskDto.id) &&
-                Objects.equals(title, taskDto.title) &&
-                Objects.equals(description, taskDto.description) &&
-                status == taskDto.status &&
-                Objects.equals(deadlines, taskDto.deadlines) &&
-                Objects.equals(tagIds, taskDto.tagIds) &&
-                Objects.equals(tags, taskDto.tags);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, title, description, status, deadlines, createDate, updateDate, tagIds, tags);
-    }
-
     public String getTagsString() {
         return StringUtils.abbreviate(tags
                 .stream()

src/main/java/ru/ulstu/students/repository/TaskRepository.java

@@ -11,16 +11,16 @@ import java.util.List;
 
 public interface TaskRepository extends JpaRepository<Task, Integer> {
 
-    @Query("SELECT t FROM Task t WHERE (t.status = :status OR :status IS NULL) AND (:tag IS NULL OR :tag MEMBER OF t.tags) ORDER BY t.createDate DESC")
+    @Query("SELECT t FROM Task t WHERE (t.status = :status OR :status IS NULL) AND (:tag IS NULL OR :tag MEMBER OF t.tags) ORDER BY create_date DESC")
     List<Task> filterNew(@Param("status") Task.TaskStatus status, @Param("tag") Tag tag);
 
-    @Query("SELECT t FROM Task t WHERE (t.status = :status OR :status IS NULL) AND (:tag IS NULL OR :tag MEMBER OF t.tags) ORDER BY t.createDate ASC")
+    @Query("SELECT t FROM Task t WHERE (t.status = :status OR :status IS NULL) AND (:tag IS NULL OR :tag MEMBER OF t.tags) ORDER BY create_date ASC")
     List<Task> filterOld(@Param("status") Task.TaskStatus status, @Param("tag") Tag tag);
 
-    @Query("SELECT t FROM Task t WHERE(:tag IS NULL OR :tag MEMBER OF t.tags) ORDER BY t.createDate DESC")
+    @Query("SELECT t FROM Task t WHERE(:tag IS NULL OR :tag MEMBER OF t.tags) ORDER BY create_date DESC")
     List<Task> findByTag(@Param("tag") Tag tag);
 
-    @Query("SELECT t FROM Task t WHERE (t.createDate >= :date) ORDER BY t.createDate DESC")
+    @Query("SELECT t FROM Task t WHERE (t.createDate >= :date) ORDER BY create_date DESC")
     List<Task> findAllYear(@Param("date") Date date);
 
 

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

@@ -38,8 +38,8 @@ public class SchedulerService {
 
     @Transactional
     private void delete(Integer schedulerId) {
-        if (schedulerRepository.existsById(schedulerId)) {
+        if (schedulerRepository.exists(schedulerId)) {
-            schedulerRepository.deleteById(schedulerId);
+            schedulerRepository.delete(schedulerId);
         }
     }
 

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

@@ -21,7 +21,6 @@ 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;
@@ -55,7 +54,7 @@ public class TaskService {
     }
 
     public List<Task> findAll() {
-        return taskRepository.findAll(Sort.by(Sort.Direction.DESC, "createDate"));
+        return taskRepository.findAll(new Sort(Sort.Direction.DESC, "createDate"));
     }
 
     public List<TaskDto> findAllDto() {
@@ -65,7 +64,7 @@ public class TaskService {
     }
 
     public TaskDto findOneDto(Integer id) {
-        return new TaskDto(taskRepository.getOne(id));
+        return new TaskDto(taskRepository.findOne(id));
     }
 
     public List<TaskDto> filter(TaskFilterDto filterDto) {
@@ -84,7 +83,7 @@ public class TaskService {
     public Integer create(TaskDto taskDto) throws IOException {
         Task newTask = copyFromDto(new Task(), taskDto);
         newTask = taskRepository.save(newTask);
-        eventService.createFromObject(newTask, Collections.emptyList(), true, "задачи");
+        eventService.createFromTask(newTask);
         return newTask.getId();
     }
 
@@ -101,25 +100,23 @@ public class TaskService {
     }
 
     @Transactional
-    private Integer update(TaskDto taskDto) throws IOException {
+    public Integer update(TaskDto taskDto) throws IOException {
-        Task task = taskRepository.getOne(taskDto.getId());
+        Task task = taskRepository.findOne(taskDto.getId());
         taskRepository.save(copyFromDto(task, taskDto));
         eventService.updateTaskDeadlines(task);
         return task.getId();
     }
 
     @Transactional
-    public boolean delete(Integer taskId) throws IOException {
+    public void delete(Integer taskId) throws IOException {
-        if (taskRepository.existsById(taskId)) {
+        if (taskRepository.exists(taskId)) {
-            Task scheduleTask = taskRepository.getOne(taskId);
+            Task scheduleTask = taskRepository.findOne(taskId);
             Scheduler sch = schedulerRepository.findOneByTask(scheduleTask);
             if (sch != null) {
-                schedulerRepository.deleteById(sch.getId());
+                schedulerRepository.delete(sch.getId());
             }
-            taskRepository.deleteById(taskId);
+            taskRepository.delete(taskId);
-            return true;
         }
-        return false;
 
     }
 
@@ -131,14 +128,14 @@ public class TaskService {
         }
     }
 
-    private void copyMainPart(Task newTask, Task task) {
+    public void copyMainPart(Task newTask, Task task) {
         newTask.setTitle(task.getTitle());
         newTask.setTags(tagService.saveOrCreate(task.getTags()));
         newTask.setCreateDate(new Date());
         newTask.setStatus(Task.TaskStatus.LOADED_FROM_KIAS);
     }
 
-    private Task copyTaskWithNewDates(Task task) {
+    public Task copyTaskWithNewDates(Task task) {
         Task newTask = new Task();
         copyMainPart(newTask, task);
         Calendar cal1 = DateUtils.getCalendar(newTask.getCreateDate());
@@ -160,7 +157,7 @@ public class TaskService {
                 }).collect(Collectors.toList());
     }
 
-    private Task copyTaskWithNewYear(Task task) {
+    public Task copyTaskWithNewYear(Task task) {
         Task newTask = new Task();
         copyMainPart(newTask, task);
         newTask.setDeadlines(newYearDeadlines(task.getDeadlines()));
@@ -187,7 +184,7 @@ public class TaskService {
     }
 
     @Transactional
-    public List<Task> generateYearTasks() {
+    public void generateYearTasks() {
         Set<Tag> tags = checkRepeatingTags(false);
         List<Task> tasks = new ArrayList<>();
         tags.forEach(tag -> {
@@ -203,9 +200,7 @@ public class TaskService {
                 Task newTask = copyTaskWithNewYear(task);
                 taskRepository.save(newTask);
             });
-            return tasks;
         }
-        return null;
     }
 
 
@@ -250,9 +245,8 @@ public class TaskService {
     }
 
     @Transactional
-    public Task createPeriodTask(Scheduler scheduler) {
+    public void createPeriodTask(Scheduler scheduler) {
         Task newTask = copyTaskWithNewDates(scheduler.getTask());
         taskRepository.save(newTask);
-        return newTask;
     }
 }

src/main/java/ru/ulstu/tags/model/Tag.java

@@ -2,13 +2,13 @@ package ru.ulstu.tags.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.persistence.Column;
+import org.hibernate.validator.constraints.NotEmpty;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Size;
 import ru.ulstu.core.model.BaseEntity;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.validation.constraints.Size;
 import java.util.Objects;
 
 @Entity