Compare commits
No commits in common. "dev" and "77-students-datetime-sorting" have entirely different histories.
dev
...
77-student
@ -1,16 +1,16 @@
|
||||
image: romanov73/is:ng-tracker-container-11
|
||||
image: romanov73/is:ng-tracker-container
|
||||
|
||||
variables:
|
||||
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
|
||||
|
||||
before_script:
|
||||
- service postgresql stop
|
||||
- service postgresql start
|
||||
- eval $(ssh-agent -s)
|
||||
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
|
||||
- mkdir -p ~/.ssh
|
||||
- chmod 700 ~/.ssh
|
||||
- git log --pretty="%cn;%cd;%s" > src/main/resources/commits.log
|
||||
- service postgresql stop
|
||||
- service postgresql start
|
||||
- eval $(ssh-agent -s)
|
||||
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
|
||||
- mkdir -p ~/.ssh
|
||||
- chmod 700 ~/.ssh
|
||||
- git log --pretty="%cn;%cd;%s" > src/main/resources/commits.log
|
||||
|
||||
build:
|
||||
stage: build
|
||||
|
||||
19
Jenkinsfile
vendored
19
Jenkinsfile
vendored
@ -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])
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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)
|
||||
115
build.gradle
115
build.gradle
@ -1,19 +1,34 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'org.springframework.boot' version '3.2.4'
|
||||
id 'io.spring.dependency-management' version '1.1.4'
|
||||
id 'checkstyle'
|
||||
buildscript {
|
||||
ext {
|
||||
versionSpringBoot = '1.5.10.RELEASE'
|
||||
}
|
||||
|
||||
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 = '17'
|
||||
}
|
||||
sourceCompatibility = 1.8
|
||||
targetCompatibility = 1.8
|
||||
|
||||
bootRun {
|
||||
systemProperties = System.properties
|
||||
@ -49,7 +64,7 @@ checkstyle {
|
||||
checkstyle
|
||||
}
|
||||
|
||||
dependencies {
|
||||
dependencies{
|
||||
assert project.hasProperty("checkstyleVersion")
|
||||
|
||||
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
|
||||
@ -61,16 +76,9 @@ task health(dependsOn: [
|
||||
'checkstyleMain'
|
||||
])
|
||||
|
||||
test {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
|
||||
jar {
|
||||
enabled = false
|
||||
}
|
||||
|
||||
bootJar {
|
||||
archiveFileName = String.format('%s-%s.jar', rootProject.name, version)
|
||||
baseName = 'ng-tracker'
|
||||
}
|
||||
|
||||
compileJava {
|
||||
@ -82,39 +90,42 @@ repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation('org.springframework.boot:spring-boot-starter-web') {
|
||||
exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
|
||||
}
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-aop'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf'
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation'
|
||||
implementation group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect'
|
||||
implementation group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity6'
|
||||
implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner'
|
||||
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-hibernate5'
|
||||
|
||||
implementation group: 'org.postgresql', name: 'postgresql', version: '42.2.5'
|
||||
|
||||
implementation group: 'org.liquibase', name: 'liquibase-core', version: '4.27.0'
|
||||
implementation group: 'com.mattbertolini', name: 'liquibase-slf4j', version: '2.0.0'
|
||||
|
||||
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
|
||||
|
||||
implementation group: 'org.webjars', name: 'bootstrap', version: '5.3.3'
|
||||
runtimeOnly group: 'org.webjars', name: 'bootstrap-select', version: '1.4.2'
|
||||
implementation group: 'org.webjars', name: 'jquery', version: '3.7.1'
|
||||
implementation group: 'org.webjars', name: 'jquery-easing', version: '1.4.1'
|
||||
implementation group: 'org.webjars', name: 'font-awesome', version: '4.7.0'
|
||||
|
||||
implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.8.0'
|
||||
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'
|
||||
configurations {
|
||||
compile.exclude module: "spring-boot-starter-tomcat"
|
||||
compile.exclude module: "bcmail-jdk14"
|
||||
compile.exclude module: "bcprov-jdk14"
|
||||
compile.exclude module: "bctsp-jdk14"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-security'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-aop'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-mail'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf'
|
||||
compile group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity4'
|
||||
compile group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner'
|
||||
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-hibernate5'
|
||||
|
||||
compile group: 'postgresql', name: 'postgresql', version: '9.1-901.jdbc4'
|
||||
|
||||
compile group: 'org.liquibase', name: 'liquibase-core', version: '3.5.3'
|
||||
compile group: 'com.mattbertolini', name: 'liquibase-slf4j', version: '2.0.0'
|
||||
|
||||
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
|
||||
|
||||
compile group: 'org.webjars', name: 'bootstrap', version: '4.1.0'
|
||||
compile group: 'org.webjars', name: 'bootstrap-select', version: '1.13.3'
|
||||
compile group: 'org.webjars', name: 'jquery', version: '3.3.1-1'
|
||||
compile group: 'org.webjars.npm', name: 'jquery.easing', version: '1.4.1'
|
||||
compile group: 'org.webjars', name: 'font-awesome', version: '4.7.0'
|
||||
|
||||
compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.6.0'
|
||||
compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.6.0'
|
||||
|
||||
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test'
|
||||
testCompile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1'
|
||||
|
||||
}
|
||||
@ -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"
|
||||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -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
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
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;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
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;
|
||||
@ -15,13 +14,18 @@ import ru.ulstu.conference.model.ConferenceDto;
|
||||
import ru.ulstu.conference.model.ConferenceFilterDto;
|
||||
import ru.ulstu.conference.model.ConferenceUser;
|
||||
import ru.ulstu.conference.service.ConferenceService;
|
||||
import ru.ulstu.deadline.model.Deadline;
|
||||
import ru.ulstu.user.model.User;
|
||||
import springfox.documentation.annotations.ApiIgnore;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static org.springframework.util.StringUtils.isEmpty;
|
||||
import static ru.ulstu.core.controller.Navigation.CONFERENCES_PAGE;
|
||||
import static ru.ulstu.core.controller.Navigation.CONFERENCE_PAGE;
|
||||
import static ru.ulstu.core.controller.Navigation.REDIRECT_TO;
|
||||
@ -29,7 +33,7 @@ import static ru.ulstu.core.controller.Navigation.REDIRECT_TO;
|
||||
|
||||
@Controller()
|
||||
@RequestMapping(value = "/conferences")
|
||||
@Hidden
|
||||
@ApiIgnore
|
||||
public class ConferenceController {
|
||||
|
||||
private final ConferenceService conferenceService;
|
||||
@ -50,13 +54,6 @@ public class ConferenceController {
|
||||
conferenceFilterDto.getYear()));
|
||||
}
|
||||
|
||||
@GetMapping("/dashboard")
|
||||
public void getDashboard(ModelMap modelMap) {
|
||||
modelMap.put("conferences", conferenceService.findAllActiveDto());
|
||||
|
||||
conferenceService.setChartData(modelMap); // example
|
||||
}
|
||||
|
||||
@GetMapping("/conference")
|
||||
public void getConference(ModelMap modelMap, @RequestParam(value = "id") Integer id) {
|
||||
if (id != null && id > 0) {
|
||||
@ -66,27 +63,30 @@ public class ConferenceController {
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping(value = "/conferences", params = "deleteConference")
|
||||
public String delete(@RequestParam("deleteConference") Integer conferenceId) throws IOException {
|
||||
@PostMapping(value = "/conference", params = "save")
|
||||
public String save(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
|
||||
filterEmptyDeadlines(conferenceDto);
|
||||
if (errors.hasErrors()) {
|
||||
return CONFERENCE_PAGE;
|
||||
}
|
||||
conferenceService.save(conferenceDto);
|
||||
return String.format(REDIRECT_TO, CONFERENCES_PAGE);
|
||||
|
||||
}
|
||||
|
||||
@GetMapping("/delete/{conference-id}")
|
||||
public String delete(@PathVariable("conference-id") Integer conferenceId) throws IOException {
|
||||
conferenceService.delete(conferenceId);
|
||||
return String.format(REDIRECT_TO, CONFERENCES_PAGE);
|
||||
}
|
||||
|
||||
@PostMapping(value = "/conference", params = "save")
|
||||
public String save(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
|
||||
if (!conferenceService.save(conferenceDto, errors)) {
|
||||
return CONFERENCE_PAGE;
|
||||
}
|
||||
return String.format(REDIRECT_TO, CONFERENCES_PAGE);
|
||||
}
|
||||
|
||||
@PostMapping(value = "/conference", params = "addDeadline")
|
||||
public String addDeadline(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
|
||||
conferenceService.filterEmptyDeadlines(conferenceDto);
|
||||
public String addDeadline(@Valid ConferenceDto conferenceDto, Errors errors) {
|
||||
filterEmptyDeadlines(conferenceDto);
|
||||
if (errors.hasErrors()) {
|
||||
return CONFERENCE_PAGE;
|
||||
}
|
||||
conferenceService.addDeadline(conferenceDto);
|
||||
conferenceDto.getDeadlines().add(new Deadline());
|
||||
return CONFERENCE_PAGE;
|
||||
}
|
||||
|
||||
@ -100,16 +100,6 @@ public class ConferenceController {
|
||||
return CONFERENCE_PAGE;
|
||||
}
|
||||
|
||||
@PostMapping(value = "/conference", params = "addPaper")
|
||||
public String addPaper(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
|
||||
if (errors.hasErrors()) {
|
||||
return CONFERENCE_PAGE;
|
||||
}
|
||||
conferenceService.addPaper(conferenceDto);
|
||||
|
||||
return CONFERENCE_PAGE;
|
||||
}
|
||||
|
||||
@PostMapping(value = "/conference", params = "removePaper")
|
||||
public String removePaper(@Valid ConferenceDto conferenceDto, Errors errors,
|
||||
@RequestParam(value = "removePaper") Integer paperIndex) throws IOException {
|
||||
@ -129,15 +119,6 @@ public class ConferenceController {
|
||||
return CONFERENCE_PAGE;
|
||||
}
|
||||
|
||||
@PostMapping(value = "/conference", params = "pingConference")
|
||||
public String ping(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
|
||||
if (errors.hasErrors()) {
|
||||
return CONFERENCE_PAGE;
|
||||
}
|
||||
conferenceService.ping(conferenceDto);
|
||||
return CONFERENCE_PAGE;
|
||||
}
|
||||
|
||||
@ModelAttribute("allParticipation")
|
||||
public List<ConferenceUser.Participation> getAllParticipation() {
|
||||
return conferenceService.getAllParticipations();
|
||||
@ -162,4 +143,9 @@ public class ConferenceController {
|
||||
return years;
|
||||
}
|
||||
|
||||
private void filterEmptyDeadlines(ConferenceDto conferenceDto) {
|
||||
conferenceDto.setDeadlines(conferenceDto.getDeadlines().stream()
|
||||
.filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
|
||||
.collect(Collectors.toList()));
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,40 +1,32 @@
|
||||
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 implements UserActivity, EventSource {
|
||||
public class Conference extends BaseEntity {
|
||||
|
||||
@NotBlank
|
||||
private String title;
|
||||
@ -43,17 +35,17 @@ public class Conference extends BaseEntity implements UserActivity, EventSource
|
||||
|
||||
private String url;
|
||||
|
||||
private int ping = 0;
|
||||
private int ping;
|
||||
|
||||
@Column(name = "begin_date")
|
||||
@Temporal(TemporalType.TIMESTAMP)
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date beginDate = new Date();
|
||||
private Date beginDate;
|
||||
|
||||
@Column(name = "end_date")
|
||||
@Temporal(TemporalType.TIMESTAMP)
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date endDate = new Date();
|
||||
private Date endDate;
|
||||
|
||||
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
|
||||
@JoinColumn(name = "conference_id", unique = true)
|
||||
@ -61,38 +53,21 @@ public class Conference extends BaseEntity implements UserActivity, EventSource
|
||||
@OrderBy("date")
|
||||
private List<Deadline> deadlines = new ArrayList<>();
|
||||
|
||||
@OneToMany(cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "conference_id")
|
||||
@ManyToMany(fetch = FetchType.EAGER)
|
||||
@JoinTable(name = "paper_conference",
|
||||
joinColumns = {@JoinColumn(name = "conference_id")},
|
||||
inverseJoinColumns = {@JoinColumn(name = "paper_id")})
|
||||
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;
|
||||
}
|
||||
@ -160,18 +135,4 @@ public class Conference extends BaseEntity implements UserActivity, EventSource
|
||||
public void setUsers(List<ConferenceUser> users) {
|
||||
this.users = users;
|
||||
}
|
||||
|
||||
public Optional<Deadline> getNextDeadline() {
|
||||
return deadlines
|
||||
.stream()
|
||||
.filter(deadline -> deadline.getDate() != null)
|
||||
.sorted(Comparator.comparing(Deadline::getDate))
|
||||
.filter(d -> d.getDate().after(new Date()))
|
||||
.findFirst();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<User> getActivityUsers() {
|
||||
return getUsers().stream().map(ConferenceUser::getUser).collect(Collectors.toSet());
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,24 +2,21 @@ package ru.ulstu.conference.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import jakarta.persistence.Temporal;
|
||||
import jakarta.persistence.TemporalType;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import org.hibernate.validator.constraints.NotEmpty;
|
||||
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;
|
||||
import java.util.Objects;
|
||||
|
||||
import static ru.ulstu.core.util.StreamApiUtils.convert;
|
||||
|
||||
public class ConferenceDto extends NameContainer {
|
||||
public class ConferenceDto {
|
||||
|
||||
private final static String BEGIN_DATE = "Начало: ";
|
||||
private final static String END_DATE = "Конец: ";
|
||||
@ -91,8 +88,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.paperIds = convert(conference.getPapers(), BaseEntity::getId);
|
||||
this.userIds = convert(conference.getUsers(), user -> user.getId());
|
||||
this.paperIds = convert(conference.getPapers(), paper -> paper.getId());
|
||||
this.users = conference.getUsers();
|
||||
this.papers = conference.getPapers();
|
||||
}
|
||||
@ -221,33 +218,4 @@ public class ConferenceDto extends NameContainer {
|
||||
return BEGIN_DATE + beginDate.toString().split(" ")[0] + " " + END_DATE + endDate.toString().split(" ")[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) {
|
||||
return true;
|
||||
}
|
||||
if (o == null || getClass() != o.getClass()) {
|
||||
return false;
|
||||
}
|
||||
ConferenceDto that = (ConferenceDto) o;
|
||||
return ping == that.ping &&
|
||||
disabledTakePart == that.disabledTakePart &&
|
||||
Objects.equals(id, that.id) &&
|
||||
Objects.equals(title, that.title) &&
|
||||
Objects.equals(description, that.description) &&
|
||||
Objects.equals(url, that.url) &&
|
||||
Objects.equals(deadlines, that.deadlines) &&
|
||||
Objects.equals(removedDeadlineIds, that.removedDeadlineIds) &&
|
||||
Objects.equals(userIds, that.userIds) &&
|
||||
Objects.equals(paperIds, that.paperIds) &&
|
||||
Objects.equals(papers, that.papers) &&
|
||||
Objects.equals(notSelectedPapers, that.notSelectedPapers) &&
|
||||
Objects.equals(users, that.users);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(id, title, description, url, ping, beginDate, endDate, deadlines, removedDeadlineIds,
|
||||
userIds, paperIds, papers, notSelectedPapers, users, disabledTakePart);
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,14 +11,14 @@ public class ConferenceFilterDto {
|
||||
public ConferenceFilterDto() {
|
||||
}
|
||||
|
||||
public ConferenceFilterDto(List<ConferenceDto> conferences, Integer filterUserId, Integer year) {
|
||||
this.conferences = conferences;
|
||||
public ConferenceFilterDto(List<ConferenceDto> conferenceDtos, Integer filterUserId, Integer year) {
|
||||
this.conferences = conferenceDtos;
|
||||
this.filterUserId = filterUserId;
|
||||
this.year = year;
|
||||
}
|
||||
|
||||
public ConferenceFilterDto(List<ConferenceDto> conferences) {
|
||||
this(conferences, null, null);
|
||||
public ConferenceFilterDto(List<ConferenceDto> conferenceDtos) {
|
||||
this(conferenceDtos, null, null);
|
||||
}
|
||||
|
||||
public List<ConferenceDto> getConferences() {
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,36 +1,14 @@
|
||||
package ru.ulstu.conference.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Modifying;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import ru.ulstu.conference.model.Conference;
|
||||
import ru.ulstu.name.BaseRepository;
|
||||
import ru.ulstu.user.model.User;
|
||||
|
||||
import java.util.Date;
|
||||
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")
|
||||
List<Conference> findByUserAndYear(@Param("user") User user, @Param("year") Integer year);
|
||||
|
||||
@Query("SELECT c FROM Conference c WHERE c.beginDate > :date")
|
||||
List<Conference> findAllActive(@Param("date") Date date);
|
||||
|
||||
@Query("SELECT case when count(c) > 0 then true else false end FROM Conference c JOIN c.papers p WHERE p.id = :paperId")
|
||||
boolean isPaperAttached(@Param("paperId") Integer paperId);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE Conference c SET c.ping = (c.ping + 1) WHERE c.id = :id")
|
||||
int updatePingConference(@Param("id") Integer id);
|
||||
|
||||
@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);
|
||||
|
||||
@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);
|
||||
public interface ConferenceRepository extends JpaRepository<Conference, Integer> {
|
||||
@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)")
|
||||
List<Conference> filter(@Param("user") User user, @Param("year") Integer year);
|
||||
}
|
||||
|
||||
@ -1,112 +1,7 @@
|
||||
package ru.ulstu.conference.service;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.ulstu.conference.model.Conference;
|
||||
import ru.ulstu.core.util.DateUtils;
|
||||
import ru.ulstu.ping.service.PingService;
|
||||
import ru.ulstu.user.service.MailService;
|
||||
import ru.ulstu.user.service.UserService;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class ConferenceNotificationService {
|
||||
|
||||
private final static int YESTERDAY = -1;
|
||||
private final static int DAYS_TO_DEADLINE_NOTIFICATION = 7;
|
||||
private final static String TEMPLATE_PING = "conferencePingNotification";
|
||||
private final static String TEMPLATE_DEADLINE = "conferenceDeadlineNotification";
|
||||
private final static String TEMPLATE_CREATE = "conferenceCreateNotification";
|
||||
private final static String TEMPLATE_UPDATE_DEADLINES = "conferenceUpdateDeadlinesNotification";
|
||||
private final static String TEMPLATE_UPDATE_DATES = "conferenceUpdateDatesNotification";
|
||||
|
||||
private final static String TITLE_PING = "Обратите внимание на конференцию: %s";
|
||||
private final static String TITLE_DEADLINE = "Приближается дедлайн конференции: %s";
|
||||
private final static String TITLE_CREATE = "Создана новая конференция: %s";
|
||||
private final static String TITLE_UPDATE_DEADLINES = "Изменения дедлайнов в конференции: %s";
|
||||
private final static String TITLE_UPDATE_DATES = "Изменение дат проведения конференции: %s";
|
||||
|
||||
private final MailService mailService;
|
||||
private final UserService userService;
|
||||
private final PingService pingService;
|
||||
|
||||
public ConferenceNotificationService(MailService mailService,
|
||||
UserService userService,
|
||||
PingService pingService) {
|
||||
this.mailService = mailService;
|
||||
this.userService = userService;
|
||||
this.pingService = pingService;
|
||||
}
|
||||
|
||||
public void sendDeadlineNotifications(List<Conference> conferences) {
|
||||
Date now = DateUtils.addDays(new Date(), DAYS_TO_DEADLINE_NOTIFICATION);
|
||||
conferences
|
||||
.stream()
|
||||
.filter(conference -> needToSendDeadlineNotification(conference, now))
|
||||
.forEach(this::sendMessageDeadline);
|
||||
}
|
||||
|
||||
private boolean needToSendDeadlineNotification(Conference conference, Date compareDate) {
|
||||
return (conference.getNextDeadline().isPresent())
|
||||
&& conference.getNextDeadline().get().getDate().after(new Date())
|
||||
&& conference.getNextDeadline().get().getDate().before(compareDate);
|
||||
}
|
||||
|
||||
private void sendMessageDeadline(Conference conference) {
|
||||
Map<String, Object> variables = Map.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);
|
||||
sendForAllUsers(variables, String.format(TITLE_CREATE, conference.getTitle()));
|
||||
}
|
||||
|
||||
public void updateDeadlineNotification(Conference conference) {
|
||||
Map<String, Object> variables = Map.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);
|
||||
sendForAllParticipants(variables, conference, TEMPLATE_UPDATE_DATES, String.format(TITLE_UPDATE_DATES, conference.getTitle()));
|
||||
}
|
||||
|
||||
private void sendForAllUsers(Map<String, Object> variables, String title) {
|
||||
userService.findAll().forEach(user -> mailService.sendEmailFromTemplate(variables, user, ConferenceNotificationService.TEMPLATE_CREATE, title));
|
||||
}
|
||||
|
||||
private void sendForAllParticipants(Map<String, Object> variables, Conference conference, String template, String title) {
|
||||
conference.getUsers().forEach(conferenceUser -> mailService.sendEmailFromTemplate(variables, conferenceUser.getUser(), template, title));
|
||||
}
|
||||
|
||||
|
||||
public void sendPingNotifications(List<Conference> conferences) {
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
calendar.setTime(new Date());
|
||||
calendar.add(Calendar.DAY_OF_MONTH, YESTERDAY);
|
||||
conferences
|
||||
.stream()
|
||||
.filter(conference -> {
|
||||
Integer pingCount = pingService.countPingYesterday(conference, calendar);
|
||||
return needToSendPingNotification(conference, pingCount);
|
||||
})
|
||||
.forEach(this::sendMessagePing);
|
||||
}
|
||||
|
||||
private boolean needToSendPingNotification(Conference conference, Integer pingCount) {
|
||||
if (pingCount > 0) {
|
||||
conference.setPing((Integer) pingCount);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private void sendMessagePing(Conference conference) {
|
||||
Map<String, Object> variables = Map.of("conference", conference);
|
||||
sendForAllParticipants(variables, conference, TEMPLATE_PING, String.format(TITLE_PING, conference.getTitle()));
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
package ru.ulstu.conference.service;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class ConferenceScheduler {
|
||||
private final static boolean IS_DEADLINE_NOTIFICATION_BEFORE_WEEK = true;
|
||||
|
||||
private final Logger log = LoggerFactory.getLogger(ConferenceScheduler.class);
|
||||
|
||||
private final ConferenceNotificationService conferenceNotificationService;
|
||||
private final ConferenceService conferenceService;
|
||||
|
||||
public ConferenceScheduler(ConferenceNotificationService conferenceNotificationService,
|
||||
ConferenceService conferenceService) {
|
||||
this.conferenceNotificationService = conferenceNotificationService;
|
||||
this.conferenceService = conferenceService;
|
||||
}
|
||||
|
||||
|
||||
@Scheduled(cron = "0 0 8 * * MON", zone = "Europe/Samara")
|
||||
public void checkDeadlineBeforeWeek() {
|
||||
log.debug("ConferenceScheduler.checkDeadlineBeforeWeek started");
|
||||
conferenceNotificationService.sendDeadlineNotifications(conferenceService.findAll());
|
||||
log.debug("ConferenceScheduler.checkDeadlineBeforeWeek finished");
|
||||
}
|
||||
|
||||
@Scheduled(cron = "0 0 8 * * *", zone = "Europe/Samara")
|
||||
public void checkNewPing() {
|
||||
log.debug("ConferenceScheduler.checkPing started");
|
||||
conferenceNotificationService.sendPingNotifications(conferenceService.findAll());
|
||||
log.debug("ConferenceScheduler.checkPing finished");
|
||||
}
|
||||
}
|
||||
@ -1,41 +1,29 @@
|
||||
package ru.ulstu.conference.service;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.data.domain.Sort;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.validation.Errors;
|
||||
import ru.ulstu.conference.model.Conference;
|
||||
import ru.ulstu.conference.model.ConferenceDto;
|
||||
import ru.ulstu.conference.model.ConferenceFilterDto;
|
||||
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.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;
|
||||
|
||||
@Service
|
||||
public class ConferenceService extends BaseService {
|
||||
public class ConferenceService {
|
||||
private final static int MAX_DISPLAY_SIZE = 40;
|
||||
|
||||
private final ConferenceRepository conferenceRepository;
|
||||
@ -43,31 +31,21 @@ public class ConferenceService extends BaseService {
|
||||
private final DeadlineService deadlineService;
|
||||
private final PaperService paperService;
|
||||
private final UserService userService;
|
||||
private final PingService pingService;
|
||||
private final ConferenceNotificationService conferenceNotificationService;
|
||||
private final EventService eventService;
|
||||
|
||||
public ConferenceService(ConferenceRepository conferenceRepository,
|
||||
ConferenceUserService conferenceUserService,
|
||||
DeadlineService deadlineService,
|
||||
PaperService paperService,
|
||||
UserService userService,
|
||||
PingService pingService,
|
||||
ConferenceNotificationService conferenceNotificationService,
|
||||
EventService eventService) {
|
||||
this.baseRepository = conferenceRepository;
|
||||
UserService userService) {
|
||||
this.conferenceRepository = conferenceRepository;
|
||||
this.conferenceUserService = conferenceUserService;
|
||||
this.deadlineService = deadlineService;
|
||||
this.paperService = paperService;
|
||||
this.userService = userService;
|
||||
this.pingService = pingService;
|
||||
this.conferenceNotificationService = conferenceNotificationService;
|
||||
this.eventService = eventService;
|
||||
}
|
||||
|
||||
public ConferenceDto getExistConferenceById(Integer id) {
|
||||
ConferenceDto conferenceDto = new ConferenceDto(conferenceRepository.getOne(id));
|
||||
ConferenceDto conferenceDto = findOneDto(id);
|
||||
conferenceDto.setNotSelectedPapers(getNotSelectPapers(conferenceDto.getPaperIds()));
|
||||
conferenceDto.setDisabledTakePart(isCurrentUserParticipant(conferenceDto.getUsers()));
|
||||
return conferenceDto;
|
||||
@ -75,13 +53,13 @@ public class ConferenceService extends BaseService {
|
||||
|
||||
public ConferenceDto getNewConference() {
|
||||
ConferenceDto conferenceDto = new ConferenceDto();
|
||||
conferenceDto.setNotSelectedPapers(getNotSelectPapers(new ArrayList<>()));
|
||||
conferenceDto.setNotSelectedPapers(getNotSelectPapers(new ArrayList<Integer>()));
|
||||
return conferenceDto;
|
||||
}
|
||||
|
||||
|
||||
public List<Conference> findAll() {
|
||||
return conferenceRepository.findAll(Sort.by(Sort.Direction.DESC, "beginDate"));
|
||||
return conferenceRepository.findAll();
|
||||
}
|
||||
|
||||
public List<ConferenceDto> findAllDto() {
|
||||
@ -90,122 +68,58 @@ public class ConferenceService extends BaseService {
|
||||
return conferences;
|
||||
}
|
||||
|
||||
public boolean save(ConferenceDto conferenceDto, Errors errors) throws IOException {
|
||||
conferenceDto.setName(conferenceDto.getTitle());
|
||||
filterEmptyDeadlines(conferenceDto);
|
||||
checkEmptyFieldsOfDeadline(conferenceDto, errors);
|
||||
checkEmptyFieldsOfDates(conferenceDto, errors);
|
||||
checkUniqueName(conferenceDto,
|
||||
errors,
|
||||
conferenceDto.getId(),
|
||||
"Конференция с таким именем уже существует");
|
||||
if (errors.hasErrors()) {
|
||||
return false;
|
||||
}
|
||||
public ConferenceDto findOneDto(Integer id) {
|
||||
return new ConferenceDto(conferenceRepository.findOne(id));
|
||||
}
|
||||
|
||||
public void save(ConferenceDto conferenceDto) throws IOException {
|
||||
if (isEmpty(conferenceDto.getId())) {
|
||||
create(conferenceDto);
|
||||
} else {
|
||||
update(conferenceDto);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public Conference save(Conference conference) {
|
||||
if (isEmpty(conference.getId())) {
|
||||
return create(conference);
|
||||
} else {
|
||||
return update(conference);
|
||||
@Transactional
|
||||
public Integer create(ConferenceDto conferenceDto) throws IOException {
|
||||
Conference newConference = copyFromDto(new Conference(), conferenceDto);
|
||||
newConference = conferenceRepository.save(newConference);
|
||||
return newConference.getId();
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Integer update(ConferenceDto conferenceDto) throws IOException {
|
||||
Conference conference = conferenceRepository.findOne(conferenceDto.getId());
|
||||
conferenceRepository.save(copyFromDto(conference, conferenceDto));
|
||||
conferenceDto.getRemovedDeadlineIds().forEach(deadlineService::remove);
|
||||
return conference.getId();
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void delete(Integer conferenceId) {
|
||||
if (conferenceRepository.exists(conferenceId)) {
|
||||
conferenceRepository.delete(conferenceId);
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Conference create(ConferenceDto conferenceDto) throws IOException {
|
||||
return create(copyFromDto(new Conference(), conferenceDto));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Conference create(Conference conference) {
|
||||
conference = conferenceRepository.save(conference);
|
||||
conferenceNotificationService.sendCreateNotification(conference);
|
||||
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);
|
||||
sendNotificationAfterUpdateDeadlines(conference, oldDeadlines);
|
||||
if (!conference.getBeginDate().equals(oldBeginDate) || !conference.getEndDate().equals(oldEndDate)) {
|
||||
conferenceNotificationService.updateConferencesDatesNotification(conference, oldBeginDate, oldEndDate);
|
||||
}
|
||||
return conference;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public boolean delete(Integer conferenceId) {
|
||||
if (conferenceRepository.existsById(conferenceId)) {
|
||||
eventService.removeConferencesEvent(conferenceRepository.getOne(conferenceId));
|
||||
conferenceRepository.deleteById(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;
|
||||
}
|
||||
|
||||
|
||||
public ConferenceDto removeDeadline(ConferenceDto conferenceDto, Integer deadlineIndex) throws IOException {
|
||||
public void removeDeadline(ConferenceDto conferenceDto, Integer deadlineIndex) throws IOException {
|
||||
if (conferenceDto.getDeadlines().get(deadlineIndex).getId() != null) {
|
||||
conferenceDto.getRemovedDeadlineIds().add(conferenceDto.getDeadlines().get(deadlineIndex).getId());
|
||||
}
|
||||
conferenceDto.getDeadlines().remove((int) deadlineIndex);
|
||||
return conferenceDto;
|
||||
}
|
||||
|
||||
public ConferenceDto addPaper(ConferenceDto conferenceDto) {
|
||||
Paper paper = new Paper();
|
||||
paper.setTitle(userService.getCurrentUser().getLastName() + "_" + conferenceDto.getTitle() + "_" + (new Date()).getTime());
|
||||
paper.setStatus(Paper.PaperStatus.DRAFT);
|
||||
conferenceDto.getPapers().add(paper);
|
||||
return conferenceDto;
|
||||
}
|
||||
|
||||
public ConferenceDto removePaper(ConferenceDto conferenceDto, Integer paperIndex) throws IOException {
|
||||
public void removePaper(ConferenceDto conferenceDto, Integer paperIndex) throws IOException {
|
||||
Paper removedPaper = conferenceDto.getPapers().remove((int) paperIndex);
|
||||
if (removedPaper.getId() != null) {
|
||||
conferenceDto.getNotSelectedPapers().add(removedPaper);
|
||||
}
|
||||
return conferenceDto;
|
||||
conferenceDto.getNotSelectedPapers().add(removedPaper);
|
||||
}
|
||||
|
||||
public ConferenceDto takePart(ConferenceDto conferenceDto) throws IOException {
|
||||
public void takePart(ConferenceDto conferenceDto) throws IOException {
|
||||
conferenceDto.getUsers().add(new ConferenceUser(userService.getCurrentUser()));
|
||||
conferenceDto.setDisabledTakePart(true);
|
||||
return conferenceDto;
|
||||
}
|
||||
|
||||
private List<Paper> getNotSelectPapers(List<Integer> paperIds) {
|
||||
public List<Paper> getNotSelectPapers(List<Integer> paperIds) {
|
||||
return paperService.findAllNotSelect(paperIds);
|
||||
}
|
||||
|
||||
@ -225,134 +139,28 @@ public class ConferenceService extends BaseService {
|
||||
conference.setTitle(conferenceDto.getTitle());
|
||||
conference.setDescription(conferenceDto.getDescription());
|
||||
conference.setUrl(conferenceDto.getUrl());
|
||||
conference.setPing(0);
|
||||
conference.setBeginDate(conferenceDto.getBeginDate());
|
||||
conference.setEndDate(conferenceDto.getEndDate());
|
||||
conference.getPapers().clear();
|
||||
conferenceDto.getPapers().forEach(paper -> conference.getPapers().add(paper.getId() != null ? paperService.findPaperById(paper.getId()) : paperService.create(paper)));
|
||||
conference.setPapers(conferenceDto.getPapers());
|
||||
conference.setDeadlines(deadlineService.saveOrCreate(conferenceDto.getDeadlines()));
|
||||
conference.setUsers(conferenceUserService.saveOrCreate(conferenceDto.getUsers()));
|
||||
if (conferenceDto.getPaperIds() != null && !conferenceDto.getPaperIds().isEmpty()) {
|
||||
conferenceDto.getPaperIds().forEach(paperId ->
|
||||
conference.getPapers().add(paperService.findPaperById(paperId)));
|
||||
conference.getPapers().add(paperService.findEntityById(paperId)));
|
||||
}
|
||||
return conference;
|
||||
}
|
||||
|
||||
|
||||
private boolean isCurrentUserParticipant(List<ConferenceUser> conferenceUsers) {
|
||||
public boolean isCurrentUserParticipant(List<ConferenceUser> conferenceUsers) {
|
||||
return conferenceUsers.stream().anyMatch(participant -> participant.getUser().equals(userService.getCurrentUser()));
|
||||
}
|
||||
|
||||
public List<ConferenceDto> filter(ConferenceFilterDto conferenceFilterDto) {
|
||||
return convert(conferenceRepository.findByUserAndYear(
|
||||
return convert(conferenceRepository.filter(
|
||||
conferenceFilterDto.getFilterUserId() == null ? null : userService.findById(conferenceFilterDto.getFilterUserId()),
|
||||
conferenceFilterDto.getYear()), ConferenceDto::new);
|
||||
|
||||
}
|
||||
|
||||
public List<ConferenceDto> findAllActiveDto() {
|
||||
return convert(findAllActive(), ConferenceDto::new);
|
||||
}
|
||||
|
||||
public List<Conference> findAllActive() {
|
||||
return conferenceRepository.findAllActive(new Date());
|
||||
}
|
||||
|
||||
public boolean isAttachedToConference(Integer paperId) {
|
||||
return conferenceRepository.isPaperAttached(paperId);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void ping(ConferenceDto conferenceDto) throws IOException {
|
||||
pingService.addPing(findOne(conferenceDto.getId()));
|
||||
conferenceRepository.updatePingConference(conferenceDto.getId());
|
||||
}
|
||||
|
||||
public Conference findOne(Integer conferenceId) {
|
||||
return conferenceRepository.getOne(conferenceId);
|
||||
}
|
||||
|
||||
public void setChartData(ModelMap modelMap) {
|
||||
//first, add the regional sales
|
||||
Integer northeastSales = 17089;
|
||||
Integer westSales = 10603;
|
||||
Integer midwestSales = 5223;
|
||||
Integer southSales = 10111;
|
||||
|
||||
modelMap.addAttribute("northeastSales", northeastSales);
|
||||
modelMap.addAttribute("southSales", southSales);
|
||||
modelMap.addAttribute("midwestSales", midwestSales);
|
||||
modelMap.addAttribute("westSales", westSales);
|
||||
|
||||
//now add sales by lure type
|
||||
List<Integer> inshoreSales = Arrays.asList(4074, 3455, 4112);
|
||||
List<Integer> nearshoreSales = Arrays.asList(3222, 3011, 3788);
|
||||
List<Integer> offshoreSales = Arrays.asList(7811, 7098, 6455);
|
||||
|
||||
modelMap.addAttribute("inshoreSales", inshoreSales);
|
||||
modelMap.addAttribute("nearshoreSales", nearshoreSales);
|
||||
modelMap.addAttribute("offshoreSales", offshoreSales);
|
||||
}
|
||||
|
||||
private void sendNotificationAfterUpdateDeadlines(Conference conference, List<Deadline> oldDeadlines) {
|
||||
if (oldDeadlines.size() != conference.getDeadlines().size()) {
|
||||
conferenceNotificationService.updateDeadlineNotification(conference);
|
||||
return;
|
||||
}
|
||||
|
||||
if (conference.getDeadlines()
|
||||
.stream()
|
||||
.filter(deadline -> !oldDeadlines.contains(deadline))
|
||||
.count() > 0) {
|
||||
conferenceNotificationService.updateDeadlineNotification(conference);
|
||||
}
|
||||
}
|
||||
|
||||
private Deadline copyDeadline(Deadline oldDeadline) {
|
||||
Deadline newDeadline = new Deadline(oldDeadline.getDate(), oldDeadline.getDescription());
|
||||
newDeadline.setId(oldDeadline.getId());
|
||||
return newDeadline;
|
||||
}
|
||||
|
||||
private void checkEmptyFieldsOfDeadline(ConferenceDto conferenceDto, Errors errors) {
|
||||
for (Deadline deadline : conferenceDto.getDeadlines()) {
|
||||
if (deadline.getDate() == null || deadline.getDescription().isEmpty()) {
|
||||
errors.rejectValue("deadlines", "errorCode", "Все поля дедлайна должны быть заполнены");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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());
|
||||
}
|
||||
}
|
||||
|
||||
@ -26,8 +26,8 @@ public class ConferenceUserService {
|
||||
}
|
||||
|
||||
@Transactional
|
||||
private ConferenceUser update(ConferenceUser user) {
|
||||
ConferenceUser updateUser = conferenceUserRepository.getOne(user.getId());
|
||||
public ConferenceUser update(ConferenceUser user) {
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,11 +5,7 @@ public class Constants {
|
||||
|
||||
public static final String MAIL_ACTIVATE = "Account activation";
|
||||
public static final String MAIL_RESET = "Password reset";
|
||||
public static final String MAIL_INVITE = "Account registration";
|
||||
public static final String MAIL_CHANGE_PASSWORD = "Password has been changed";
|
||||
|
||||
public static final int MIN_PASSWORD_LENGTH = 6;
|
||||
public static final int MAX_PASSWORD_LENGTH = 32;
|
||||
|
||||
public static final String LOGIN_REGEX = "^[_'.@A-Za-z0-9-]*$";
|
||||
|
||||
@ -21,5 +17,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;
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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.spring6.SpringTemplateEngine;
|
||||
import org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect;
|
||||
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.setTemplateMode("HTML");
|
||||
emailTemplateResolver.setPrefix("mail_templates/");
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -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+}");
|
||||
|
||||
@ -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.configurers.AbstractHttpConfigurer;
|
||||
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
|
||||
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,
|
||||
AuthFailureHandler authenticationFailureHandler) {
|
||||
ApplicationProperties applicationProperties) {
|
||||
this.userService = userService;
|
||||
this.bCryptPasswordEncoder = bCryptPasswordEncoder;
|
||||
this.authenticationSuccessHandler = authenticationSuccessHandler;
|
||||
this.logoutSuccessHandler = logoutSuccessHandler;
|
||||
this.applicationProperties = applicationProperties;
|
||||
this.authenticationFailureHandler = authenticationFailureHandler;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
|
||||
http.csrf(AbstractHttpConfigurer::disable);
|
||||
@Override
|
||||
protected void configure(HttpSecurity http) throws Exception {
|
||||
http.csrf()
|
||||
.disable();
|
||||
if (applicationProperties.isDevMode()) {
|
||||
log.debug("Security disabled");
|
||||
http.authorizeHttpRequests((authz) -> authz
|
||||
http.authorizeRequests()
|
||||
.anyRequest()
|
||||
.permitAll()
|
||||
);
|
||||
http.anonymous((anonymousCustomizer) -> anonymousCustomizer
|
||||
.permitAll();
|
||||
http.anonymous()
|
||||
.principal("admin")
|
||||
.authorities(UserRoleConstants.ADMIN)
|
||||
);
|
||||
.authorities(UserRoleConstants.ADMIN);
|
||||
} else {
|
||||
log.debug("Security enabled");
|
||||
http.authorizeHttpRequests((authz) -> authz
|
||||
.requestMatchers(UserController.ACTIVATE_URL).permitAll()
|
||||
.requestMatchers(Constants.PASSWORD_RESET_REQUEST_PAGE).permitAll()
|
||||
.requestMatchers(Constants.PASSWORD_RESET_PAGE).permitAll()
|
||||
.requestMatchers("/users/block").permitAll()
|
||||
.requestMatchers(UserController.URL + UserController.REGISTER_URL).permitAll()
|
||||
.requestMatchers(UserController.URL + UserController.ACTIVATE_URL).permitAll()
|
||||
.requestMatchers(UserController.URL + UserController.PASSWORD_RESET_REQUEST_URL).permitAll()
|
||||
.requestMatchers(UserController.URL + UserController.PASSWORD_RESET_URL).permitAll()
|
||||
.requestMatchers("/swagger-ui.html").hasAuthority(UserRoleConstants.ADMIN)
|
||||
.anyRequest().authenticated())
|
||||
.formLogin((formLoginCustomizer) -> formLoginCustomizer
|
||||
.loginPage("/login")
|
||||
.successHandler(authenticationSuccessHandler)
|
||||
.failureHandler(authenticationFailureHandler)
|
||||
.permitAll()
|
||||
)
|
||||
.rememberMe(rememberMe -> rememberMe.key("uniqueAndSecret"))
|
||||
.logout((logoutCustomizer) -> logoutCustomizer
|
||||
.logoutSuccessHandler(logoutSuccessHandler)
|
||||
.logoutSuccessUrl(Constants.LOGOUT_URL)
|
||||
.invalidateHttpSession(false)
|
||||
.clearAuthentication(true)
|
||||
.deleteCookies(Constants.COOKIES_NAME)
|
||||
.permitAll()
|
||||
);
|
||||
http.csrf(AbstractHttpConfigurer::disable);
|
||||
http.authorizeRequests()
|
||||
.antMatchers(UserController.ACTIVATE_URL).permitAll()
|
||||
.antMatchers(Constants.PASSWORD_RESET_REQUEST_PAGE).permitAll()
|
||||
.antMatchers(Constants.PASSWORD_RESET_PAGE).permitAll()
|
||||
.antMatchers(UserController.URL + UserController.REGISTER_URL).permitAll()
|
||||
.antMatchers(UserController.URL + UserController.ACTIVATE_URL).permitAll()
|
||||
.antMatchers(UserController.URL + UserController.PASSWORD_RESET_REQUEST_URL).permitAll()
|
||||
.antMatchers(UserController.URL + UserController.PASSWORD_RESET_URL).permitAll()
|
||||
.antMatchers("/swagger-ui.html").hasAuthority(UserRoleConstants.ADMIN)
|
||||
.anyRequest().authenticated()
|
||||
.and()
|
||||
.formLogin()
|
||||
.loginPage("/login")
|
||||
.successHandler(authenticationSuccessHandler)
|
||||
.permitAll()
|
||||
.and()
|
||||
.logout()
|
||||
.logoutSuccessHandler(logoutSuccessHandler)
|
||||
.logoutSuccessUrl(Constants.LOGOUT_URL)
|
||||
.invalidateHttpSession(false)
|
||||
.clearAuthentication(true)
|
||||
.deleteCookies(Constants.COOKIES_NAME)
|
||||
.permitAll();
|
||||
}
|
||||
return http.build();
|
||||
if (applicationProperties.isUseHttps()) {
|
||||
http.portMapper()
|
||||
.http(httpPort)
|
||||
.mapsTo(httpsPort)
|
||||
.and()
|
||||
.requiresChannel()
|
||||
.anyRequest()
|
||||
.requiresSecure();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Bean
|
||||
public WebSecurityCustomizer webSecurityCustomizer() {
|
||||
return (web) -> web.ignoring()
|
||||
.requestMatchers("/css/**",
|
||||
"/javax.faces.resource/**",
|
||||
"/js/**",
|
||||
"/templates/**",
|
||||
"/webjars/**",
|
||||
"/img/**");
|
||||
@Override
|
||||
public void configure(WebSecurity web) {
|
||||
web.ignoring()
|
||||
.antMatchers("/css/**")
|
||||
.antMatchers("/js/**")
|
||||
.antMatchers("/templates/**")
|
||||
.antMatchers("/webjars/**");
|
||||
}
|
||||
|
||||
@Autowired
|
||||
|
||||
@ -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();
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
@ -19,13 +20,12 @@ import ru.ulstu.user.error.UserNotActivatedException;
|
||||
import ru.ulstu.user.error.UserNotFoundException;
|
||||
import ru.ulstu.user.error.UserPasswordsNotValidOrNotMatchException;
|
||||
import ru.ulstu.user.error.UserResetKeyError;
|
||||
import ru.ulstu.user.error.UserSendingMailException;
|
||||
import ru.ulstu.user.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,9 +34,9 @@ public class AdviceController {
|
||||
this.userService = userService;
|
||||
}
|
||||
|
||||
@ModelAttribute("flashMessage")
|
||||
public String getFlashMessage() {
|
||||
return null;
|
||||
@ModelAttribute("currentUser")
|
||||
public String getCurrentUser() {
|
||||
return userService.getCurrentUser().getUserAbbreviate();
|
||||
}
|
||||
|
||||
private Response<Void> handleException(ErrorConstants error) {
|
||||
@ -107,9 +107,4 @@ public class AdviceController {
|
||||
public ResponseExtended<String> handleUserIsUndeadException(Throwable e) {
|
||||
return handleException(ErrorConstants.USER_UNDEAD_ERROR, e.getMessage());
|
||||
}
|
||||
|
||||
@ExceptionHandler(UserSendingMailException.class)
|
||||
public ResponseExtended<String> handleUserSendingMailException(Throwable e) {
|
||||
return handleException(ErrorConstants.USER_SENDING_MAIL_EXCEPTION, e.getMessage());
|
||||
}
|
||||
}
|
||||
@ -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) {
|
||||
this(offset, count, Sort.by(direction, properties));
|
||||
public OffsetablePageRequest(int offset, int count, Sort.Direction direction, String... 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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,16 +1,14 @@
|
||||
package ru.ulstu.core.model;
|
||||
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.MappedSuperclass;
|
||||
import jakarta.persistence.Version;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.MappedSuperclass;
|
||||
import javax.persistence.Version;
|
||||
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) {
|
||||
return id != null ? id.compareTo(o.getId()) : -1;
|
||||
public int compareTo(Object o) {
|
||||
return id != null ? id.compareTo(((BaseEntity) o).getId()) : -1;
|
||||
}
|
||||
|
||||
public void reset() {
|
||||
|
||||
@ -6,18 +6,17 @@ public enum ErrorConstants {
|
||||
VALIDATION_ERROR(2, "Validation error"),
|
||||
USER_ID_EXISTS(100, "New user can't have id"),
|
||||
USER_ACTIVATION_ERROR(101, "Invalid activation key"),
|
||||
USER_EMAIL_EXISTS(102, "Пользователь с таким почтовым ящиком уже существует"),
|
||||
USER_LOGIN_EXISTS(103, "Пользователь с таким логином уже существует"),
|
||||
USER_PASSWORDS_NOT_VALID_OR_NOT_MATCH(104, "Пароли введены неверно"),
|
||||
USER_NOT_FOUND(105, "Аккаунт не найден"),
|
||||
USER_EMAIL_EXISTS(102, "User with same email already exists"),
|
||||
USER_LOGIN_EXISTS(103, "User with same login already exists"),
|
||||
USER_PASSWORDS_NOT_VALID_OR_NOT_MATCH(104, "User passwords is not valid or not match"),
|
||||
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, "Во время отправки приглашения пользователю произошла ошибка");
|
||||
FILE_UPLOAD_ERROR(110, "File upload error");
|
||||
|
||||
private final int code;
|
||||
private final String message;
|
||||
private int code;
|
||||
private String message;
|
||||
|
||||
ErrorConstants(int code, String message) {
|
||||
this.code = code;
|
||||
|
||||
@ -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);
|
||||
}
|
||||
34
src/main/java/ru/ulstu/core/model/TreeDto.java
Normal file
34
src/main/java/ru/ulstu/core/model/TreeDto.java
Normal file
@ -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;
|
||||
}
|
||||
}
|
||||
16
src/main/java/ru/ulstu/core/model/TreeEntity.java
Normal file
16
src/main/java/ru/ulstu/core/model/TreeEntity.java
Normal file
@ -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);
|
||||
}
|
||||
@ -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();
|
||||
}
|
||||
9
src/main/java/ru/ulstu/core/model/UserContainer.java
Normal file
9
src/main/java/ru/ulstu/core/model/UserContainer.java
Normal file
@ -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();
|
||||
}
|
||||
@ -1,8 +1,8 @@
|
||||
package ru.ulstu.core.model.response;
|
||||
|
||||
class ControllerResponse<D, E> {
|
||||
private final D data;
|
||||
private final ControllerResponseError<E> error;
|
||||
private D data;
|
||||
private ControllerResponseError<E> error;
|
||||
|
||||
ControllerResponse(D data) {
|
||||
this.data = data;
|
||||
|
||||
@ -3,8 +3,8 @@ package ru.ulstu.core.model.response;
|
||||
import ru.ulstu.core.model.ErrorConstants;
|
||||
|
||||
class ControllerResponseError<D> {
|
||||
private final ErrorConstants description;
|
||||
private final D data;
|
||||
private ErrorConstants description;
|
||||
private D data;
|
||||
|
||||
ControllerResponseError(ErrorConstants description, D data) {
|
||||
this.description = description;
|
||||
|
||||
@ -11,6 +11,6 @@ public class Response<D> extends ResponseEntity<Object> {
|
||||
}
|
||||
|
||||
public Response(ErrorConstants error) {
|
||||
super(new ControllerResponse<Void, Void>(new ControllerResponseError<>(error, null)), HttpStatus.BAD_REQUEST);
|
||||
super(new ControllerResponse<Void, Void>(new ControllerResponseError<>(error, null)), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,6 +7,6 @@ import ru.ulstu.core.model.ErrorConstants;
|
||||
public class ResponseExtended<E> extends ResponseEntity<Object> {
|
||||
|
||||
public ResponseExtended(ErrorConstants error, E errorData) {
|
||||
super(new ControllerResponse<Void, E>(new ControllerResponseError<E>(error, errorData)), HttpStatus.BAD_REQUEST);
|
||||
super(new ControllerResponse<Void, E>(new ControllerResponseError<E>(error, errorData)), HttpStatus.OK);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
@ -57,16 +54,4 @@ public class DateUtils {
|
||||
cal.add(Calendar.DAY_OF_MONTH, count);
|
||||
return cal.getTime();
|
||||
}
|
||||
|
||||
public static Date addYears(Date date, int count) {
|
||||
Calendar cal = getCalendar(date);
|
||||
cal.add(Calendar.YEAR, count);
|
||||
return cal.getTime();
|
||||
}
|
||||
|
||||
public static LocalDate convertToLocalDate(Date dateToConvert) {
|
||||
return dateToConvert.toInstant()
|
||||
.atZone(ZoneId.systemDefault())
|
||||
.toLocalDate();
|
||||
}
|
||||
}
|
||||
|
||||
17
src/main/java/ru/ulstu/core/util/NumberUtils.java
Normal file
17
src/main/java/ru/ulstu/core/util/NumberUtils.java
Normal file
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,33 +2,23 @@ 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
|
||||
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 +27,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("executors") List<User> executors,
|
||||
@JsonProperty("done") Boolean done) {
|
||||
@JsonProperty("date") Date date) {
|
||||
this.setId(id);
|
||||
this.description = description;
|
||||
this.date = date;
|
||||
this.executors = executors;
|
||||
this.done = done;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
@ -72,47 +51,4 @@ public class Deadline extends BaseEntity {
|
||||
public void setDate(Date date) {
|
||||
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) {
|
||||
return true;
|
||||
}
|
||||
if (o == null || getClass() != o.getClass()) {
|
||||
return false;
|
||||
}
|
||||
if (!super.equals(o)) {
|
||||
return false;
|
||||
}
|
||||
Deadline deadline = (Deadline) o;
|
||||
if (getId() == null && deadline.getId() == null &&
|
||||
description == null && deadline.description == null &&
|
||||
date == null && deadline.date == null) {
|
||||
return true;
|
||||
}
|
||||
return getId().equals(deadline.getId()) &&
|
||||
description.equals(deadline.description) &&
|
||||
date.equals(deadline.date);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(super.hashCode(), description, date, executors, done);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
@ -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) {
|
||||
Deadline updateDeadline = deadlineRepository.getOne(deadline.getId());
|
||||
public Deadline update(Deadline deadline) {
|
||||
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);
|
||||
}
|
||||
|
||||
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);
|
||||
deadlineRepository.delete(deadlineId);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 final FileRepository fileRepository;
|
||||
private String tmpDir;
|
||||
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) {
|
||||
FileData file = fileRepository.getOne(fileDataDto.getId());
|
||||
public FileData update(FileDataDto fileDataDto) {
|
||||
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());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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,19 @@ 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 +29,7 @@ import static ru.ulstu.core.controller.Navigation.REDIRECT_TO;
|
||||
|
||||
@Controller()
|
||||
@RequestMapping(value = "/grants")
|
||||
@Hidden
|
||||
@ApiIgnore
|
||||
public class GrantController {
|
||||
private final GrantService grantService;
|
||||
|
||||
@ -44,15 +44,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);
|
||||
attachPaper(grantDto);
|
||||
modelMap.put("grantDto", grantDto);
|
||||
modelMap.put("grantDto", grantService.findOneDto(id));
|
||||
} else {
|
||||
modelMap.put("grantDto", new GrantDto());
|
||||
}
|
||||
@ -61,9 +59,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);
|
||||
}
|
||||
|
||||
@ -72,15 +78,9 @@ public class GrantController {
|
||||
return GRANT_PAGE;
|
||||
}
|
||||
|
||||
@PostMapping(value = "/grant", params = "attachPaper")
|
||||
public String attachPaper(GrantDto grantDto) {
|
||||
grantService.attachPaper(grantDto);
|
||||
return GRANT_PAGE;
|
||||
}
|
||||
|
||||
@PostMapping(value = "/grant", params = "addDeadline")
|
||||
public String addDeadline(@Valid GrantDto grantDto, Errors errors) {
|
||||
grantService.filterEmptyDeadlines(grantDto);
|
||||
filterEmptyDeadlines(grantDto);
|
||||
if (errors.hasErrors()) {
|
||||
return GRANT_PAGE;
|
||||
}
|
||||
@ -88,15 +88,8 @@ public class GrantController {
|
||||
return GRANT_PAGE;
|
||||
}
|
||||
|
||||
@PostMapping(value = "/grant", params = "removeDeadline")
|
||||
public String removeDeadline(GrantDto grantDto,
|
||||
@RequestParam(value = "removeDeadline") Integer deadlineId) {
|
||||
grantService.removeDeadline(grantDto, deadlineId);
|
||||
return GRANT_PAGE;
|
||||
}
|
||||
|
||||
@PostMapping(value = "/grant", params = "createProject")
|
||||
public String createProject(@Valid GrantDto grantDto, Errors errors) throws IOException {
|
||||
public String createProject(@Valid GrantDto grantDto, Errors errors) {
|
||||
if (errors.hasErrors()) {
|
||||
return GRANT_PAGE;
|
||||
}
|
||||
@ -120,14 +113,9 @@ public class GrantController {
|
||||
return grantService.getGrantAuthors(grantDto);
|
||||
}
|
||||
|
||||
@ModelAttribute("allPapers")
|
||||
public List<PaperDto> getAllPapers() {
|
||||
return grantService.getAllUncompletedPapers();
|
||||
}
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping(value = "/ping")
|
||||
public void ping(@RequestParam("grantId") int grantId) throws IOException {
|
||||
grantService.ping(grantId);
|
||||
private void filterEmptyDeadlines(GrantDto grantDto) {
|
||||
grantDto.setDeadlines(grantDto.getDeadlines().stream()
|
||||
.filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
|
||||
.collect(Collectors.toList()));
|
||||
}
|
||||
}
|
||||
|
||||
@ -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();
|
||||
}
|
||||
}
|
||||
@ -1,34 +1,26 @@
|
||||
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.UserActivity;
|
||||
import ru.ulstu.core.model.UserContainer;
|
||||
import ru.ulstu.deadline.model.Deadline;
|
||||
import ru.ulstu.file.model.FileData;
|
||||
import ru.ulstu.paper.model.Paper;
|
||||
import ru.ulstu.project.model.Project;
|
||||
import ru.ulstu.timeline.model.Event;
|
||||
import ru.ulstu.user.model.User;
|
||||
|
||||
import javax.persistence.CascadeType;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.EnumType;
|
||||
import javax.persistence.Enumerated;
|
||||
import javax.persistence.FetchType;
|
||||
import javax.persistence.JoinColumn;
|
||||
import javax.persistence.ManyToMany;
|
||||
import javax.persistence.ManyToOne;
|
||||
import javax.persistence.OneToMany;
|
||||
import javax.persistence.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 +30,25 @@ import java.util.Set;
|
||||
|
||||
@Entity
|
||||
@Table(name = "grants")
|
||||
@DiscriminatorValue("GRANT")
|
||||
public class Grant extends BaseEntity implements UserActivity, EventSource {
|
||||
public class Grant extends BaseEntity implements UserContainer {
|
||||
public enum GrantStatus {
|
||||
APPLICATION("Заявка", "text-draft"),
|
||||
ON_COMPETITION("Отправлен на конкурс", "text-review"),
|
||||
SUCCESSFUL_PASSAGE("Успешное прохождение", "text-accepted"),
|
||||
IN_WORK("В работе", "text-primary"),
|
||||
COMPLETED("Завершен", "text-success"),
|
||||
FAILED("Провалены сроки", "text-failed"),
|
||||
LOADED_FROM_KIAS("Загружен автоматически", "text-warning"),
|
||||
SKIPPED("Не интересует", "text-not-accepted");
|
||||
APPLICATION("Заявка"),
|
||||
ON_COMPETITION("Отправлен на конкурс"),
|
||||
SUCCESSFUL_PASSAGE("Успешное прохождение"),
|
||||
IN_WORK("В работе"),
|
||||
COMPLETED("Завершен"),
|
||||
FAILED("Провалены сроки"),
|
||||
LOADED_FROM_KIAS("Загружен автоматически");
|
||||
|
||||
private final String statusName;
|
||||
private final String elementClass;
|
||||
private String statusName;
|
||||
|
||||
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,17 +57,19 @@ 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<>();
|
||||
|
||||
//Описание гранта
|
||||
@NotNull
|
||||
private String comment;
|
||||
|
||||
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "grant_id", unique = true)
|
||||
@Fetch(FetchMode.SUBSELECT)
|
||||
private List<FileData> files = new ArrayList<>();
|
||||
//Заявка на грант
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "file_id")
|
||||
private FileData application;
|
||||
|
||||
@ManyToOne(cascade = CascadeType.ALL)
|
||||
@JoinColumn(name = "project_id")
|
||||
@ -97,17 +83,6 @@ public class Grant extends BaseEntity implements UserActivity, EventSource {
|
||||
@JoinColumn(name = "leader_id")
|
||||
private User leader;
|
||||
|
||||
@ManyToMany(fetch = FetchType.EAGER)
|
||||
@JoinTable(name = "grants_papers",
|
||||
joinColumns = {@JoinColumn(name = "grant_id")},
|
||||
inverseJoinColumns = {@JoinColumn(name = "paper_id")})
|
||||
@Fetch(FetchMode.SUBSELECT)
|
||||
private List<Paper> papers = new ArrayList<>();
|
||||
|
||||
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "grant_id")
|
||||
private List<Event> events = new ArrayList<>();
|
||||
|
||||
public GrantStatus getStatus() {
|
||||
return status;
|
||||
}
|
||||
@ -132,28 +107,18 @@ public class Grant extends BaseEntity implements UserActivity, EventSource {
|
||||
this.comment = comment;
|
||||
}
|
||||
|
||||
public List<FileData> getFiles() {
|
||||
return files;
|
||||
public FileData getApplication() {
|
||||
return application;
|
||||
}
|
||||
|
||||
public void setFiles(List<FileData> files) {
|
||||
this.files = files;
|
||||
public void setApplication(FileData application) {
|
||||
this.application = application;
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
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 +140,7 @@ public class Grant extends BaseEntity implements UserActivity, EventSource {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<User> getActivityUsers() {
|
||||
public Set<User> getUsers() {
|
||||
return getAuthors();
|
||||
}
|
||||
|
||||
@ -187,22 +152,6 @@ public class Grant extends BaseEntity implements UserActivity, EventSource {
|
||||
this.leader = leader;
|
||||
}
|
||||
|
||||
public List<Paper> getPapers() {
|
||||
return papers;
|
||||
}
|
||||
|
||||
public void setPapers(List<Paper> papers) {
|
||||
this.papers = papers;
|
||||
}
|
||||
|
||||
public List<Event> getEvents() {
|
||||
return events;
|
||||
}
|
||||
|
||||
public void setEvents(List<Event> events) {
|
||||
this.events = events;
|
||||
}
|
||||
|
||||
public Optional<Deadline> getNextDeadline() {
|
||||
return deadlines
|
||||
.stream()
|
||||
|
||||
@ -2,24 +2,20 @@ 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;
|
||||
@ -28,7 +24,7 @@ public class GrantDto extends NameContainer {
|
||||
private Grant.GrantStatus status;
|
||||
private List<Deadline> deadlines = new ArrayList<>();
|
||||
private String comment;
|
||||
private List<FileDataDto> files = new ArrayList<>();
|
||||
private String applicationFileName;
|
||||
private ProjectDto project;
|
||||
private Set<Integer> authorIds;
|
||||
private Set<UserDto> authors;
|
||||
@ -36,11 +32,6 @@ public class GrantDto extends NameContainer {
|
||||
private boolean wasLeader;
|
||||
private boolean hasAge;
|
||||
private boolean hasDegree;
|
||||
private boolean hasBAKPapers;
|
||||
private boolean hasScopusPapers;
|
||||
private List<Integer> paperIds = new ArrayList<>();
|
||||
private List<PaperDto> papers = new ArrayList<>();
|
||||
private List<Integer> removedDeadlineIds = new ArrayList<>();
|
||||
|
||||
public GrantDto() {
|
||||
deadlines.add(new Deadline());
|
||||
@ -52,31 +43,25 @@ public class GrantDto extends NameContainer {
|
||||
@JsonProperty("status") Grant.GrantStatus status,
|
||||
@JsonProperty("deadlines") List<Deadline> deadlines,
|
||||
@JsonProperty("comment") String comment,
|
||||
@JsonProperty("files") List<FileDataDto> files,
|
||||
@JsonProperty("project") ProjectDto project,
|
||||
@JsonProperty("authorIds") Set<Integer> authorIds,
|
||||
@JsonProperty("authors") Set<UserDto> authors,
|
||||
@JsonProperty("leaderId") Integer leaderId,
|
||||
@JsonProperty("leader") Integer leaderId,
|
||||
@JsonProperty("wasLeader") boolean wasLeader,
|
||||
@JsonProperty("hasAge") boolean hasAge,
|
||||
@JsonProperty("hasDegree") boolean hasDegree,
|
||||
@JsonProperty("paperIds") List<Integer> paperIds,
|
||||
@JsonProperty("papers") List<PaperDto> papers) {
|
||||
@JsonProperty("hasDegree") boolean hasDegree) {
|
||||
this.id = id;
|
||||
this.title = title;
|
||||
this.status = status;
|
||||
this.deadlines = deadlines;
|
||||
this.comment = comment;
|
||||
this.files = files;
|
||||
this.applicationFileName = null;
|
||||
this.project = project;
|
||||
this.authorIds = authorIds;
|
||||
this.authors = authors;
|
||||
this.leaderId = leaderId;
|
||||
this.wasLeader = wasLeader;
|
||||
this.hasAge = hasAge;
|
||||
this.hasDegree = hasDegree;
|
||||
this.paperIds = paperIds;
|
||||
this.papers = papers;
|
||||
}
|
||||
|
||||
public GrantDto(Grant grant) {
|
||||
@ -85,22 +70,14 @@ public class GrantDto extends NameContainer {
|
||||
this.status = grant.getStatus();
|
||||
this.deadlines = grant.getDeadlines();
|
||||
this.comment = grant.getComment();
|
||||
this.files = convert(grant.getFiles(), FileDataDto::new);
|
||||
this.project = grant.getProject() == null ? null : new ProjectDto(grant.getProject());
|
||||
this.applicationFileName = grant.getApplication() == null ? null : grant.getApplication().getName();
|
||||
this.authorIds = convert(grant.getAuthors(), user -> user.getId());
|
||||
this.authors = convert(grant.getAuthors(), UserDto::new);
|
||||
this.leaderId = grant.getLeader().getId();
|
||||
this.wasLeader = false;
|
||||
this.hasAge = false;
|
||||
this.hasDegree = false;
|
||||
this.paperIds = convert(grant.getPapers(), paper -> paper.getId());
|
||||
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() {
|
||||
@ -143,14 +120,6 @@ public class GrantDto extends NameContainer {
|
||||
this.comment = comment;
|
||||
}
|
||||
|
||||
public List<FileDataDto> getFiles() {
|
||||
return files;
|
||||
}
|
||||
|
||||
public void setFiles(List<FileDataDto> files) {
|
||||
this.files = files;
|
||||
}
|
||||
|
||||
public ProjectDto getProject() {
|
||||
return project;
|
||||
}
|
||||
@ -159,6 +128,14 @@ public class GrantDto extends NameContainer {
|
||||
this.project = project;
|
||||
}
|
||||
|
||||
public String getApplicationFileName() {
|
||||
return applicationFileName;
|
||||
}
|
||||
|
||||
public void setApplicationFileName(String applicationFileName) {
|
||||
this.applicationFileName = applicationFileName;
|
||||
}
|
||||
|
||||
public Set<Integer> getAuthorIds() {
|
||||
return authorIds;
|
||||
}
|
||||
@ -213,44 +190,4 @@ public class GrantDto extends NameContainer {
|
||||
public void setHasDegree(boolean hasDegree) {
|
||||
this.hasDegree = hasDegree;
|
||||
}
|
||||
|
||||
public List<Integer> getPaperIds() {
|
||||
return paperIds;
|
||||
}
|
||||
|
||||
public void setPaperIds(List<Integer> paperIds) {
|
||||
this.paperIds = paperIds;
|
||||
}
|
||||
|
||||
public List<PaperDto> getPapers() {
|
||||
return papers;
|
||||
}
|
||||
|
||||
public void setPapers(List<PaperDto> papers) {
|
||||
this.papers = papers;
|
||||
}
|
||||
|
||||
public List<Integer> getRemovedDeadlineIds() {
|
||||
return removedDeadlineIds;
|
||||
}
|
||||
|
||||
public void setRemovedDeadlineIds(List<Integer> removedDeadlineIds) {
|
||||
this.removedDeadlineIds = removedDeadlineIds;
|
||||
}
|
||||
|
||||
public boolean isHasBAKPapers() {
|
||||
return hasBAKPapers;
|
||||
}
|
||||
|
||||
public void setHasBAKPapers(boolean hasBAKPapers) {
|
||||
this.hasBAKPapers = hasBAKPapers;
|
||||
}
|
||||
|
||||
public boolean isHasScopusPapers() {
|
||||
return hasScopusPapers;
|
||||
}
|
||||
|
||||
public void setHasScopusPapers(boolean hasScopusPapers) {
|
||||
this.hasScopusPapers = hasScopusPapers;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
}
|
||||
@ -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();
|
||||
}
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
package ru.ulstu.grant.service;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.ulstu.core.util.DateUtils;
|
||||
import ru.ulstu.grant.model.Grant;
|
||||
import ru.ulstu.user.model.User;
|
||||
import ru.ulstu.user.service.MailService;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
@Service
|
||||
public class GrantNotificationService {
|
||||
private final static int DAYS_TO_DEADLINE_NOTIFICATION = 7;
|
||||
private final static String TEMPLATE_DEADLINE = "grantDeadlineNotification";
|
||||
private final static String TEMPLATE_CREATE = "grantCreateNotification";
|
||||
private final static String TEMPLATE_AUTHORS_CHANGED = "grantAuthorsChangeNotification";
|
||||
private final static String TEMPLATE_LEADER_CHANGED = "grantLeaderChangeNotification";
|
||||
|
||||
private final static String TITLE_DEADLINE = "Приближается дедлайн гранта: %s";
|
||||
private final static String TITLE_CREATE = "Создан грант: %s";
|
||||
private final static String TITLE_AUTHORS_CHANGED = "Изменился состав рабочей группы гранта: %s";
|
||||
private final static String TITLE_LEADER_CHANGED = "Изменился руководитель гранта: %s";
|
||||
|
||||
private final MailService mailService;
|
||||
|
||||
public GrantNotificationService(MailService mailService) {
|
||||
this.mailService = mailService;
|
||||
}
|
||||
|
||||
public void sendDeadlineNotifications(List<Grant> grants, boolean isDeadlineBeforeWeek) {
|
||||
Date now = DateUtils.addDays(new Date(), DAYS_TO_DEADLINE_NOTIFICATION);
|
||||
grants.stream()
|
||||
.filter(grant -> needToSendDeadlineNotification(grant, now, isDeadlineBeforeWeek))
|
||||
.forEach(grant -> sendMessageDeadline(grant));
|
||||
}
|
||||
|
||||
private boolean needToSendDeadlineNotification(Grant grant, Date compareDate, boolean isDeadlineBeforeWeek) {
|
||||
return (grant.getNextDeadline().isPresent())
|
||||
&& (compareDate.before(grant.getNextDeadline().get().getDate()) && isDeadlineBeforeWeek
|
||||
|| compareDate.after(grant.getNextDeadline().get().getDate()) && !isDeadlineBeforeWeek)
|
||||
&& grant.getNextDeadline().get().getDate().after(new Date());
|
||||
}
|
||||
|
||||
private void sendMessageDeadline(Grant grant) {
|
||||
Map<String, Object> variables = Map.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);
|
||||
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);
|
||||
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);
|
||||
sendForAllAuthors(variables, grant, TEMPLATE_LEADER_CHANGED, String.format(TITLE_LEADER_CHANGED, grant.getTitle()));
|
||||
}
|
||||
|
||||
private void sendForAllAuthors(Map<String, Object> variables, Grant grant, String template, String title) {
|
||||
Set<User> allAuthors = grant.getAuthors();
|
||||
allAuthors.forEach(author -> mailService.sendEmailFromTemplate(variables, author, template, title));
|
||||
mailService.sendEmailFromTemplate(variables, grant.getLeader(), template, title);
|
||||
}
|
||||
}
|
||||
@ -1,41 +0,0 @@
|
||||
package ru.ulstu.grant.service;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class GrantScheduler {
|
||||
private final static boolean IS_DEADLINE_NOTIFICATION_BEFORE_WEEK = true;
|
||||
|
||||
private final Logger log = LoggerFactory.getLogger(GrantScheduler.class);
|
||||
|
||||
private final GrantNotificationService grantNotificationService;
|
||||
private final GrantService grantService;
|
||||
|
||||
public GrantScheduler(GrantNotificationService grantNotificationService,
|
||||
GrantService grantService) {
|
||||
this.grantNotificationService = grantNotificationService;
|
||||
this.grantService = grantService;
|
||||
}
|
||||
|
||||
|
||||
@Scheduled(cron = "0 0 8 * * MON", zone = "Europe/Samara")
|
||||
public void checkDeadlineBeforeWeek() {
|
||||
log.debug("GrantScheduler.checkDeadlineBeforeWeek started");
|
||||
grantNotificationService.sendDeadlineNotifications(grantService.findAllActive(), 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");
|
||||
}
|
||||
}
|
||||
@ -1,86 +1,50 @@
|
||||
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;
|
||||
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;
|
||||
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;
|
||||
import static ru.ulstu.core.util.StreamApiUtils.convert;
|
||||
import static ru.ulstu.grant.model.Grant.GrantStatus.APPLICATION;
|
||||
|
||||
@Service
|
||||
public class GrantService extends BaseService {
|
||||
private final Logger log = LoggerFactory.getLogger(GrantService.class);
|
||||
public class GrantService {
|
||||
private final static int MAX_DISPLAY_SIZE = 40;
|
||||
|
||||
private final GrantRepository grantRepository;
|
||||
private final ProjectService projectService;
|
||||
private final DeadlineService deadlineService;
|
||||
private final FileService fileService;
|
||||
private final UserService userService;
|
||||
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,
|
||||
DeadlineService deadlineService,
|
||||
ProjectService projectService,
|
||||
UserService userService,
|
||||
PaperService paperService,
|
||||
EventService eventService,
|
||||
GrantNotificationService grantNotificationService,
|
||||
KiasService kiasService,
|
||||
PingService pingService) {
|
||||
UserService userService) {
|
||||
this.grantRepository = grantRepository;
|
||||
this.kiasService = kiasService;
|
||||
this.baseRepository = grantRepository;
|
||||
this.fileService = fileService;
|
||||
this.deadlineService = deadlineService;
|
||||
this.projectService = projectService;
|
||||
this.userService = userService;
|
||||
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 +52,20 @@ 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, "гранта");
|
||||
grantNotificationService.sendCreateNotification(newGrant);
|
||||
return newGrant;
|
||||
return newGrant.getId();
|
||||
}
|
||||
|
||||
private Grant copyFromDto(Grant grant, GrantDto grantDto) throws IOException {
|
||||
@ -108,10 +76,8 @@ 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())));
|
||||
if (grantDto.getApplicationFileName() != null) {
|
||||
grant.setApplication(fileService.createFileFromTmp(grantDto.getApplicationFileName()));
|
||||
}
|
||||
grant.getAuthors().clear();
|
||||
if (grantDto.getAuthorIds() != null && !grantDto.getAuthorIds().isEmpty()) {
|
||||
@ -120,284 +86,74 @@ public class GrantService extends BaseService {
|
||||
if (grantDto.getLeaderId() != null) {
|
||||
grant.setLeader(userService.findById(grantDto.getLeaderId()));
|
||||
}
|
||||
grant.getPapers().clear();
|
||||
if (grantDto.getPaperIds() != null && !grantDto.getPaperIds().isEmpty()) {
|
||||
grantDto.getPaperIds().forEach(paperIds -> grant.getPapers().add(paperService.findPaperById(paperIds)));
|
||||
}
|
||||
return grant;
|
||||
}
|
||||
|
||||
|
||||
public void createProject(GrantDto grantDto) throws IOException {
|
||||
public void createProject(GrantDto grantDto) {
|
||||
grantDto.setProject(
|
||||
new ProjectDto(projectService.save(new ProjectDto(grantDto.getTitle()))));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
private Integer update(GrantDto grantDto) throws IOException {
|
||||
Grant grant = findById(grantDto.getId());
|
||||
Set<User> oldAuthors = new HashSet<>(grant.getAuthors());
|
||||
User oldLeader = grant.getLeader();
|
||||
for (FileDataDto file : grantDto.getFiles().stream()
|
||||
.filter(f -> f.isDeleted() && f.getId() != null)
|
||||
.collect(toList())) {
|
||||
fileService.delete(file.getId());
|
||||
public Integer update(GrantDto grantDto) throws IOException {
|
||||
Grant grant = grantRepository.findOne(grantDto.getId());
|
||||
if (grantDto.getApplicationFileName() != null && grant.getApplication() != null) {
|
||||
fileService.deleteFile(grant.getApplication());
|
||||
}
|
||||
grantDto.getRemovedDeadlineIds().forEach(deadlineService::remove);
|
||||
grantRepository.save(copyFromDto(grant, grantDto));
|
||||
|
||||
grant.getAuthors().forEach(author -> {
|
||||
if (!oldAuthors.contains(author)) {
|
||||
grantNotificationService.sendAuthorsChangeNotification(grant, oldAuthors);
|
||||
}
|
||||
});
|
||||
oldAuthors.forEach(oldAuthor -> {
|
||||
if (!grant.getAuthors().contains(oldAuthor)) {
|
||||
grantNotificationService.sendAuthorsChangeNotification(grant, oldAuthors);
|
||||
}
|
||||
});
|
||||
if (grant.getLeader() != oldLeader) {
|
||||
grantNotificationService.sendLeaderChangeNotification(grant, oldLeader);
|
||||
}
|
||||
eventService.updateGrantDeadlines(grant);
|
||||
return grant.getId();
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public boolean delete(Integer grantId) throws IOException {
|
||||
Grant grant = findById(grantId);
|
||||
if (grant != null) {
|
||||
grantRepository.delete(grant);
|
||||
return true;
|
||||
public void delete(Integer grantId) throws IOException {
|
||||
Grant grant = grantRepository.findOne(grantId);
|
||||
if (grant.getApplication() != null) {
|
||||
fileService.deleteFile(grant.getApplication());
|
||||
}
|
||||
return false;
|
||||
grantRepository.delete(grant);
|
||||
}
|
||||
|
||||
public List<Grant.GrantStatus> getGrantStatuses() {
|
||||
return Arrays.asList(Grant.GrantStatus.values());
|
||||
}
|
||||
|
||||
public boolean save(GrantDto grantDto, Errors errors) throws IOException {
|
||||
grantDto.setName(grantDto.getTitle());
|
||||
filterEmptyDeadlines(grantDto);
|
||||
checkEmptyDeadlines(grantDto, errors);
|
||||
checkEmptyLeader(grantDto, errors);
|
||||
checkUniqueName(grantDto, errors, grantDto.getId(), "Грант с таким именем уже существует");
|
||||
if (errors.hasErrors()) {
|
||||
return false;
|
||||
}
|
||||
@Transactional
|
||||
public Grant create(String title, Project projectId, Date deadlineDate, User user) {
|
||||
Grant grant = new Grant();
|
||||
grant.setTitle(title);
|
||||
grant.setComment("Комментарий к гранту 1");
|
||||
grant.setProject(projectId);
|
||||
grant.setStatus(APPLICATION);
|
||||
grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
|
||||
grant.getAuthors().add(user);
|
||||
grant.setLeader(user);
|
||||
grant = grantRepository.save(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) {
|
||||
List<User> filteredUsers = userService.filterByAgeAndDegree(grantDto.isHasAge(), grantDto.isHasDegree());
|
||||
if (grantDto.isWasLeader()) {
|
||||
filteredUsers = checkContains(filteredUsers, getCompletedGrantLeaders());
|
||||
}
|
||||
if (grantDto.isHasBAKPapers()) {
|
||||
filteredUsers = checkContains(filteredUsers, getBAKAuthors());
|
||||
}
|
||||
if (grantDto.isHasScopusPapers()) {
|
||||
filteredUsers = checkContains(filteredUsers, getScopusAuthors());
|
||||
filteredUsers = filteredUsers
|
||||
.stream()
|
||||
.filter(getCompletedGrantLeaders()::contains)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
return filteredUsers;
|
||||
}
|
||||
|
||||
private List<User> checkContains(List<User> filteredUsers, List<User> checkUsers) {
|
||||
return filteredUsers.stream()
|
||||
.filter(checkUsers::contains)
|
||||
.collect(toList());
|
||||
}
|
||||
|
||||
private List<User> getCompletedGrantLeaders() {
|
||||
return grantRepository.findByStatus(Grant.GrantStatus.COMPLETED)
|
||||
.stream()
|
||||
.map(Grant::getLeader)
|
||||
.collect(toList());
|
||||
}
|
||||
|
||||
public List<PaperDto> getGrantPapers(List<Integer> paperIds) {
|
||||
return paperService.findAllSelect(paperIds);
|
||||
}
|
||||
|
||||
public List<PaperDto> getAllUncompletedPapers() {
|
||||
return paperService.findAllNotCompleted();
|
||||
}
|
||||
|
||||
public List<PaperDto> attachPaper(GrantDto grantDto) {
|
||||
if (!grantDto.getPaperIds().isEmpty()) {
|
||||
grantDto.getPapers().clear();
|
||||
grantDto.setPapers(getGrantPapers(grantDto.getPaperIds()));
|
||||
} else {
|
||||
grantDto.getPapers().clear();
|
||||
}
|
||||
return grantDto.getPapers();
|
||||
}
|
||||
|
||||
public GrantDto removeDeadline(GrantDto grantDto, Integer deadlineId) {
|
||||
if (grantDto.getDeadlines().get(deadlineId).getId() != null) {
|
||||
grantDto.getRemovedDeadlineIds().add(grantDto.getDeadlines().get(deadlineId).getId());
|
||||
}
|
||||
grantDto.getDeadlines().remove((int) deadlineId);
|
||||
return grantDto;
|
||||
}
|
||||
|
||||
private List<User> getCompletedPapersAuthors(Paper.PaperType type) {
|
||||
List<Paper> papers = paperService.findAllCompletedByType(type);
|
||||
return papers.stream()
|
||||
.filter(paper -> paper.getAuthors() != null)
|
||||
.flatMap(paper -> paper.getAuthors().stream())
|
||||
.collect(toList());
|
||||
}
|
||||
|
||||
private List<User> getBAKAuthors() {
|
||||
return getCompletedPapersAuthors(Paper.PaperType.VAK)
|
||||
.stream()
|
||||
.distinct()
|
||||
.collect(toList());
|
||||
}
|
||||
|
||||
private List<User> getScopusAuthors() {
|
||||
List<User> authors = getCompletedPapersAuthors(Paper.PaperType.SCOPUS);
|
||||
return authors
|
||||
.stream()
|
||||
.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);
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -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);
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
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);
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
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) {
|
||||
if (nameContainer.getName().equals(getUnique(baseRepository.findByNameAndNotId(nameContainer.getName(), id)))) {
|
||||
errors.rejectValue("title", "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);
|
||||
}
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package ru.ulstu.name;
|
||||
|
||||
public abstract class NameContainer {
|
||||
|
||||
private String name = "";
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
@ -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 final Class<E> elementDtoClass;
|
||||
private Class<L> listDtoClass;
|
||||
private Class<E> elementDtoClass;
|
||||
@Autowired
|
||||
private OdinService<L, E> odinService;
|
||||
|
||||
|
||||
@ -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()));
|
||||
}
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
package ru.ulstu.odin.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import org.hibernate.validator.constraints.NotBlank;
|
||||
import org.hibernate.validator.constraints.NotEmpty;
|
||||
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;
|
||||
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) {
|
||||
public 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);
|
||||
}
|
||||
|
||||
@ -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()));
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
package ru.ulstu.odin.model;
|
||||
|
||||
import jakarta.validation.constraints.Email;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import org.hibernate.validator.constraints.Email;
|
||||
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;
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
package ru.ulstu.odinexample.controller;
|
||||
|
||||
public class OdinExampleController {
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
package ru.ulstu.odinexample.model;
|
||||
|
||||
public class OdinExampleDto {
|
||||
}
|
||||
103
src/main/java/ru/ulstu/odinexample/model/OdinExampleListDto.java
Normal file
103
src/main/java/ru/ulstu/odinexample/model/OdinExampleListDto.java
Normal file
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
package ru.ulstu.odinexample.service;
|
||||
|
||||
public class OdinExampleService {
|
||||
}
|
||||
@ -1,65 +1,60 @@
|
||||
package ru.ulstu.paper.controller;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Hidden;
|
||||
import jakarta.validation.Valid;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
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;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
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 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.model.PaperFilterDto;
|
||||
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;
|
||||
private final LatexService latexService;
|
||||
|
||||
public PaperController(PaperService paperService,
|
||||
ConferenceService conferenceService,
|
||||
LatexService latexService) {
|
||||
public PaperController(PaperService paperService, LatexService latexService) {
|
||||
this.paperService = paperService;
|
||||
this.conferenceService = conferenceService;
|
||||
this.latexService = latexService;
|
||||
}
|
||||
|
||||
@GetMapping("/papers")
|
||||
public void getPapers(ModelMap modelMap) {
|
||||
modelMap.put("filteredPapers", new PaperListDto(paperService.findAllDto(), null, null));
|
||||
modelMap.put("filteredPapers", new PaperFilterDto(paperService.findAllDto(), null, null));
|
||||
}
|
||||
|
||||
@PostMapping("/papers")
|
||||
public void listPapers(@Valid PaperListDto paperListDto, ModelMap modelMap) {
|
||||
if (paperListDto.getPaperDeleteId() != null) {
|
||||
if (conferenceService.isAttachedToConference(paperListDto.getPaperDeleteId())) {
|
||||
modelMap.put("flashMessage", "Статью нельзя удалить, она прикреплена к конференции");
|
||||
} else {
|
||||
paperService.delete(paperListDto.getPaperDeleteId());
|
||||
}
|
||||
}
|
||||
modelMap.put("filteredPapers", new PaperListDto(paperService.filter(paperListDto),
|
||||
paperListDto.getFilterAuthorId(),
|
||||
paperListDto.getYear()));
|
||||
public void filterPapers(@Valid PaperFilterDto paperFilterDto, ModelMap modelMap) {
|
||||
modelMap.put("filteredPapers", new PaperFilterDto(paperService.filter(paperFilterDto),
|
||||
paperFilterDto.getFilterAuthorId(),
|
||||
paperFilterDto.getYear()));
|
||||
}
|
||||
|
||||
@GetMapping("/dashboard")
|
||||
@ -68,7 +63,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 {
|
||||
@ -99,16 +94,17 @@ public class PaperController {
|
||||
return "/papers/paper";
|
||||
}
|
||||
|
||||
@GetMapping("/delete/{paper-id}")
|
||||
public String delete(@PathVariable("paper-id") Integer paperId) throws IOException {
|
||||
paperService.delete(paperId);
|
||||
return "redirect:/papers/papers";
|
||||
}
|
||||
|
||||
@ModelAttribute("allStatuses")
|
||||
public List<Paper.PaperStatus> getPaperStatuses() {
|
||||
return paperService.getPaperStatuses();
|
||||
}
|
||||
|
||||
@ModelAttribute("allTypes")
|
||||
public List<Paper.PaperType> getPaperTypes() {
|
||||
return paperService.getPaperTypes();
|
||||
}
|
||||
|
||||
@ModelAttribute("allAuthors")
|
||||
public List<User> getAllAuthors() {
|
||||
return paperService.getPaperAuthors();
|
||||
@ -123,14 +119,17 @@ public class PaperController {
|
||||
return years;
|
||||
}
|
||||
|
||||
@ModelAttribute("autocompleteData")
|
||||
public AutoCompleteData getAutocompleteData() {
|
||||
return paperService.getAutoCompleteData();
|
||||
@PostMapping("/generatePdf")
|
||||
public ResponseEntity<byte[]> getPdfFile(PaperDto paper) throws IOException, InterruptedException {
|
||||
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()));
|
||||
}
|
||||
}
|
||||
|
||||
@ -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,15 +7,14 @@ 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;
|
||||
import ru.ulstu.paper.model.PaperDto;
|
||||
import ru.ulstu.paper.model.PaperListDto;
|
||||
import ru.ulstu.paper.model.ReferenceDto;
|
||||
import ru.ulstu.paper.model.PaperFilterDto;
|
||||
import ru.ulstu.paper.service.PaperService;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
@ -40,7 +38,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,26 +54,16 @@ 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")
|
||||
public Response<List<PaperDto>> filter(@RequestBody @Valid PaperListDto paperListDto) throws IOException {
|
||||
return new Response<>(paperService.filter(paperListDto));
|
||||
public Response<List<PaperDto>> filter(@RequestBody @Valid PaperFilterDto paperFilterDto) throws IOException {
|
||||
return new Response<>(paperService.filter(paperFilterDto));
|
||||
}
|
||||
|
||||
@GetMapping("formatted-list")
|
||||
public Response<List<String>> getFormattedPaperList() {
|
||||
return new Response<>(paperService.getFormattedPaperList());
|
||||
}
|
||||
|
||||
@PostMapping("/getFormattedReference")
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
@ -1,87 +1,56 @@
|
||||
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 ru.ulstu.conference.model.Conference;
|
||||
import org.hibernate.validator.constraints.NotBlank;
|
||||
import ru.ulstu.core.model.BaseEntity;
|
||||
import ru.ulstu.core.model.EventSource;
|
||||
import ru.ulstu.core.model.UserActivity;
|
||||
import ru.ulstu.core.model.UserContainer;
|
||||
import ru.ulstu.deadline.model.Deadline;
|
||||
import ru.ulstu.file.model.FileData;
|
||||
import ru.ulstu.grant.model.Grant;
|
||||
import ru.ulstu.timeline.model.Event;
|
||||
import ru.ulstu.user.model.User;
|
||||
|
||||
import javax.persistence.CascadeType;
|
||||
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;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
|
||||
@Entity
|
||||
@DiscriminatorValue("PAPER")
|
||||
public class Paper extends BaseEntity implements UserActivity, EventSource {
|
||||
public class Paper extends BaseEntity implements UserContainer {
|
||||
public enum PaperStatus {
|
||||
ATTENTION("Обратить внимание", "text-warning"),
|
||||
ON_PREPARATION("На подготовке", "text-primary"),
|
||||
ON_REVIEW("Отправлена на проверку", "text-review"),
|
||||
ACCEPTED("Принята", "text-accepted"),
|
||||
NOT_ACCEPTED("Не принята", "text-not-accepted"),
|
||||
COMPLETED("Завершена (опубликована)", "text-success"),
|
||||
DRAFT("Черновик", "text-draft"),
|
||||
FAILED("Провалены сроки", "text-failed");
|
||||
ATTENTION("Обратить внимание"),
|
||||
ON_PREPARATION("На подготовке"),
|
||||
ON_REVIEW("Отправлена на проверку"),
|
||||
ACCEPTED("Принята"),
|
||||
NOT_ACCEPTED("Не принята"),
|
||||
COMPLETED("Завершена (опубликована)"),
|
||||
DRAFT("Черновик"),
|
||||
FAILED("Провалены сроки");
|
||||
|
||||
private final String statusName;
|
||||
private final String elementClass;
|
||||
private String statusName;
|
||||
|
||||
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 {
|
||||
OTHER("Прочая публикация"),
|
||||
VAK("ВАК"),
|
||||
SCOPUS("Scopus"),
|
||||
WEB_OF_SCIENCE("Web Of Science");
|
||||
|
||||
private final String typeName;
|
||||
|
||||
PaperType(String name) {
|
||||
this.typeName = name;
|
||||
}
|
||||
|
||||
public String getTypeName() {
|
||||
return typeName;
|
||||
}
|
||||
}
|
||||
|
||||
@NotBlank
|
||||
@ -90,20 +59,15 @@ public class Paper extends BaseEntity implements UserActivity, EventSource {
|
||||
@Enumerated(value = EnumType.STRING)
|
||||
private PaperStatus status = PaperStatus.DRAFT;
|
||||
|
||||
@Enumerated(value = EnumType.STRING)
|
||||
private PaperType type = PaperType.OTHER;
|
||||
|
||||
@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,17 +90,9 @@ public class Paper extends BaseEntity implements UserActivity, EventSource {
|
||||
|
||||
@ManyToMany(fetch = FetchType.EAGER)
|
||||
private Set<User> authors = new HashSet<>();
|
||||
@ManyToOne()
|
||||
@JoinColumn(name = "conference_id")
|
||||
private Conference conference;
|
||||
|
||||
@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<>();
|
||||
@Column(name = "latex_text")
|
||||
private String latexText;
|
||||
|
||||
public PaperStatus getStatus() {
|
||||
return status;
|
||||
@ -146,14 +102,6 @@ public class Paper extends BaseEntity implements UserActivity, EventSource {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public PaperType getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(PaperType type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public Date getCreateDate() {
|
||||
return createDate;
|
||||
}
|
||||
@ -206,16 +154,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,35 +182,19 @@ public class Paper extends BaseEntity implements UserActivity, EventSource {
|
||||
this.url = url;
|
||||
}
|
||||
|
||||
public Conference getConference() {
|
||||
return conference;
|
||||
public String getLatexText() {
|
||||
return latexText;
|
||||
}
|
||||
|
||||
public void setConference(Conference conference) {
|
||||
this.conference = conference;
|
||||
}
|
||||
|
||||
public List<Grant> getGrants() {
|
||||
return grants;
|
||||
}
|
||||
|
||||
public void setGrants(List<Grant> grants) {
|
||||
this.grants = grants;
|
||||
public void setLatexText(String latexText) {
|
||||
this.latexText = latexText;
|
||||
}
|
||||
|
||||
@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()
|
||||
@ -290,35 +212,4 @@ public class Paper extends BaseEntity implements UserActivity, EventSource {
|
||||
.findAny()
|
||||
.isPresent();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) {
|
||||
return true;
|
||||
}
|
||||
if (o == null || getClass() != o.getClass()) {
|
||||
return false;
|
||||
}
|
||||
if (!super.equals(o)) {
|
||||
return false;
|
||||
}
|
||||
Paper paper = (Paper) o;
|
||||
return Objects.equals(title, paper.title) &&
|
||||
status == paper.status &&
|
||||
type == paper.type &&
|
||||
Objects.equals(deadlines, paper.deadlines) &&
|
||||
Objects.equals(comment, paper.comment) &&
|
||||
Objects.equals(url, paper.url) &&
|
||||
Objects.equals(locked, paper.locked) &&
|
||||
Objects.equals(events, paper.events) &&
|
||||
Objects.equals(files, paper.files) &&
|
||||
Objects.equals(authors, paper.authors) &&
|
||||
Objects.equals(conference, paper.conference) &&
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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 ru.ulstu.core.model.BaseEntity;
|
||||
import org.hibernate.validator.constraints.NotEmpty;
|
||||
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;
|
||||
@ -27,10 +25,7 @@ public class PaperDto {
|
||||
@Size(min = 3, max = 254)
|
||||
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 +37,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());
|
||||
@ -53,7 +46,6 @@ public class PaperDto {
|
||||
public PaperDto(@JsonProperty("id") Integer id,
|
||||
@JsonProperty("title") String title,
|
||||
@JsonProperty("status") Paper.PaperStatus status,
|
||||
@JsonProperty("type") Paper.PaperType type,
|
||||
@JsonProperty("createDate") Date createDate,
|
||||
@JsonProperty("updateDate") Date updateDate,
|
||||
@JsonProperty("deadlines") List<Deadline> deadlines,
|
||||
@ -63,13 +55,10 @@ public class PaperDto {
|
||||
@JsonProperty("locked") Boolean locked,
|
||||
@JsonProperty("files") List<FileDataDto> files,
|
||||
@JsonProperty("authorIds") Set<Integer> authorIds,
|
||||
@JsonProperty("authors") Set<UserDto> authors,
|
||||
@JsonProperty("references") List<ReferenceDto> references,
|
||||
@JsonProperty("formatStandard") ReferenceDto.FormatStandard formatStandard) {
|
||||
@JsonProperty("authors") Set<UserDto> authors) {
|
||||
this.id = id;
|
||||
this.title = title;
|
||||
this.status = status;
|
||||
this.type = type;
|
||||
this.createDate = createDate;
|
||||
this.updateDate = updateDate;
|
||||
this.deadlines = deadlines;
|
||||
@ -79,25 +68,22 @@ public class PaperDto {
|
||||
this.locked = locked;
|
||||
this.files = files;
|
||||
this.authors = authors;
|
||||
this.references = references;
|
||||
this.formatStandard = formatStandard;
|
||||
}
|
||||
|
||||
public PaperDto(Paper paper) {
|
||||
this.id = paper.getId();
|
||||
this.title = paper.getTitle();
|
||||
this.status = paper.getStatus();
|
||||
this.type = paper.getType();
|
||||
this.createDate = paper.getCreateDate();
|
||||
this.updateDate = paper.getUpdateDate();
|
||||
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() {
|
||||
@ -124,14 +110,6 @@ public class PaperDto {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public Paper.PaperType getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(Paper.PaperType type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public Date getCreateDate() {
|
||||
return createDate;
|
||||
}
|
||||
@ -215,7 +193,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 +204,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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,16 +2,15 @@ package ru.ulstu.paper.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class PaperListDto {
|
||||
public class PaperFilterDto {
|
||||
private List<PaperDto> papers;
|
||||
private Integer filterAuthorId;
|
||||
private Integer paperDeleteId;
|
||||
private Integer year;
|
||||
|
||||
public PaperListDto() {
|
||||
public PaperFilterDto() {
|
||||
}
|
||||
|
||||
public PaperListDto(List<PaperDto> paperDtos, Integer filterAuthorId, Integer year) {
|
||||
public PaperFilterDto(List<PaperDto> paperDtos, Integer filterAuthorId, Integer year) {
|
||||
this.papers = paperDtos;
|
||||
this.filterAuthorId = filterAuthorId;
|
||||
this.year = year;
|
||||
@ -40,12 +39,4 @@ public class PaperListDto {
|
||||
public void setYear(Integer year) {
|
||||
this.year = year;
|
||||
}
|
||||
|
||||
public Integer getPaperDeleteId() {
|
||||
return paperDeleteId;
|
||||
}
|
||||
|
||||
public void setPaperDeleteId(Integer paperDeleteId) {
|
||||
this.paperDeleteId = paperDeleteId;
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,166 +0,0 @@
|
||||
package ru.ulstu.paper.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
public class ReferenceDto {
|
||||
public enum ReferenceType {
|
||||
ARTICLE("Статья"),
|
||||
BOOK("Книга");
|
||||
|
||||
private final String typeName;
|
||||
|
||||
ReferenceType(String name) {
|
||||
this.typeName = name;
|
||||
}
|
||||
|
||||
public String getTypeName() {
|
||||
return typeName;
|
||||
}
|
||||
}
|
||||
|
||||
public enum FormatStandard {
|
||||
GOST("ГОСТ"),
|
||||
SPRINGER("Springer");
|
||||
|
||||
private final String standardName;
|
||||
|
||||
FormatStandard(String name) {
|
||||
this.standardName = name;
|
||||
}
|
||||
|
||||
public String getStandardName() {
|
||||
return standardName;
|
||||
}
|
||||
}
|
||||
|
||||
private Integer id;
|
||||
private String authors;
|
||||
private String publicationTitle;
|
||||
private Integer publicationYear;
|
||||
private String publisher;
|
||||
private String pages;
|
||||
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,
|
||||
@JsonProperty("publisher") String publisher,
|
||||
@JsonProperty("pages") String pages,
|
||||
@JsonProperty("journalOrCollectionTitle") String journalOrCollectionTitle,
|
||||
@JsonProperty("referenceType") ReferenceType referenceType,
|
||||
@JsonProperty("formatStandard") FormatStandard formatStandard,
|
||||
@JsonProperty("isDeleted") boolean deleted) {
|
||||
this.id = id;
|
||||
this.authors = authors;
|
||||
this.publicationTitle = publicationTitle;
|
||||
this.publicationYear = publicationYear;
|
||||
this.publisher = publisher;
|
||||
this.pages = pages;
|
||||
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() {
|
||||
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 ReferenceType getReferenceType() {
|
||||
return referenceType;
|
||||
}
|
||||
|
||||
public void setReferenceType(ReferenceType referenceType) {
|
||||
this.referenceType = referenceType;
|
||||
}
|
||||
|
||||
public FormatStandard getFormatStandard() {
|
||||
return formatStandard;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
@ -14,14 +14,4 @@ public interface PaperRepository extends JpaRepository<Paper, Integer> {
|
||||
List<Paper> filter(@Param("author") User author, @Param("year") Integer year);
|
||||
|
||||
List<Paper> findByIdNotIn(List<Integer> paperIds);
|
||||
|
||||
List<Paper> findAllByIdIn(List<Integer> paperIds);
|
||||
|
||||
List<Paper> findByTypeAndStatus(Paper.PaperType type, Paper.PaperStatus status);
|
||||
|
||||
List<Paper> findByStatusNot(Paper.PaperStatus status);
|
||||
|
||||
List<Paper> findByConferenceIsNullAndStatusNot(Paper.PaperStatus status);
|
||||
|
||||
List<Paper> findByIdNotInAndConferenceIsNullAndStatusNot(List<Integer> paperIds, Paper.PaperStatus status);
|
||||
}
|
||||
|
||||
@ -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();
|
||||
}
|
||||
@ -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 static final String BIBTEX_ERROR = "Errors occurred while executing bibtex.";
|
||||
private final String pdfLatexError = "Errors occurred while executing pdfLaTeX.";
|
||||
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 (line != null) {
|
||||
line = bufferedReader.readLine();
|
||||
while ((bufferedReader.readLine()) != null) {
|
||||
//
|
||||
}
|
||||
}
|
||||
|
||||
@ -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[]{"bibtex", filename}, dir, BIBTEX_ERROR);
|
||||
if (startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, PDF_LATEX_ERROR) != 0) {
|
||||
startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, pdfLatexError);
|
||||
startProcess(new String[]{"bibtex", filename}, dir, bibtexError);
|
||||
if (startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, pdfLatexError) != 0) {
|
||||
return false;
|
||||
}
|
||||
return checkPdf(filename, dir);
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -7,22 +7,15 @@ 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.model.PaperFilterDto;
|
||||
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;
|
||||
@ -38,13 +31,8 @@ import static ru.ulstu.paper.model.Paper.PaperStatus.COMPLETED;
|
||||
import static ru.ulstu.paper.model.Paper.PaperStatus.DRAFT;
|
||||
import static ru.ulstu.paper.model.Paper.PaperStatus.FAILED;
|
||||
import static ru.ulstu.paper.model.Paper.PaperStatus.ON_PREPARATION;
|
||||
import static ru.ulstu.paper.model.Paper.PaperType.OTHER;
|
||||
import static ru.ulstu.paper.model.ReferenceDto.FormatStandard.GOST;
|
||||
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 +43,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,
|
||||
PingService pingService) {
|
||||
EventService eventService) {
|
||||
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 +63,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,46 +75,33 @@ 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();
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Paper create(Paper paper) {
|
||||
Paper newPaper = paperRepository.save(paper);
|
||||
newPaper.setCreateDate(new Date());
|
||||
newPaper = paperRepository.save(newPaper);
|
||||
paperNotificationService.sendCreateNotification(newPaper);
|
||||
return newPaper;
|
||||
eventService.createFromPaper(newPaper);
|
||||
return newPaper.getId();
|
||||
}
|
||||
|
||||
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());
|
||||
paper.setType(paperDto.getType() == null ? OTHER : paperDto.getType());
|
||||
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 +112,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 +124,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,47 +139,16 @@ 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() {
|
||||
return Arrays.asList(Paper.PaperStatus.values());
|
||||
}
|
||||
|
||||
public List<Paper.PaperType> getPaperTypes() {
|
||||
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();
|
||||
@ -258,7 +158,6 @@ public class PaperService {
|
||||
paper.setCreateDate(new Date());
|
||||
paper.setUpdateDate(new Date());
|
||||
paper.setStatus(DRAFT);
|
||||
paper.setType(OTHER);
|
||||
paper = paperRepository.save(paper);
|
||||
|
||||
paperNotificationService.sendCreateNotification(paper);
|
||||
@ -267,7 +166,7 @@ public class PaperService {
|
||||
return paper;
|
||||
}
|
||||
|
||||
public List<PaperDto> filter(PaperListDto filterDto) {
|
||||
public List<PaperDto> filter(PaperFilterDto filterDto) {
|
||||
return convert(sortPapers(paperRepository.filter(
|
||||
filterDto.getFilterAuthorId() == null ? null : userService.findById(filterDto.getFilterAuthorId()),
|
||||
filterDto.getYear())), PaperDto::new);
|
||||
@ -313,36 +212,21 @@ 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);
|
||||
public Paper findEntityById(Integer paperId) {
|
||||
return paperRepository.findOne(paperId);
|
||||
}
|
||||
|
||||
public List<Paper> findAllNotSelect(List<Integer> paperIds) {
|
||||
if (!paperIds.isEmpty()) {
|
||||
return sortPapers(paperRepository.findByIdNotInAndConferenceIsNullAndStatusNot(paperIds, COMPLETED));
|
||||
return sortPapers(paperRepository.findByIdNotIn(paperIds));
|
||||
} else {
|
||||
return sortPapers(paperRepository.findByConferenceIsNullAndStatusNot(COMPLETED));
|
||||
return sortPapers(paperRepository.findAll());
|
||||
}
|
||||
}
|
||||
|
||||
public List<PaperDto> findAllNotCompleted() {
|
||||
return convert(paperRepository.findByStatusNot(COMPLETED), PaperDto::new);
|
||||
}
|
||||
|
||||
public List<PaperDto> findAllSelect(List<Integer> paperIds) {
|
||||
return convert(paperRepository.findAllByIdIn(paperIds), PaperDto::new);
|
||||
}
|
||||
|
||||
public List<User> getPaperAuthors() {
|
||||
@ -369,77 +253,4 @@ public class PaperService {
|
||||
.map(User::getUserAbbreviate)
|
||||
.collect(Collectors.joining(", "));
|
||||
}
|
||||
|
||||
public String getFormattedReference(ReferenceDto referenceDto) {
|
||||
return referenceDto.getFormatStandard() == GOST
|
||||
? getGostReference(referenceDto)
|
||||
: getSpringerReference(referenceDto);
|
||||
}
|
||||
|
||||
public String getFormattedReferences(PaperDto paperDto) {
|
||||
return String.join("\r\n", paperDto.getReferences()
|
||||
.stream()
|
||||
.filter(r -> !r.getDeleted())
|
||||
.map(r -> {
|
||||
r.setFormatStandard(paperDto.getFormatStandard());
|
||||
return getFormattedReference(r);
|
||||
})
|
||||
.collect(Collectors.toList()));
|
||||
}
|
||||
|
||||
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.getPages(),
|
||||
StringUtils.isEmpty(referenceDto.getJournalOrCollectionTitle()) ? "." : " // " + referenceDto.getJournalOrCollectionTitle() + ".");
|
||||
}
|
||||
|
||||
private String getSpringerReference(ReferenceDto referenceDto) {
|
||||
return MessageFormat.format("{0} ({1}) {2}.{3} {4}pp {5}",
|
||||
referenceDto.getAuthors(),
|
||||
referenceDto.getPublicationYear() != null ? referenceDto.getPublicationYear().toString() : "",
|
||||
referenceDto.getPublicationTitle(),
|
||||
referenceDto.getReferenceType() == ARTICLE ? " " + referenceDto.getJournalOrCollectionTitle() + "," : "",
|
||||
StringUtils.isEmpty(referenceDto.getPublisher()) ? "" : referenceDto.getPublisher() + ", ",
|
||||
referenceDto.getPages());
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
package ru.ulstu.ping.model;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
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 java.util.Date;
|
||||
|
||||
@Entity
|
||||
@Table(name = "ping")
|
||||
public class Ping extends BaseEntity {
|
||||
@Temporal(value = TemporalType.TIMESTAMP)
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date date;
|
||||
|
||||
@ManyToOne(optional = false)
|
||||
@JoinColumn(name = "users_id")
|
||||
private User user;
|
||||
|
||||
@Column(name = "activity_type", insertable = false, updatable = false)
|
||||
private String activityType;
|
||||
|
||||
@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() {
|
||||
}
|
||||
|
||||
public Ping(Date date, User user) {
|
||||
this.date = date;
|
||||
this.user = user;
|
||||
}
|
||||
|
||||
public Date getDate() {
|
||||
return date;
|
||||
}
|
||||
|
||||
public void setDate(Date date) {
|
||||
this.date = date;
|
||||
}
|
||||
|
||||
public User getUser() {
|
||||
return user;
|
||||
}
|
||||
|
||||
public void setUser(User user) {
|
||||
this.user = user;
|
||||
}
|
||||
|
||||
public UserActivity getActivity() {
|
||||
return this.activity;
|
||||
}
|
||||
|
||||
public void setActivity(UserActivity activity) {
|
||||
this.activity = activity;
|
||||
}
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
package ru.ulstu.ping.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import ru.ulstu.conference.model.Conference;
|
||||
import ru.ulstu.ping.model.Ping;
|
||||
|
||||
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)")
|
||||
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);
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
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;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class PingService {
|
||||
private final PingRepository pingRepository;
|
||||
private final UserService userService;
|
||||
|
||||
public PingService(PingRepository pingRepository,
|
||||
UserService userService,
|
||||
PingScheduler pingScheduler) {
|
||||
this.pingRepository = pingRepository;
|
||||
this.userService = userService;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Ping addPing(UserActivity activity) throws IOException {
|
||||
Ping newPing = new Ping(new Date(), userService.getCurrentUser());
|
||||
//newPing.setActivity(activity);
|
||||
return pingRepository.save(newPing);
|
||||
}
|
||||
|
||||
public Integer countPingYesterday(Conference conference, Calendar calendar) {
|
||||
return Math.toIntExact(pingRepository.countByConferenceAndDate(conference, calendar.get(Calendar.DAY_OF_MONTH),
|
||||
calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.YEAR)));
|
||||
}
|
||||
|
||||
public List<Ping> getPings(String activity) {
|
||||
return pingRepository.getPings(activity);
|
||||
}
|
||||
}
|
||||
@ -1,33 +1,21 @@
|
||||
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;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
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 java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static org.springframework.util.StringUtils.isEmpty;
|
||||
|
||||
@Controller()
|
||||
@RequestMapping(value = "/projects")
|
||||
@Hidden
|
||||
@ApiIgnore
|
||||
public class ProjectController {
|
||||
private final ProjectService projectService;
|
||||
|
||||
@ -48,8 +36,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());
|
||||
@ -60,68 +46,4 @@ public class ProjectController {
|
||||
public List<Project.ProjectStatus> getProjectStatuses() {
|
||||
return projectService.getProjectStatuses();
|
||||
}
|
||||
|
||||
@PostMapping(value = "/project", params = "save")
|
||||
public String save(@Valid ProjectDto projectDto, Errors errors) throws IOException {
|
||||
filterEmptyDeadlines(projectDto);
|
||||
if (projectDto.getDeadlines().isEmpty()) {
|
||||
errors.rejectValue("deadlines", "errorCode", "Не может быть пустым");
|
||||
}
|
||||
if (errors.hasErrors()) {
|
||||
return "/projects/project";
|
||||
}
|
||||
projectService.save(projectDto);
|
||||
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);
|
||||
if (errors.hasErrors()) {
|
||||
return "/projects/project";
|
||||
}
|
||||
projectDto.getDeadlines().add(new Deadline());
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,48 +1,32 @@
|
||||
package ru.ulstu.project.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.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.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 implements UserActivity, EventSource {
|
||||
|
||||
public class Project extends BaseEntity {
|
||||
public enum ProjectStatus {
|
||||
TECHNICAL_TASK("Техническое задание"),
|
||||
OPEN("Открыт"),
|
||||
APPLICATION("Заявка"),
|
||||
ON_COMPETITION("Отправлен на конкурс"),
|
||||
SUCCESSFUL_PASSAGE("Успешное прохождение"),
|
||||
IN_WORK("В работе"),
|
||||
CERTIFICATE_ISSUED("Оформление свидетельства"),
|
||||
CLOSED("Закрыт"),
|
||||
COMPLETED("Завершен"),
|
||||
FAILED("Провалены сроки");
|
||||
|
||||
private final String statusName;
|
||||
private String statusName;
|
||||
|
||||
ProjectStatus(String statusName) {
|
||||
this.statusName = statusName;
|
||||
@ -57,7 +41,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 +57,10 @@ public class Project extends BaseEntity implements UserActivity, EventSource {
|
||||
@NotNull
|
||||
private String repository;
|
||||
|
||||
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
|
||||
@JoinColumn(name = "project_id", unique = true)
|
||||
@Fetch(FetchMode.SUBSELECT)
|
||||
private List<FileData> files = new ArrayList<>();
|
||||
|
||||
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "project_id")
|
||||
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;
|
||||
}
|
||||
@ -149,45 +104,4 @@ public class Project extends BaseEntity implements UserActivity, EventSource {
|
||||
public void setDeadlines(List<Deadline> deadlines) {
|
||||
this.deadlines = deadlines;
|
||||
}
|
||||
|
||||
public List<FileData> getFiles() {
|
||||
return files;
|
||||
}
|
||||
|
||||
public void setFiles(List<FileData> files) {
|
||||
this.files = files;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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.thymeleaf.util.StringUtils;
|
||||
import org.hibernate.validator.constraints.NotEmpty;
|
||||
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,6 @@ public class ProjectDto {
|
||||
private List<Deadline> deadlines = new ArrayList<>();
|
||||
private GrantDto grant;
|
||||
private String repository;
|
||||
private List<FileDataDto> files = new ArrayList<>();
|
||||
private List<Integer> removedDeadlineIds = new ArrayList<>();
|
||||
private Set<Integer> executorIds;
|
||||
private List<UserDto> executors;
|
||||
private List<Integer> grantIds;
|
||||
private List<GrantDto> grants;
|
||||
|
||||
private final static int MAX_EXECUTORS_LENGTH = 40;
|
||||
|
||||
public ProjectDto() {
|
||||
}
|
||||
@ -51,12 +34,7 @@ public class ProjectDto {
|
||||
@JsonProperty("description") String description,
|
||||
@JsonProperty("grant") GrantDto grant,
|
||||
@JsonProperty("repository") String repository,
|
||||
@JsonProperty("files") List<FileDataDto> files,
|
||||
@JsonProperty("deadlines") List<Deadline> deadlines,
|
||||
@JsonProperty("executorIds") Set<Integer> executorIds,
|
||||
@JsonProperty("executors") List<UserDto> executors,
|
||||
@JsonProperty("grantIds") List<Integer> grantIds,
|
||||
@JsonProperty("grants") List<GrantDto> grants) {
|
||||
@JsonProperty("deadlines") List<Deadline> deadlines) {
|
||||
this.id = id;
|
||||
this.title = title;
|
||||
this.status = status;
|
||||
@ -64,28 +42,17 @@ public class ProjectDto {
|
||||
this.grant = grant;
|
||||
this.repository = repository;
|
||||
this.deadlines = deadlines;
|
||||
this.files = files;
|
||||
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.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() {
|
||||
@ -143,59 +110,4 @@ public class ProjectDto {
|
||||
public void setDeadlines(List<Deadline> deadlines) {
|
||||
this.deadlines = deadlines;
|
||||
}
|
||||
|
||||
public List<FileDataDto> getFiles() {
|
||||
return files;
|
||||
}
|
||||
|
||||
public void setFiles(List<FileDataDto> files) {
|
||||
this.files = files;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,27 +4,15 @@ 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;
|
||||
|
||||
@Service
|
||||
public class ProjectService {
|
||||
@ -32,26 +20,11 @@ public class ProjectService {
|
||||
|
||||
private final ProjectRepository projectRepository;
|
||||
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,
|
||||
EventService eventService,
|
||||
UserService userService,
|
||||
PingService pingService) {
|
||||
DeadlineService deadlineService) {
|
||||
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 +38,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() {
|
||||
@ -73,56 +46,19 @@ public class ProjectService {
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Project create(ProjectDto projectDto) throws IOException {
|
||||
public Project create(ProjectDto projectDto) {
|
||||
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 {
|
||||
Project project = projectRepository.getOne(projectDto.getId());
|
||||
projectRepository.save(copyFromDto(project, projectDto));
|
||||
eventService.updateProjectDeadlines(project);
|
||||
for (FileDataDto file : projectDto.getFiles().stream()
|
||||
.filter(f -> f.isDeleted() && f.getId() != null)
|
||||
.collect(toList())) {
|
||||
fileService.delete(file.getId());
|
||||
}
|
||||
return project;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public boolean delete(Integer projectId) throws IOException {
|
||||
if (projectRepository.existsById(projectId)) {
|
||||
Project project = projectRepository.getOne(projectId);
|
||||
projectRepository.delete(project);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private Project copyFromDto(Project project, ProjectDto projectDto) throws IOException {
|
||||
project.setDescription(projectDto.getDescription());
|
||||
project.setStatus(projectDto.getStatus() == null ? TECHNICAL_TASK : projectDto.getStatus());
|
||||
private Project copyFromDto(Project project, ProjectDto projectDto) {
|
||||
project.setTitle(projectDto.getTitle());
|
||||
if (projectDto.getGrant() != null && projectDto.getGrant().getId() != null) {
|
||||
project.setGrant(grantRepository.getOne(projectDto.getGrant().getId()));
|
||||
}
|
||||
project.setRepository(projectDto.getRepository());
|
||||
project.setDeadlines(deadlineService.saveOrCreate(projectDto.getDeadlines()));
|
||||
project.setFiles(fileService.saveOrCreate(projectDto.getFiles().stream()
|
||||
.filter(f -> !f.isDeleted())
|
||||
.collect(toList())));
|
||||
project.getGrants().clear();
|
||||
if (projectDto.getGrantIds() != null && !projectDto.getGrantIds().isEmpty()) {
|
||||
projectDto.getGrantIds().forEach(grantIds -> project.getGrants().add(grantRepository.findGrantById(grantIds)));
|
||||
}
|
||||
return project;
|
||||
}
|
||||
|
||||
public Project save(ProjectDto projectDto) throws IOException {
|
||||
public Project save(ProjectDto projectDto) {
|
||||
if (isEmpty(projectDto.getId())) {
|
||||
return create(projectDto);
|
||||
} else {
|
||||
@ -130,42 +66,12 @@ public class ProjectService {
|
||||
}
|
||||
}
|
||||
|
||||
public ProjectDto removeDeadline(ProjectDto projectDto, Integer deadlineId) {
|
||||
if (deadlineId != null) {
|
||||
projectDto.getRemovedDeadlineIds().add(deadlineId);
|
||||
}
|
||||
projectDto.getDeadlines().remove((int) deadlineId);
|
||||
return projectDto;
|
||||
private Project update(ProjectDto projectDto) {
|
||||
throw new RuntimeException("not implemented yet");
|
||||
}
|
||||
|
||||
public Project findById(Integer id) {
|
||||
return projectRepository.getOne(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();
|
||||
}
|
||||
return projectRepository.findOne(id);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -1,23 +1,20 @@
|
||||
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;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
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 ru.ulstu.deadline.model.Deadline;
|
||||
import ru.ulstu.students.model.Task;
|
||||
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 +26,7 @@ import static ru.ulstu.students.controller.Navigation.TASK_PAGE;
|
||||
|
||||
@Controller()
|
||||
@RequestMapping(value = "/students")
|
||||
@Hidden
|
||||
@ApiIgnore
|
||||
public class TaskController {
|
||||
|
||||
private final TaskService taskService;
|
||||
@ -38,14 +35,14 @@ public class TaskController {
|
||||
this.taskService = taskService;
|
||||
}
|
||||
|
||||
@GetMapping("/dashboard")
|
||||
public void getDashboard(ModelMap modelMap) {
|
||||
@GetMapping("/tasks")
|
||||
public void getTasks(ModelMap modelMap) {
|
||||
modelMap.put("tasks", taskService.findAllDto());
|
||||
}
|
||||
|
||||
@GetMapping("/tasks")
|
||||
public void getTask(ModelMap modelMap) {
|
||||
modelMap.put("filteredTasks", new TaskFilterDto(taskService.findAllDto(), null, null, null));
|
||||
@GetMapping("/dashboard")
|
||||
public void getDashboard(ModelMap modelMap) {
|
||||
modelMap.put("tasks", taskService.findAllDto());
|
||||
}
|
||||
|
||||
@GetMapping("/task")
|
||||
@ -57,14 +54,6 @@ public class TaskController {
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/tasks")
|
||||
public void filterTasks(@Valid TaskFilterDto taskFilterDto, ModelMap modelMap) {
|
||||
modelMap.put("filteredTasks", new TaskFilterDto(taskService.filter(taskFilterDto),
|
||||
taskFilterDto.getStatus(),
|
||||
taskFilterDto.getTag(),
|
||||
taskFilterDto.getOrder()));
|
||||
}
|
||||
|
||||
@PostMapping(value = "/task", params = "save")
|
||||
public String save(@Valid TaskDto taskDto, Errors errors) throws IOException {
|
||||
filterEmptyDeadlines(taskDto);
|
||||
@ -88,23 +77,11 @@ public class TaskController {
|
||||
return TASK_PAGE;
|
||||
}
|
||||
|
||||
@GetMapping("/delete/{task-id}")
|
||||
public String delete(@PathVariable("task-id") Integer taskId) throws IOException {
|
||||
taskService.delete(taskId);
|
||||
return String.format(REDIRECT_TO, TASKS_PAGE);
|
||||
}
|
||||
|
||||
|
||||
@ModelAttribute("allStatuses")
|
||||
public List<Task.TaskStatus> getTaskStatuses() {
|
||||
return taskService.getTaskStatuses();
|
||||
}
|
||||
|
||||
@ModelAttribute("allTags")
|
||||
public List<Tag> getTags() {
|
||||
return taskService.getTags();
|
||||
}
|
||||
|
||||
private void filterEmptyDeadlines(TaskDto taskDto) {
|
||||
taskDto.setDeadlines(taskDto.getDeadlines().stream()
|
||||
.filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
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 java.util.Date;
|
||||
|
||||
@Entity
|
||||
@Table(name = "scheduler")
|
||||
public class Scheduler extends BaseEntity {
|
||||
|
||||
@OneToOne(optional = false)
|
||||
@JoinColumn(name = "task_id")
|
||||
private Task task;
|
||||
|
||||
@Temporal(value = TemporalType.TIMESTAMP)
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date date;
|
||||
|
||||
public Scheduler() {
|
||||
}
|
||||
|
||||
public Scheduler(Task task, Date date) {
|
||||
this.task = task;
|
||||
this.date = date;
|
||||
}
|
||||
|
||||
public Task getTask() {
|
||||
return task;
|
||||
}
|
||||
|
||||
public void setTask(Task task) {
|
||||
this.task = task;
|
||||
}
|
||||
|
||||
public Date getDate() {
|
||||
return date;
|
||||
}
|
||||
|
||||
public void setDate(Date date) {
|
||||
this.date = date;
|
||||
}
|
||||
}
|
||||
@ -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,12 +49,8 @@ public class Task extends BaseEntity implements EventSource {
|
||||
|
||||
private String description;
|
||||
|
||||
public Task() {
|
||||
|
||||
}
|
||||
|
||||
@Enumerated(value = EnumType.STRING)
|
||||
private TaskStatus status = TaskStatus.IN_WORK;
|
||||
private ru.ulstu.students.model.Task.TaskStatus status = TaskStatus.IN_WORK;
|
||||
|
||||
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
|
||||
@JoinColumn(name = "task_id", unique = true)
|
||||
@ -75,7 +67,6 @@ public class Task extends BaseEntity implements EventSource {
|
||||
private Date updateDate = new Date();
|
||||
|
||||
@ManyToMany(fetch = FetchType.EAGER)
|
||||
@Fetch(FetchMode.SUBSELECT)
|
||||
@JoinTable(name = "task_tags",
|
||||
joinColumns = {@JoinColumn(name = "task_id")},
|
||||
inverseJoinColumns = {@JoinColumn(name = "tag_id")})
|
||||
@ -85,16 +76,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;
|
||||
}
|
||||
@ -146,5 +127,4 @@ public class Task extends BaseEntity implements EventSource {
|
||||
public void setTags(List<Tag> tags) {
|
||||
this.tags = tags;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user