Compare commits

..

11 Commits

Author SHA1 Message Date
T-Midnight
858b4b96a7 Merge remote-tracking branch 'origin/44-check-complete-deadlines' into 44-check-complete-deadlines
# Conflicts:
#	src/main/resources/templates/papers/fragments/paperLineFragment.html
2019-06-05 11:55:31 +04:00
T-Midnight
8b263e7e0f #44 fix link to papers 2019-06-05 11:52:54 +04:00
T-Midnight
24d3c2ef69 Merge branch '103-integr-tests-grant' into 44-check-complete-deadlines 2019-06-05 10:47:52 +04:00
Anton Romanov
1d19472f82 #44 small icons 2019-05-16 07:59:25 +04:00
T-Midnight
1bf1ad915d Merge branch 'dev' into 44-check-complete-deadlines 2019-05-14 23:59:22 +04:00
T-Midnight
9ca8d15b8f #44 update fragment in conference 2019-05-14 23:55:08 +04:00
T-Midnight
8c13adb4aa #44 replace paper status fragment 2019-05-14 23:46:15 +04:00
T-Midnight
8747ac1619 #44 change icon for grant 2019-05-14 23:44:00 +04:00
T-Midnight
72923312b7 #44 add title to paper status fragment 2019-05-14 23:42:49 +04:00
T-Midnight
395cf57cc1 #44 finish with papers 2019-05-13 16:29:33 +04:00
T-Midnight
c612e35ad9 #44 add check for papers 2019-05-12 23:27:19 +04:00
228 changed files with 5749 additions and 2911 deletions

View File

@ -1,16 +1,16 @@
image: romanov73/is:ng-tracker-container-11 image: romanov73/is:ng-tracker-container
variables: variables:
GRADLE_OPTS: "-Dorg.gradle.daemon=false" GRADLE_OPTS: "-Dorg.gradle.daemon=false"
before_script: before_script:
- service postgresql stop - service postgresql stop
- service postgresql start - service postgresql start
- eval $(ssh-agent -s) - eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
- mkdir -p ~/.ssh - mkdir -p ~/.ssh
- chmod 700 ~/.ssh - chmod 700 ~/.ssh
- git log --pretty="%cn;%cd;%s" > src/main/resources/commits.log - git log --pretty="%cn;%cd;%s" > src/main/resources/commits.log
build: build:
stage: build stage: build

19
Jenkinsfile vendored
View File

@ -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])
}
}
}
}
}

View File

@ -9,4 +9,6 @@
4. Получить проект для обучения бакалавров современым технологиям разработки. 4. Получить проект для обучения бакалавров современым технологиям разработки.
5. Создать систему хранения и трансляции опыта между участниками научной группы. 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)

View File

@ -1,19 +1,34 @@
plugins { buildscript {
id 'java' ext {
id 'org.springframework.boot' version '3.2.4' versionSpringBoot = '1.5.10.RELEASE'
id 'io.spring.dependency-management' version '1.1.4' }
id 'checkstyle'
repositories {
mavenLocal()
mavenCentral()
}
dependencies {
classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: versionSpringBoot
}
} }
group 'ru.ulstu' group 'ru.ulstu'
version '0.1.0-SNAPSHOT' 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 build.dependsOn checkstyleMain
bootRun.dependsOn checkstyleMain bootRun.dependsOn checkstyleMain
java { sourceCompatibility = 1.8
sourceCompatibility = '17' targetCompatibility = 1.8
}
bootRun { bootRun {
systemProperties = System.properties systemProperties = System.properties
@ -49,7 +64,7 @@ checkstyle {
checkstyle checkstyle
} }
dependencies { dependencies{
assert project.hasProperty("checkstyleVersion") assert project.hasProperty("checkstyleVersion")
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}" checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
@ -61,16 +76,9 @@ task health(dependsOn: [
'checkstyleMain' 'checkstyleMain'
]) ])
test {
useJUnitPlatform()
}
jar { jar {
enabled = false baseName = 'ng-tracker'
}
bootJar {
archiveFileName = String.format('%s-%s.jar', rootProject.name, version)
} }
compileJava { compileJava {
@ -82,39 +90,44 @@ repositories {
mavenCentral() mavenCentral()
} }
dependencies { configurations {
implementation('org.springframework.boot:spring-boot-starter-web') { compile.exclude module: "spring-boot-starter-tomcat"
exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat' compile.exclude module: "bcmail-jdk14"
} compile.exclude module: "bcprov-jdk14"
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security' compile.exclude module: "bctsp-jdk14"
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'
} }
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'
compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1'
testCompile group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '3.3.1'
testCompile group: 'com.google.guava', name: 'guava', version: '21.0'
}

View File

@ -169,4 +169,4 @@
</module> </module>
</module> </module>

View File

@ -18,6 +18,6 @@ fi
ssh $USERSERVER "cd /tmp && rm -rf $ARTIFACT_NAME*.jar && echo `date` 'killed' >> log_$ARTIFACT_NAME" 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 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 --ng-tracker.dev-mode=false >> /home/user/logfile_$ARTIFACT_NAME" &
sleep 10 sleep 10
echo "is deployed" echo "is deployed"

View File

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

View File

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

View File

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

View File

@ -1,40 +1,37 @@
package ru.ulstu.conference.model; 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.Fetch;
import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchMode;
import org.hibernate.validator.constraints.NotBlank;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import ru.ulstu.core.model.BaseEntity; import ru.ulstu.core.model.BaseEntity;
import ru.ulstu.core.model.EventSource; import ru.ulstu.core.model.EventSource;
import ru.ulstu.core.model.UserActivity;
import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.paper.model.Paper; import ru.ulstu.paper.model.Paper;
import ru.ulstu.timeline.model.Event; import ru.ulstu.timeline.model.Event;
import ru.ulstu.user.model.User; 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.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@Entity @Entity
@Table(name = "conference") @Table(name = "conference")
@DiscriminatorValue("CONFERENCE") public class Conference extends BaseEntity implements EventSource {
public class Conference extends BaseEntity implements UserActivity, EventSource {
@NotBlank @NotBlank
private String title; private String title;
@ -61,21 +58,18 @@ public class Conference extends BaseEntity implements UserActivity, EventSource
@OrderBy("date") @OrderBy("date")
private List<Deadline> deadlines = new ArrayList<>(); private List<Deadline> deadlines = new ArrayList<>();
@OneToMany(cascade = CascadeType.MERGE, fetch = FetchType.LAZY) @ManyToMany(cascade = CascadeType.MERGE, fetch = FetchType.EAGER)
@JoinColumn(name = "conference_id") @JoinTable(name = "paper_conference",
joinColumns = {@JoinColumn(name = "conference_id")},
inverseJoinColumns = {@JoinColumn(name = "paper_id")})
@Fetch(FetchMode.SUBSELECT)
private List<Paper> papers = new ArrayList<>(); 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) @JoinColumn(name = "conference_id", unique = true)
@Fetch(FetchMode.SUBSELECT)
private List<ConferenceUser> users = new ArrayList<>(); private List<ConferenceUser> users = new ArrayList<>();
public Conference() {
}
public Conference(@NotBlank String title) {
this.title = title;
}
public String getTitle() { public String getTitle() {
return title; return title;
} }
@ -169,9 +163,4 @@ public class Conference extends BaseEntity implements UserActivity, EventSource
.filter(d -> d.getDate().after(new Date())) .filter(d -> d.getDate().after(new Date()))
.findFirst(); .findFirst();
} }
@Override
public Set<User> getActivityUsers() {
return getUsers().stream().map(ConferenceUser::getUser).collect(Collectors.toSet());
}
} }

View File

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

View File

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

View File

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

View File

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

View File

@ -11,26 +11,25 @@ import ru.ulstu.conference.model.ConferenceDto;
import ru.ulstu.conference.model.ConferenceFilterDto; import ru.ulstu.conference.model.ConferenceFilterDto;
import ru.ulstu.conference.model.ConferenceUser; import ru.ulstu.conference.model.ConferenceUser;
import ru.ulstu.conference.repository.ConferenceRepository; import ru.ulstu.conference.repository.ConferenceRepository;
import ru.ulstu.core.util.DateUtils;
import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.deadline.service.DeadlineService; import ru.ulstu.deadline.service.DeadlineService;
import ru.ulstu.name.BaseService; import ru.ulstu.name.BaseService;
import ru.ulstu.paper.model.Paper; import ru.ulstu.paper.model.Paper;
import ru.ulstu.paper.service.PaperService; import ru.ulstu.paper.service.PaperService;
import ru.ulstu.ping.model.Ping;
import ru.ulstu.ping.service.PingService; import ru.ulstu.ping.service.PingService;
import ru.ulstu.timeline.service.EventService; import ru.ulstu.timeline.service.EventService;
import ru.ulstu.user.model.User; import ru.ulstu.user.model.User;
import ru.ulstu.user.service.UserService; import ru.ulstu.user.service.UserService;
import java.io.IOException; import java.io.IOException;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static java.util.stream.Collectors.toList;
import static org.springframework.util.ObjectUtils.isEmpty; import static org.springframework.util.ObjectUtils.isEmpty;
import static ru.ulstu.core.util.StreamApiUtils.convert; import static ru.ulstu.core.util.StreamApiUtils.convert;
@ -67,7 +66,7 @@ public class ConferenceService extends BaseService {
} }
public ConferenceDto getExistConferenceById(Integer id) { public ConferenceDto getExistConferenceById(Integer id) {
ConferenceDto conferenceDto = new ConferenceDto(conferenceRepository.getOne(id)); ConferenceDto conferenceDto = new ConferenceDto(conferenceRepository.findOne(id));
conferenceDto.setNotSelectedPapers(getNotSelectPapers(conferenceDto.getPaperIds())); conferenceDto.setNotSelectedPapers(getNotSelectPapers(conferenceDto.getPaperIds()));
conferenceDto.setDisabledTakePart(isCurrentUserParticipant(conferenceDto.getUsers())); conferenceDto.setDisabledTakePart(isCurrentUserParticipant(conferenceDto.getUsers()));
return conferenceDto; return conferenceDto;
@ -81,7 +80,7 @@ public class ConferenceService extends BaseService {
public List<Conference> findAll() { public List<Conference> findAll() {
return conferenceRepository.findAll(Sort.by(Sort.Direction.DESC, "beginDate")); return conferenceRepository.findAll(new Sort(Sort.Direction.DESC, "beginDate"));
} }
public List<ConferenceDto> findAllDto() { public List<ConferenceDto> findAllDto() {
@ -98,6 +97,7 @@ public class ConferenceService extends BaseService {
checkUniqueName(conferenceDto, checkUniqueName(conferenceDto,
errors, errors,
conferenceDto.getId(), conferenceDto.getId(),
"title",
"Конференция с таким именем уже существует"); "Конференция с таким именем уже существует");
if (errors.hasErrors()) { if (errors.hasErrors()) {
return false; return false;
@ -112,63 +112,43 @@ public class ConferenceService extends BaseService {
return true; return true;
} }
public Conference save(Conference conference) {
if (isEmpty(conference.getId())) {
return create(conference);
} else {
return update(conference);
}
}
@Transactional @Transactional
public Conference create(ConferenceDto conferenceDto) throws IOException { public Conference create(ConferenceDto conferenceDto) throws IOException {
return create(copyFromDto(new Conference(), conferenceDto)); Conference newConference = copyFromDto(new Conference(), conferenceDto);
newConference = conferenceRepository.save(newConference);
conferenceNotificationService.sendCreateNotification(newConference);
eventService.createFromObject(newConference, Collections.emptyList(), false, "конференции");
return newConference;
} }
@Transactional @Transactional
public Conference create(Conference conference) { public Conference update(ConferenceDto conferenceDto) throws IOException {
conference = conferenceRepository.save(conference); Conference conference = conferenceRepository.findOne(conferenceDto.getId());
conferenceNotificationService.sendCreateNotification(conference); List<Deadline> oldDeadlines = conference.getDeadlines().stream()
return conference;
}
@Transactional
private Conference update(ConferenceDto conferenceDto) throws IOException {
return update(copyFromDto(conferenceRepository.getOne(conferenceDto.getId()), conferenceDto));
}
@Transactional
private Conference update(Conference conference) {
Conference oldConference = conferenceRepository.getOne(conference.getId());
List<Deadline> oldDeadlines = oldConference.getDeadlines().stream()
.map(this::copyDeadline) .map(this::copyDeadline)
.collect(Collectors.toList()); .collect(Collectors.toList());
Date oldBeginDate = conference.getBeginDate(); Date oldBeginDate = conference.getBeginDate();
Date oldEndDate = conference.getEndDate(); Date oldEndDate = conference.getEndDate();
conferenceRepository.save(conference); conferenceRepository.save(copyFromDto(conference, conferenceDto));
eventService.updateConferenceDeadlines(conference);
sendNotificationAfterUpdateDeadlines(conference, oldDeadlines); sendNotificationAfterUpdateDeadlines(conference, oldDeadlines);
if (!conference.getBeginDate().equals(oldBeginDate) || !conference.getEndDate().equals(oldEndDate)) { if (!conference.getBeginDate().equals(oldBeginDate) || !conference.getEndDate().equals(oldEndDate)) {
conferenceNotificationService.updateConferencesDatesNotification(conference, oldBeginDate, oldEndDate); conferenceNotificationService.updateConferencesDatesNotification(conference, oldBeginDate, oldEndDate);
} }
conferenceDto.getRemovedDeadlineIds().forEach(deadlineService::remove);
return conference; return conference;
} }
@Transactional @Transactional
public boolean delete(Integer conferenceId) { public boolean delete(Integer conferenceId) {
if (conferenceRepository.existsById(conferenceId)) { if (conferenceRepository.exists(conferenceId)) {
eventService.removeConferencesEvent(conferenceRepository.getOne(conferenceId)); eventService.removeConferencesEvent(conferenceRepository.findOne(conferenceId));
conferenceRepository.deleteById(conferenceId); conferenceRepository.delete(conferenceId);
return true; return true;
} }
return false; return false;
} }
@Transactional
public boolean delete(List<Conference> conferences) {
conferences.forEach(conference -> delete(conference.getId()));
return true;
}
public ConferenceDto addDeadline(ConferenceDto conferenceDto) { public ConferenceDto addDeadline(ConferenceDto conferenceDto) {
conferenceDto.getDeadlines().add(new Deadline()); conferenceDto.getDeadlines().add(new Deadline());
return conferenceDto; return conferenceDto;
@ -254,7 +234,7 @@ public class ConferenceService extends BaseService {
return convert(findAllActive(), ConferenceDto::new); return convert(findAllActive(), ConferenceDto::new);
} }
public List<Conference> findAllActive() { private List<Conference> findAllActive() {
return conferenceRepository.findAllActive(new Date()); return conferenceRepository.findAllActive(new Date());
} }
@ -263,13 +243,14 @@ public class ConferenceService extends BaseService {
} }
@Transactional @Transactional
public void ping(ConferenceDto conferenceDto) throws IOException { public Ping ping(ConferenceDto conferenceDto) throws IOException {
pingService.addPing(findOne(conferenceDto.getId())); Ping ping = pingService.addPing(findOne(conferenceDto.getId()));
conferenceRepository.updatePingConference(conferenceDto.getId()); conferenceRepository.updatePingConference(conferenceDto.getId());
return ping;
} }
public Conference findOne(Integer conferenceId) { private Conference findOne(Integer conferenceId) {
return conferenceRepository.getOne(conferenceId); return conferenceRepository.findOne(conferenceId);
} }
public void setChartData(ModelMap modelMap) { public void setChartData(ModelMap modelMap) {
@ -314,7 +295,7 @@ public class ConferenceService extends BaseService {
return newDeadline; return newDeadline;
} }
private void checkEmptyFieldsOfDeadline(ConferenceDto conferenceDto, Errors errors) { public void checkEmptyFieldsOfDeadline(ConferenceDto conferenceDto, Errors errors) {
for (Deadline deadline : conferenceDto.getDeadlines()) { for (Deadline deadline : conferenceDto.getDeadlines()) {
if (deadline.getDate() == null || deadline.getDescription().isEmpty()) { if (deadline.getDate() == null || deadline.getDescription().isEmpty()) {
errors.rejectValue("deadlines", "errorCode", "Все поля дедлайна должны быть заполнены"); errors.rejectValue("deadlines", "errorCode", "Все поля дедлайна должны быть заполнены");
@ -337,22 +318,4 @@ public class ConferenceService extends BaseService {
public Conference getActiveConferenceByUser(User user) { public Conference getActiveConferenceByUser(User user) {
return conferenceRepository.findActiveByUser(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());
}
} }

View File

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

View File

@ -1,6 +1,6 @@
package ru.ulstu.configuration; 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.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -23,8 +23,6 @@ public class ApplicationProperties {
private String debugEmail; private String debugEmail;
private String driverPath;
public boolean isUseHttps() { public boolean isUseHttps() {
return useHttps; return useHttps;
} }
@ -72,12 +70,4 @@ public class ApplicationProperties {
public void setDebugEmail(String debugEmail) { public void setDebugEmail(String debugEmail) {
this.debugEmail = debugEmail; this.debugEmail = debugEmail;
} }
public String getDriverPath() {
return driverPath;
}
public void setDriverPath(String driverPath) {
this.driverPath = driverPath;
}
} }

View File

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

View File

@ -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);
}
}
}

View File

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

View File

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

View File

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

View File

@ -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();
}
}

View File

@ -1,115 +1,116 @@
package ru.ulstu.core.controller; package ru.ulstu.core.controller;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.validation.FieldError; import org.springframework.validation.FieldError;
import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ExceptionHandler;
import ru.ulstu.core.error.EntityIdIsNullException; import org.springframework.web.bind.annotation.ModelAttribute;
import ru.ulstu.core.model.ErrorConstants; import ru.ulstu.core.error.EntityIdIsNullException;
import ru.ulstu.core.model.response.Response; import ru.ulstu.core.model.ErrorConstants;
import ru.ulstu.core.model.response.ResponseExtended; import ru.ulstu.core.model.response.Response;
import ru.ulstu.user.error.UserActivationError; import ru.ulstu.core.model.response.ResponseExtended;
import ru.ulstu.user.error.UserEmailExistsException; import ru.ulstu.user.error.UserActivationError;
import ru.ulstu.user.error.UserIdExistsException; import ru.ulstu.user.error.UserEmailExistsException;
import ru.ulstu.user.error.UserIsUndeadException; import ru.ulstu.user.error.UserIdExistsException;
import ru.ulstu.user.error.UserLoginExistsException; import ru.ulstu.user.error.UserIsUndeadException;
import ru.ulstu.user.error.UserNotActivatedException; import ru.ulstu.user.error.UserLoginExistsException;
import ru.ulstu.user.error.UserNotFoundException; import ru.ulstu.user.error.UserNotActivatedException;
import ru.ulstu.user.error.UserPasswordsNotValidOrNotMatchException; import ru.ulstu.user.error.UserNotFoundException;
import ru.ulstu.user.error.UserResetKeyError; import ru.ulstu.user.error.UserPasswordsNotValidOrNotMatchException;
import ru.ulstu.user.error.UserSendingMailException; import ru.ulstu.user.error.UserResetKeyError;
import ru.ulstu.user.service.UserService; import ru.ulstu.user.error.UserSendingMailException;
import ru.ulstu.user.service.UserService;
import java.util.Set;
import java.util.stream.Collectors; import java.util.Set;
import java.util.stream.Collectors;
//@ControllerAdvice
public class AdviceController { @ControllerAdvice
private final Logger log = LoggerFactory.getLogger(AdviceController.class); public class AdviceController {
private final UserService userService; private final Logger log = LoggerFactory.getLogger(AdviceController.class);
private final UserService userService;
public AdviceController(UserService userService) {
this.userService = userService; public AdviceController(UserService userService) {
} this.userService = userService;
}
@ModelAttribute("flashMessage")
public String getFlashMessage() { @ModelAttribute("flashMessage")
return null; public String getFlashMessage() {
} return null;
}
private Response<Void> handleException(ErrorConstants error) {
log.warn(error.toString()); private Response<Void> handleException(ErrorConstants error) {
return new Response<>(error); log.warn(error.toString());
} return new Response<>(error);
}
private <E> ResponseExtended<E> handleException(ErrorConstants error, E errorData) {
log.warn(error.toString()); private <E> ResponseExtended<E> handleException(ErrorConstants error, E errorData) {
return new ResponseExtended<>(error, errorData); log.warn(error.toString());
} return new ResponseExtended<>(error, errorData);
}
@ExceptionHandler(EntityIdIsNullException.class)
public Response<Void> handleEntityIdIsNullException(Throwable e) { @ExceptionHandler(EntityIdIsNullException.class)
return handleException(ErrorConstants.ID_IS_NULL); public Response<Void> handleEntityIdIsNullException(Throwable e) {
} return handleException(ErrorConstants.ID_IS_NULL);
}
@ExceptionHandler(MethodArgumentNotValidException.class)
public ResponseExtended<Set<String>> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) { @ExceptionHandler(MethodArgumentNotValidException.class)
final Set<String> errors = e.getBindingResult().getAllErrors().stream() public ResponseExtended<Set<String>> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
.filter(error -> error instanceof FieldError) final Set<String> errors = e.getBindingResult().getAllErrors().stream()
.map(error -> ((FieldError) error).getField()) .filter(error -> error instanceof FieldError)
.collect(Collectors.toSet()); .map(error -> ((FieldError) error).getField())
return handleException(ErrorConstants.VALIDATION_ERROR, errors); .collect(Collectors.toSet());
} return handleException(ErrorConstants.VALIDATION_ERROR, errors);
}
@ExceptionHandler(UserIdExistsException.class)
public Response<Void> handleUserIdExistsException(Throwable e) { @ExceptionHandler(UserIdExistsException.class)
return handleException(ErrorConstants.USER_ID_EXISTS); public Response<Void> handleUserIdExistsException(Throwable e) {
} return handleException(ErrorConstants.USER_ID_EXISTS);
}
@ExceptionHandler(UserActivationError.class)
public ResponseExtended<String> handleUserActivationError(Throwable e) { @ExceptionHandler(UserActivationError.class)
return handleException(ErrorConstants.USER_ACTIVATION_ERROR, e.getMessage()); public ResponseExtended<String> handleUserActivationError(Throwable e) {
} return handleException(ErrorConstants.USER_ACTIVATION_ERROR, e.getMessage());
}
@ExceptionHandler(UserLoginExistsException.class)
public ResponseExtended<String> handleUserLoginExistsException(Throwable e) { @ExceptionHandler(UserLoginExistsException.class)
return handleException(ErrorConstants.USER_LOGIN_EXISTS, e.getMessage()); public ResponseExtended<String> handleUserLoginExistsException(Throwable e) {
} return handleException(ErrorConstants.USER_LOGIN_EXISTS, e.getMessage());
}
@ExceptionHandler(UserEmailExistsException.class)
public ResponseExtended<String> handleUserEmailExistsException(Throwable e) { @ExceptionHandler(UserEmailExistsException.class)
return handleException(ErrorConstants.USER_EMAIL_EXISTS, e.getMessage()); public ResponseExtended<String> handleUserEmailExistsException(Throwable e) {
} return handleException(ErrorConstants.USER_EMAIL_EXISTS, e.getMessage());
}
@ExceptionHandler(UserPasswordsNotValidOrNotMatchException.class)
public Response<Void> handleUserPasswordsNotValidOrNotMatchException(Throwable e) { @ExceptionHandler(UserPasswordsNotValidOrNotMatchException.class)
return handleException(ErrorConstants.USER_PASSWORDS_NOT_VALID_OR_NOT_MATCH); public Response<Void> handleUserPasswordsNotValidOrNotMatchException(Throwable e) {
} return handleException(ErrorConstants.USER_PASSWORDS_NOT_VALID_OR_NOT_MATCH);
}
@ExceptionHandler(UserNotFoundException.class)
public ResponseExtended<String> handleUserNotFoundException(Throwable e) { @ExceptionHandler(UserNotFoundException.class)
return handleException(ErrorConstants.USER_NOT_FOUND, e.getMessage()); public ResponseExtended<String> handleUserNotFoundException(Throwable e) {
} return handleException(ErrorConstants.USER_NOT_FOUND, e.getMessage());
}
@ExceptionHandler(UserNotActivatedException.class)
public Response<Void> handleUserNotActivatedException(Throwable e) { @ExceptionHandler(UserNotActivatedException.class)
return handleException(ErrorConstants.USER_NOT_ACTIVATED); public Response<Void> handleUserNotActivatedException(Throwable e) {
} return handleException(ErrorConstants.USER_NOT_ACTIVATED);
}
@ExceptionHandler(UserResetKeyError.class)
public ResponseExtended<String> handleUserResetKeyError(Throwable e) { @ExceptionHandler(UserResetKeyError.class)
return handleException(ErrorConstants.USER_RESET_ERROR, e.getMessage()); public ResponseExtended<String> handleUserResetKeyError(Throwable e) {
} return handleException(ErrorConstants.USER_RESET_ERROR, e.getMessage());
}
@ExceptionHandler(UserIsUndeadException.class)
public ResponseExtended<String> handleUserIsUndeadException(Throwable e) { @ExceptionHandler(UserIsUndeadException.class)
return handleException(ErrorConstants.USER_UNDEAD_ERROR, e.getMessage()); public ResponseExtended<String> handleUserIsUndeadException(Throwable e) {
} return handleException(ErrorConstants.USER_UNDEAD_ERROR, e.getMessage());
}
@ExceptionHandler(UserSendingMailException.class)
public ResponseExtended<String> handleUserSendingMailException(Throwable e) { @ExceptionHandler(UserSendingMailException.class)
return handleException(ErrorConstants.USER_SENDING_MAIL_EXCEPTION, e.getMessage()); public ResponseExtended<String> handleUserSendingMailException(Throwable e) {
} return handleException(ErrorConstants.USER_SENDING_MAIL_EXCEPTION, e.getMessage());
} }
}

View File

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

View File

@ -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");
}
}
}

View File

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

View File

@ -16,8 +16,8 @@ public enum ErrorConstants {
FILE_UPLOAD_ERROR(110, "File upload error"), FILE_UPLOAD_ERROR(110, "File upload error"),
USER_SENDING_MAIL_EXCEPTION(111, "Во время отправки приглашения пользователю произошла ошибка"); USER_SENDING_MAIL_EXCEPTION(111, "Во время отправки приглашения пользователю произошла ошибка");
private final int code; private int code;
private final String message; private String message;
ErrorConstants(int code, String message) { ErrorConstants(int code, String message) {
this.code = code; this.code = code;

View 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;
}
}

View 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);
}

View File

@ -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();
}

View 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();
}

View File

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

View File

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

View File

@ -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;
}
}

View File

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

View File

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

View 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;
}
}

View File

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

View File

@ -2,15 +2,15 @@ package ru.ulstu.deadline.model;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; 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 org.springframework.format.annotation.DateTimeFormat;
import ru.ulstu.core.model.BaseEntity; import ru.ulstu.core.model.BaseEntity;
import ru.ulstu.user.model.User; import ru.ulstu.user.model.User;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.OneToMany;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -20,7 +20,7 @@ public class Deadline extends BaseEntity {
private String description; private String description;
@Temporal(value = TemporalType.DATE) @Temporal(value = TemporalType.TIMESTAMP)
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date date; private Date date;
@ -108,7 +108,9 @@ public class Deadline extends BaseEntity {
} }
return getId().equals(deadline.getId()) && return getId().equals(deadline.getId()) &&
description.equals(deadline.description) && description.equals(deadline.description) &&
date.equals(deadline.date); date.equals(deadline.date) &&
executors.equals(deadline.executors) &&
done.equals(deadline.done);
} }
@Override @Override

View File

@ -3,13 +3,14 @@ package ru.ulstu.deadline.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.model.Deadline;
import java.util.Date; import java.util.Date;
public interface DeadlineRepository extends JpaRepository<Deadline, Integer> { 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)") @Query(
Date findByGrantIdAndDate(@Param("id") Integer grantId, @Param("date") Date date); value = "SELECT date FROM Deadline d WHERE (d.grant_id = ?1) AND (d.date = ?2)",
nativeQuery = true)
Date findByGrantIdAndDate(Integer grantId, Date date);
} }

View File

@ -2,11 +2,9 @@ package ru.ulstu.deadline.service;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import ru.ulstu.core.util.DateUtils;
import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.deadline.repository.DeadlineRepository; import ru.ulstu.deadline.repository.DeadlineRepository;
import java.time.temporal.ChronoUnit;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -28,8 +26,8 @@ public class DeadlineService {
} }
@Transactional @Transactional
private Deadline update(Deadline deadline) { public Deadline update(Deadline deadline) {
Deadline updateDeadline = deadlineRepository.getOne(deadline.getId()); Deadline updateDeadline = deadlineRepository.findOne(deadline.getId());
updateDeadline.setDate(deadline.getDate()); updateDeadline.setDate(deadline.getDate());
updateDeadline.setDescription(deadline.getDescription()); updateDeadline.setDescription(deadline.getDescription());
updateDeadline.setExecutors(deadline.getExecutors()); updateDeadline.setExecutors(deadline.getExecutors());
@ -49,33 +47,12 @@ public class DeadlineService {
return 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 @Transactional
public void remove(Integer deadlineId) { public void remove(Integer deadlineId) {
deadlineRepository.deleteById(deadlineId); deadlineRepository.delete(deadlineId);
} }
public Date findByGrantIdAndDate(Integer id, Date date) { public Date findByGrantIdAndDate(Integer id, Date date) {
return deadlineRepository.findByGrantIdAndDate(id, 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);
}
} }

View File

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

View File

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

View File

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

View File

@ -1,7 +1,5 @@
package ru.ulstu.grant.controller; package ru.ulstu.grant.controller;
import io.swagger.v3.oas.annotations.Hidden;
import jakarta.validation.Valid;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.validation.Errors; import org.springframework.validation.Errors;
@ -11,14 +9,15 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.grant.model.Grant; import ru.ulstu.grant.model.Grant;
import ru.ulstu.grant.model.GrantDto; import ru.ulstu.grant.model.GrantDto;
import ru.ulstu.grant.service.GrantService; import ru.ulstu.grant.service.GrantService;
import ru.ulstu.paper.model.PaperDto; import ru.ulstu.paper.model.PaperDto;
import ru.ulstu.user.model.User; import ru.ulstu.user.model.User;
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
@ -29,7 +28,7 @@ import static ru.ulstu.core.controller.Navigation.REDIRECT_TO;
@Controller() @Controller()
@RequestMapping(value = "/grants") @RequestMapping(value = "/grants")
@Hidden @ApiIgnore
public class GrantController { public class GrantController {
private final GrantService grantService; private final GrantService grantService;
@ -50,7 +49,7 @@ public class GrantController {
@GetMapping("/grant") @GetMapping("/grant")
public void getGrant(ModelMap modelMap, @RequestParam(value = "id") Integer id) { public void getGrant(ModelMap modelMap, @RequestParam(value = "id") Integer id) {
if (id != null && id > 0) { if (id != null && id > 0) {
GrantDto grantDto = grantService.getExistGrantById(id); GrantDto grantDto = grantService.findOneDto(id);
attachPaper(grantDto); attachPaper(grantDto);
modelMap.put("grantDto", grantDto); modelMap.put("grantDto", grantDto);
} else { } else {
@ -124,10 +123,4 @@ public class GrantController {
public List<PaperDto> getAllPapers() { public List<PaperDto> getAllPapers() {
return grantService.getAllUncompletedPapers(); return grantService.getAllUncompletedPapers();
} }
@ResponseBody
@PostMapping(value = "/ping")
public void ping(@RequestParam("grantId") int grantId) throws IOException {
grantService.ping(grantId);
}
} }

View File

@ -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();
}
}

View File

@ -1,25 +1,11 @@
package ru.ulstu.grant.model; 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.Fetch;
import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchMode;
import org.hibernate.validator.constraints.NotBlank;
import ru.ulstu.core.model.BaseEntity; import ru.ulstu.core.model.BaseEntity;
import ru.ulstu.core.model.EventSource; 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.deadline.model.Deadline;
import ru.ulstu.file.model.FileData; import ru.ulstu.file.model.FileData;
import ru.ulstu.paper.model.Paper; import ru.ulstu.paper.model.Paper;
@ -27,6 +13,19 @@ import ru.ulstu.project.model.Project;
import ru.ulstu.timeline.model.Event; import ru.ulstu.timeline.model.Event;
import ru.ulstu.user.model.User; import ru.ulstu.user.model.User;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@ -38,33 +37,26 @@ import java.util.Set;
@Entity @Entity
@Table(name = "grants") @Table(name = "grants")
@DiscriminatorValue("GRANT") public class Grant extends BaseEntity implements UserContainer, EventSource {
public class Grant extends BaseEntity implements UserActivity, EventSource {
public enum GrantStatus { public enum GrantStatus {
APPLICATION("Заявка", "text-draft"), APPLICATION("Заявка"),
ON_COMPETITION("Отправлен на конкурс", "text-review"), ON_COMPETITION("Отправлен на конкурс"),
SUCCESSFUL_PASSAGE("Успешное прохождение", "text-accepted"), SUCCESSFUL_PASSAGE("Успешное прохождение"),
IN_WORK("В работе", "text-primary"), IN_WORK("В работе"),
COMPLETED("Завершен", "text-success"), COMPLETED("Завершен"),
FAILED("Провалены сроки", "text-failed"), FAILED("Провалены сроки"),
LOADED_FROM_KIAS("Загружен автоматически", "text-warning"), LOADED_FROM_KIAS("Загружен автоматически"),
SKIPPED("Не интересует", "text-not-accepted"); SKIPPED("Не интересует");
private final String statusName; private String statusName;
private final String elementClass;
GrantStatus(String statusName, String elementClass) { GrantStatus(String statusName) {
this.statusName = statusName; this.statusName = statusName;
this.elementClass = elementClass;
} }
public String getStatusName() { public String getStatusName() {
return statusName; return statusName;
} }
public String getElementClass() {
return elementClass;
}
} }
@NotBlank @NotBlank
@ -175,7 +167,7 @@ public class Grant extends BaseEntity implements UserActivity, EventSource {
} }
@Override @Override
public Set<User> getActivityUsers() { public Set<User> getUsers() {
return getAuthors(); return getAuthors();
} }

View File

@ -2,8 +2,8 @@ package ru.ulstu.grant.model;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotEmpty;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.hibernate.validator.constraints.NotEmpty;
import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.file.model.FileDataDto; import ru.ulstu.file.model.FileDataDto;
import ru.ulstu.name.NameContainer; import ru.ulstu.name.NameContainer;

View File

@ -1,9 +1,8 @@
package ru.ulstu.grant.page; package ru.ulstu.grant.page;
import com.gargoylesoftware.htmlunit.html.DomNode; import org.openqa.selenium.By;
import com.gargoylesoftware.htmlunit.html.HtmlElement; import org.openqa.selenium.WebDriver;
import com.gargoylesoftware.htmlunit.html.HtmlPage; import org.openqa.selenium.WebElement;
import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -12,17 +11,16 @@ import java.util.List;
public class KiasPage { public class KiasPage {
private final static String KIAS_GRANT_DATE_FORMAT = "dd.MM.yyyy HH:mm"; private final static String KIAS_GRANT_DATE_FORMAT = "dd.MM.yyyy HH:mm";
private final HtmlPage page; private WebDriver driver;
public KiasPage(HtmlPage page) { public KiasPage(WebDriver webDriver) {
this.page = page; this.driver = webDriver;
} }
public boolean goToNextPage() { public boolean goToNextPage() {
try { try {
HtmlElement nextPageLink = page.getHtmlElementById("js-ctrlNext"); if (driver.findElements(By.id("js-ctrlNext")).size() > 0) {
if (nextPageLink.isDisplayed()) { driver.findElement(By.id("js-ctrlNext")).click();
nextPageLink.click();
return true; return true;
} }
} finally { } finally {
@ -30,26 +28,23 @@ public class KiasPage {
} }
} }
public List<DomNode> getPageOfGrants() { public List<WebElement> getPageOfGrants() {
return page.getByXPath("/html/body/div[2]/div/div[2]/main/div[1]/table/tbody/tr"); WebElement listContest = driver.findElement(By.tagName("tBody"));
List<WebElement> grants = listContest.findElements(By.cssSelector("tr.tr"));
return grants;
} }
public String getGrantTitle(DomNode grant) { public String getGrantTitle(WebElement grant) {
return ((DomNode) grant.getFirstByXPath("td[2]")).getTextContent() + " " return grant.findElement(By.cssSelector("td.tertiary")).findElement(By.tagName("a")).getText();
+ ((DomNode) grant.getFirstByXPath("td[@class='tertiary']/a")).getTextContent();
} }
public Date parseDeadLineDate(DomNode grantElement) throws ParseException { public Date parseDeadLineDate(WebElement grantElement) throws ParseException {
String deadlineDate = getFirstDeadline(grantElement); //10.06.2019 23:59 String deadlineDate = getFirstDeadline(grantElement); //10.06.2019 23:59
SimpleDateFormat formatter = new SimpleDateFormat(KIAS_GRANT_DATE_FORMAT); SimpleDateFormat formatter = new SimpleDateFormat(KIAS_GRANT_DATE_FORMAT);
return formatter.parse(deadlineDate); return formatter.parse(deadlineDate);
} }
private String getFirstDeadline(DomNode grantElement) { private String getFirstDeadline(WebElement grantElement) {
return ((DomNode) grantElement.getFirstByXPath("td[5]")).getTextContent(); return grantElement.findElement(By.xpath("./td[5]")).getText();
} }
}
public boolean isTableRowGrantLine(DomNode grantElement) {
return !((HtmlTableRow) grantElement).getAttribute("class").contains("pagerSavedHeightSpacer");
}
}

View File

@ -12,13 +12,13 @@ public interface GrantRepository extends JpaRepository<Grant, Integer>, BaseRepo
List<Grant> findByStatus(Grant.GrantStatus status); List<Grant> findByStatus(Grant.GrantStatus status);
Grant findFirstByTitle(String title); Grant findByTitle(String title);
Grant findGrantById(Integer grantId); Grant findGrantById(Integer grantId);
@Override @Override
@Query("SELECT title FROM Grant g WHERE (g.title = :name) AND (:id IS NULL OR g.id != :id) ") @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); String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
@Query("SELECT g FROM Grant g WHERE (g.status <> 'SKIPPED') AND (g.status <> 'COMPLETED')") @Query("SELECT g FROM Grant g WHERE (g.status <> 'SKIPPED') AND (g.status <> 'COMPLETED')")
List<Grant> findAllActive(); List<Grant> findAllActive();

View File

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

View File

@ -5,6 +5,9 @@ import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.IOException;
import java.text.ParseException;
@Service @Service
public class GrantScheduler { public class GrantScheduler {
private final static boolean IS_DEADLINE_NOTIFICATION_BEFORE_WEEK = true; private final static boolean IS_DEADLINE_NOTIFICATION_BEFORE_WEEK = true;
@ -24,18 +27,18 @@ public class GrantScheduler {
@Scheduled(cron = "0 0 8 * * MON", zone = "Europe/Samara") @Scheduled(cron = "0 0 8 * * MON", zone = "Europe/Samara")
public void checkDeadlineBeforeWeek() { public void checkDeadlineBeforeWeek() {
log.debug("GrantScheduler.checkDeadlineBeforeWeek started"); log.debug("GrantScheduler.checkDeadlineBeforeWeek started");
grantNotificationService.sendDeadlineNotifications(grantService.findAllActive(), IS_DEADLINE_NOTIFICATION_BEFORE_WEEK); grantNotificationService.sendDeadlineNotifications(grantService.findAll(), IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
log.debug("GrantScheduler.checkDeadlineBeforeWeek finished"); log.debug("GrantScheduler.checkDeadlineBeforeWeek finished");
} }
@Scheduled(cron = "0 0 8 * * ?", zone = "Europe/Samara") @Scheduled(cron = "0 0 8 * * ?", zone = "Europe/Samara")
public void loadGrantsFromKias() { public void loadGrantsFromKias() {
log.debug("GrantScheduler.loadGrantsFromKias started"); log.debug("GrantScheduler.loadGrantsFromKias started");
// try { try {
// grantService.createFromKias(); grantService.createFromKias();
// } catch (ParseException | IOException e) { } catch (ParseException | IOException e) {
// e.printStackTrace(); e.printStackTrace();
// } }
log.debug("GrantScheduler.loadGrantsFromKias finished"); log.debug("GrantScheduler.loadGrantsFromKias finished");
} }
} }

View File

@ -1,12 +1,10 @@
package ru.ulstu.grant.service; package ru.ulstu.grant.service;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.Errors; import org.springframework.validation.Errors;
import ru.ulstu.core.util.DateUtils;
import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.deadline.service.DeadlineService; import ru.ulstu.deadline.service.DeadlineService;
import ru.ulstu.file.model.FileDataDto; import ru.ulstu.file.model.FileDataDto;
@ -18,7 +16,7 @@ import ru.ulstu.name.BaseService;
import ru.ulstu.paper.model.Paper; import ru.ulstu.paper.model.Paper;
import ru.ulstu.paper.model.PaperDto; import ru.ulstu.paper.model.PaperDto;
import ru.ulstu.paper.service.PaperService; 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.model.ProjectDto;
import ru.ulstu.project.service.ProjectService; import ru.ulstu.project.service.ProjectService;
import ru.ulstu.timeline.service.EventService; import ru.ulstu.timeline.service.EventService;
@ -27,7 +25,6 @@ import ru.ulstu.user.service.UserService;
import java.io.IOException; import java.io.IOException;
import java.text.ParseException; import java.text.ParseException;
import java.time.temporal.ChronoUnit;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
@ -54,7 +51,6 @@ public class GrantService extends BaseService {
private final EventService eventService; private final EventService eventService;
private final GrantNotificationService grantNotificationService; private final GrantNotificationService grantNotificationService;
private final KiasService kiasService; private final KiasService kiasService;
private final PingService pingService;
public GrantService(GrantRepository grantRepository, public GrantService(GrantRepository grantRepository,
FileService fileService, FileService fileService,
@ -64,8 +60,7 @@ public class GrantService extends BaseService {
PaperService paperService, PaperService paperService,
EventService eventService, EventService eventService,
GrantNotificationService grantNotificationService, GrantNotificationService grantNotificationService,
KiasService kiasService, KiasService kiasService) {
PingService pingService) {
this.grantRepository = grantRepository; this.grantRepository = grantRepository;
this.kiasService = kiasService; this.kiasService = kiasService;
this.baseRepository = grantRepository; this.baseRepository = grantRepository;
@ -76,11 +71,6 @@ public class GrantService extends BaseService {
this.paperService = paperService; this.paperService = paperService;
this.eventService = eventService; this.eventService = eventService;
this.grantNotificationService = grantNotificationService; this.grantNotificationService = grantNotificationService;
this.pingService = pingService;
}
public GrantDto getExistGrantById(Integer id) {
return new GrantDto(findById(id));
} }
public List<Grant> findAll() { public List<Grant> findAll() {
@ -91,13 +81,17 @@ public class GrantService extends BaseService {
return convert(findAll(), GrantDto::new); return convert(findAll(), GrantDto::new);
} }
public GrantDto findOneDto(Integer id) {
return new GrantDto(grantRepository.findOne(id));
}
@Transactional @Transactional
public Grant create(GrantDto grantDto) throws IOException { public Integer create(GrantDto grantDto) throws IOException {
Grant newGrant = copyFromDto(new Grant(), grantDto); Grant newGrant = copyFromDto(new Grant(), grantDto);
newGrant = grantRepository.save(newGrant); newGrant = grantRepository.save(newGrant);
eventService.createFromObject(newGrant, Collections.emptyList(), false, "гранта"); eventService.createFromObject(newGrant, Collections.emptyList(), false, "гранта");
grantNotificationService.sendCreateNotification(newGrant); grantNotificationService.sendCreateNotification(newGrant);
return newGrant; return newGrant.getId();
} }
private Grant copyFromDto(Grant grant, GrantDto grantDto) throws IOException { private Grant copyFromDto(Grant grant, GrantDto grantDto) throws IOException {
@ -108,11 +102,9 @@ public class GrantService extends BaseService {
grant.setProject(projectService.findById(grantDto.getProject().getId())); grant.setProject(projectService.findById(grantDto.getProject().getId()));
} }
grant.setDeadlines(deadlineService.saveOrCreate(grantDto.getDeadlines())); grant.setDeadlines(deadlineService.saveOrCreate(grantDto.getDeadlines()));
if (!grant.getFiles().isEmpty()) { grant.setFiles(fileService.saveOrCreate(grantDto.getFiles().stream()
grant.setFiles(fileService.saveOrCreate(grantDto.getFiles().stream() .filter(f -> !f.isDeleted())
.filter(f -> !f.isDeleted()) .collect(toList())));
.collect(toList())));
}
grant.getAuthors().clear(); grant.getAuthors().clear();
if (grantDto.getAuthorIds() != null && !grantDto.getAuthorIds().isEmpty()) { if (grantDto.getAuthorIds() != null && !grantDto.getAuthorIds().isEmpty()) {
grantDto.getAuthorIds().forEach(authorIds -> grant.getAuthors().add(userService.findById(authorIds))); grantDto.getAuthorIds().forEach(authorIds -> grant.getAuthors().add(userService.findById(authorIds)));
@ -127,15 +119,14 @@ public class GrantService extends BaseService {
return grant; return grant;
} }
public void createProject(GrantDto grantDto) throws IOException { public void createProject(GrantDto grantDto) throws IOException {
grantDto.setProject( grantDto.setProject(
new ProjectDto(projectService.save(new ProjectDto(grantDto.getTitle())))); new ProjectDto(projectService.save(new ProjectDto(grantDto.getTitle()))));
} }
@Transactional @Transactional
private Integer update(GrantDto grantDto) throws IOException { public Integer update(GrantDto grantDto) throws IOException {
Grant grant = findById(grantDto.getId()); Grant grant = grantRepository.findOne(grantDto.getId());
Set<User> oldAuthors = new HashSet<>(grant.getAuthors()); Set<User> oldAuthors = new HashSet<>(grant.getAuthors());
User oldLeader = grant.getLeader(); User oldLeader = grant.getLeader();
for (FileDataDto file : grantDto.getFiles().stream() for (FileDataDto file : grantDto.getFiles().stream()
@ -164,25 +155,40 @@ public class GrantService extends BaseService {
} }
@Transactional @Transactional
public boolean delete(Integer grantId) throws IOException { public void delete(Integer grantId) throws IOException {
Grant grant = findById(grantId); Grant grant = grantRepository.findOne(grantId);
if (grant != null) { grantRepository.delete(grant);
grantRepository.delete(grant);
return true;
}
return false;
} }
public List<Grant.GrantStatus> getGrantStatuses() { public List<Grant.GrantStatus> getGrantStatuses() {
return Arrays.asList(Grant.GrantStatus.values()); return Arrays.asList(Grant.GrantStatus.values());
} }
@Transactional
public Grant create(String title, Project projectId, Date deadlineDate, User user, Paper paper) {
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.getPapers().add(paper);
grant = grantRepository.save(grant);
eventService.createFromObject(grant, Collections.emptyList(), false, "гранта");
grantNotificationService.sendCreateNotification(grant);
return grant;
}
public boolean save(GrantDto grantDto, Errors errors) throws IOException { public boolean save(GrantDto grantDto, Errors errors) throws IOException {
grantDto.setName(grantDto.getTitle()); grantDto.setName(grantDto.getTitle());
filterEmptyDeadlines(grantDto); filterEmptyDeadlines(grantDto);
checkEmptyDeadlines(grantDto, errors); checkEmptyDeadlines(grantDto, errors);
checkEmptyLeader(grantDto, errors); checkEmptyLeader(grantDto, errors);
checkUniqueName(grantDto, errors, grantDto.getId(), "Грант с таким именем уже существует"); checkUniqueName(grantDto, errors, grantDto.getId(), "title", "Грант с таким именем уже существует");
if (errors.hasErrors()) { if (errors.hasErrors()) {
return false; return false;
} }
@ -194,11 +200,11 @@ public class GrantService extends BaseService {
return true; return true;
} }
private boolean saveFromKias(GrantDto grantDto) throws IOException { public boolean saveFromKias(GrantDto grantDto) throws IOException {
grantDto.setName(grantDto.getTitle()); grantDto.setName(grantDto.getTitle());
String title = checkUniqueName(grantDto, grantDto.getId()); //проверка уникальности имени String title = checkUniqueName(grantDto, grantDto.getId()); //проверка уникальности имени
if (title != null) { if (title != null) {
Grant grantFromDB = grantRepository.findFirstByTitle(title); //грант с таким же названием из бд Grant grantFromDB = grantRepository.findByTitle(title); //грант с таким же названием из бд
if (checkSameDeadline(grantDto, grantFromDB.getId())) { //если дедайны тоже совпадают if (checkSameDeadline(grantDto, grantFromDB.getId())) { //если дедайны тоже совпадают
return false; return false;
} else { //иначе грант уже был в системе, но в другом году, поэтому надо создать } else { //иначе грант уже был в системе, но в другом году, поэтому надо создать
@ -224,8 +230,8 @@ public class GrantService extends BaseService {
} }
private boolean checkSameDeadline(GrantDto grantDto, Integer id) { private boolean checkSameDeadline(GrantDto grantDto, Integer id) {
Date date = DateUtils.clearTime(grantDto.getDeadlines().get(0).getDate()); //дата с сайта киас Date date = grantDto.getDeadlines().get(0).getDate(); //дата с сайта киас
Date foundGrantDate = DateUtils.clearTime(deadlineService.findByGrantIdAndDate(id, date)); Date foundGrantDate = deadlineService.findByGrantIdAndDate(id, date);
return foundGrantDate != null && foundGrantDate.compareTo(date) == 0; return foundGrantDate != null && foundGrantDate.compareTo(date) == 0;
} }
@ -264,22 +270,20 @@ public class GrantService extends BaseService {
return paperService.findAllNotCompleted(); return paperService.findAllNotCompleted();
} }
public List<PaperDto> attachPaper(GrantDto grantDto) { public void attachPaper(GrantDto grantDto) {
if (!grantDto.getPaperIds().isEmpty()) { if (!grantDto.getPaperIds().isEmpty()) {
grantDto.getPapers().clear(); grantDto.getPapers().clear();
grantDto.setPapers(getGrantPapers(grantDto.getPaperIds())); grantDto.setPapers(getGrantPapers(grantDto.getPaperIds()));
} else { } else {
grantDto.getPapers().clear(); grantDto.getPapers().clear();
} }
return grantDto.getPapers();
} }
public GrantDto removeDeadline(GrantDto grantDto, Integer deadlineId) { public void removeDeadline(GrantDto grantDto, Integer deadlineId) {
if (grantDto.getDeadlines().get(deadlineId).getId() != null) { if (grantDto.getDeadlines().get(deadlineId).getId() != null) {
grantDto.getRemovedDeadlineIds().add(grantDto.getDeadlines().get(deadlineId).getId()); grantDto.getRemovedDeadlineIds().add(grantDto.getDeadlines().get(deadlineId).getId());
} }
grantDto.getDeadlines().remove((int) deadlineId); grantDto.getDeadlines().remove((int) deadlineId);
return grantDto;
} }
private List<User> getCompletedPapersAuthors(Paper.PaperType type) { private List<User> getCompletedPapersAuthors(Paper.PaperType type) {
@ -305,11 +309,10 @@ public class GrantService extends BaseService {
.collect(toList()); .collect(toList());
} }
public List<Deadline> filterEmptyDeadlines(GrantDto grantDto) { public void filterEmptyDeadlines(GrantDto grantDto) {
grantDto.setDeadlines(grantDto.getDeadlines().stream() grantDto.setDeadlines(grantDto.getDeadlines().stream()
.filter(dto -> dto.getDate() != null || !StringUtils.isEmpty(dto.getDescription())) .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription()))
.collect(Collectors.toList())); .collect(Collectors.toList()));
return grantDto.getDeadlines();
} }
@Transactional @Transactional
@ -327,77 +330,11 @@ public class GrantService extends BaseService {
return convert(findAllActive(), GrantDto::new); return convert(findAllActive(), GrantDto::new);
} }
public List<Grant> findAllActive() { private List<Grant> findAllActive() {
return grantRepository.findAllActive(); return grantRepository.findAllActive();
} }
public Grant findById(Integer id) { public Grant findGrantById(Integer grantId) {
return grantRepository.getOne(id); return grantRepository.findOne(grantId);
}
@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);
} }
} }

View File

@ -1,15 +1,14 @@
package ru.ulstu.grant.service; package ru.ulstu.grant.service;
import com.gargoylesoftware.htmlunit.WebClient; import org.openqa.selenium.WebDriver;
import com.gargoylesoftware.htmlunit.html.DomNode; import org.openqa.selenium.WebElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage; import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.chrome.ChromeOptions;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.ulstu.configuration.ApplicationProperties;
import ru.ulstu.grant.model.GrantDto; import ru.ulstu.grant.model.GrantDto;
import ru.ulstu.grant.page.KiasPage; import ru.ulstu.grant.page.KiasPage;
import ru.ulstu.user.service.UserService; import ru.ulstu.user.service.UserService;
import java.io.IOException;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -22,31 +21,33 @@ public class KiasService {
private final static String CONTEST_STATUS_ID = "1"; private final static String CONTEST_STATUS_ID = "1";
private final static String CONTEST_TYPE = "-1"; private final static String CONTEST_TYPE = "-1";
private final static String DRIVER_LOCATION = "drivers/%s";
private final static String WINDOWS_DRIVER = "chromedriver.exe";
private final static String LINUX_DRIVER = "chromedriver";
private final static String DRIVER_TYPE = "webdriver.chrome.driver";
private final UserService userService; private final UserService userService;
public KiasService(UserService userService, public KiasService(UserService userService) {
ApplicationProperties applicationProperties) {
this.userService = userService; this.userService = userService;
} }
public List<GrantDto> getNewGrantsDto() throws ParseException, IOException { public List<GrantDto> getNewGrantsDto() throws ParseException {
WebDriver webDriver = getDriver();
Integer leaderId = userService.findOneByLoginIgnoreCase("admin").getId(); Integer leaderId = userService.findOneByLoginIgnoreCase("admin").getId();
List<GrantDto> grants = new ArrayList<>(); List<GrantDto> grants = new ArrayList<>();
try (WebClient webClient = new WebClient()) { for (Integer year : generateGrantYears()) {
webClient.setJavaScriptTimeout(60 * 1000); webDriver.get(String.format(BASE_URL, CONTEST_STATUS_ID, CONTEST_TYPE, year));
webClient.getOptions().setThrowExceptionOnScriptError(false); grants.addAll(getKiasGrants(webDriver));
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)); grants.forEach(grantDto -> grantDto.setLeaderId(leaderId));
webDriver.quit();
return grants; return grants;
} }
private List<GrantDto> getKiasGrants(HtmlPage page) throws ParseException { public List<GrantDto> getKiasGrants(WebDriver webDriver) throws ParseException {
List<GrantDto> newGrants = new ArrayList<>(); List<GrantDto> newGrants = new ArrayList<>();
KiasPage kiasPage = new KiasPage(page); KiasPage kiasPage = new KiasPage(webDriver);
do { do {
newGrants.addAll(getGrantsFromPage(kiasPage)); newGrants.addAll(getGrantsFromPage(kiasPage));
} while (kiasPage.goToNextPage()); //проверка существования следующей страницы с грантами } while (kiasPage.goToNextPage()); //проверка существования следующей страницы с грантами
@ -55,13 +56,11 @@ public class KiasService {
private List<GrantDto> getGrantsFromPage(KiasPage kiasPage) throws ParseException { private List<GrantDto> getGrantsFromPage(KiasPage kiasPage) throws ParseException {
List<GrantDto> grants = new ArrayList<>(); List<GrantDto> grants = new ArrayList<>();
for (DomNode grantElement : kiasPage.getPageOfGrants()) { for (WebElement grantElement : kiasPage.getPageOfGrants()) {
if (kiasPage.isTableRowGrantLine(grantElement)) { GrantDto grantDto = new GrantDto(
GrantDto grantDto = new GrantDto( kiasPage.getGrantTitle(grantElement),
kiasPage.getGrantTitle(grantElement), kiasPage.parseDeadLineDate(grantElement));
kiasPage.parseDeadLineDate(grantElement)); grants.add(grantDto);
grants.add(grantDto);
}
} }
return grants; return grants;
} }
@ -70,4 +69,24 @@ public class KiasService {
return Arrays.asList(Calendar.getInstance().get(Calendar.YEAR), return Arrays.asList(Calendar.getInstance().get(Calendar.YEAR),
Calendar.getInstance().get(Calendar.YEAR) + 1); Calendar.getInstance().get(Calendar.YEAR) + 1);
} }
private WebDriver getDriver() {
System.setProperty(DRIVER_TYPE, getDriverExecutablePath());
final ChromeOptions chromeOptions = new ChromeOptions();
chromeOptions.addArguments("--headless");
return new ChromeDriver(chromeOptions);
}
private String getDriverExecutablePath() {
return KiasService.class.getClassLoader().getResource(
String.format(DRIVER_LOCATION, getDriverExecutable(isWindows()))).getFile();
}
private String getDriverExecutable(boolean isWindows) {
return isWindows ? WINDOWS_DRIVER : LINUX_DRIVER;
}
private boolean isWindows() {
return System.getProperty("os.name").toLowerCase().contains("windows");
}
} }

View File

@ -1,16 +1,16 @@
package ru.ulstu.index.controller; package ru.ulstu.index.controller;
import io.swagger.v3.oas.annotations.Hidden;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import ru.ulstu.core.controller.AdviceController; import ru.ulstu.core.controller.AdviceController;
import ru.ulstu.user.service.UserService; import ru.ulstu.user.service.UserService;
import springfox.documentation.annotations.ApiIgnore;
@Controller() @Controller()
@RequestMapping(value = "/index") @RequestMapping(value = "/index")
@Hidden @ApiIgnore
public class IndexController extends AdviceController { public class IndexController extends AdviceController {
public IndexController(UserService userService) { public IndexController(UserService userService) {
super(userService); super(userService);
@ -20,4 +20,4 @@ public class IndexController extends AdviceController {
public void currentUser(ModelMap modelMap) { public void currentUser(ModelMap modelMap) {
//нужен здесь для добавления параметров на стартовой странице //нужен здесь для добавления параметров на стартовой странице
} }
} }

View File

@ -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;
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View 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;
}
}

View File

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

View File

@ -1,7 +1,8 @@
package ru.ulstu.paper.controller; package ru.ulstu.paper.controller;
import io.swagger.v3.oas.annotations.Hidden; import org.springframework.http.HttpHeaders;
import jakarta.validation.Valid; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.validation.Errors; import org.springframework.validation.Errors;
@ -16,20 +17,27 @@ import ru.ulstu.paper.model.AutoCompleteData;
import ru.ulstu.paper.model.Paper; import ru.ulstu.paper.model.Paper;
import ru.ulstu.paper.model.PaperDto; import ru.ulstu.paper.model.PaperDto;
import ru.ulstu.paper.model.PaperListDto; import ru.ulstu.paper.model.PaperListDto;
import ru.ulstu.paper.model.ReferenceDto;
import ru.ulstu.paper.service.LatexService; import ru.ulstu.paper.service.LatexService;
import ru.ulstu.paper.service.PaperService; import ru.ulstu.paper.service.PaperService;
import ru.ulstu.user.model.User; import ru.ulstu.user.model.User;
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.springframework.util.StringUtils.isEmpty;
@Controller() @Controller()
@RequestMapping(value = "/papers") @RequestMapping(value = "/papers")
@Hidden @ApiIgnore
public class PaperController { public class PaperController {
private final PaperService paperService; private final PaperService paperService;
private final ConferenceService conferenceService; private final ConferenceService conferenceService;
@ -68,7 +76,7 @@ public class PaperController {
} }
@GetMapping("/paper") @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) { if (id != null && id > 0) {
modelMap.put("paperDto", paperService.findOneDto(id)); modelMap.put("paperDto", paperService.findOneDto(id));
} else { } else {
@ -99,6 +107,15 @@ public class PaperController {
return "/papers/paper"; return "/papers/paper";
} }
@PostMapping(value = "/paper", params = "addReference")
public String addReference(@Valid PaperDto paperDto, Errors errors) {
if (errors.hasErrors()) {
return "/papers/paper";
}
paperDto.getReferences().add(new ReferenceDto());
return "/papers/paper";
}
@ModelAttribute("allStatuses") @ModelAttribute("allStatuses")
public List<Paper.PaperStatus> getPaperStatuses() { public List<Paper.PaperStatus> getPaperStatuses() {
return paperService.getPaperStatuses(); return paperService.getPaperStatuses();
@ -123,6 +140,29 @@ public class PaperController {
return years; return years;
} }
@ModelAttribute("allFormatStandards")
public List<ReferenceDto.FormatStandard> getFormatStandards() {
return paperService.getFormatStandards();
}
@ModelAttribute("allReferenceTypes")
public List<ReferenceDto.ReferenceType> getReferenceTypes() {
return paperService.getReferenceTypes();
}
@PostMapping("/generatePdf")
public ResponseEntity<byte[]> getPdfFile(PaperDto paper) throws IOException, InterruptedException {
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Disposition", "attachment; filename='" +
URLEncoder.encode(paper.getTitle() + ".pdf", UTF_8.toString()) + "'");
return new ResponseEntity<>(latexService.generatePdfFromLatexFile(paper), headers, HttpStatus.OK);
}
@PostMapping("/getFormattedReferences")
public ResponseEntity<String> getFormattedReferences(PaperDto paperDto) {
return new ResponseEntity<>(paperService.getFormattedReferences(paperDto), new HttpHeaders(), HttpStatus.OK);
}
@ModelAttribute("autocompleteData") @ModelAttribute("autocompleteData")
public AutoCompleteData getAutocompleteData() { public AutoCompleteData getAutocompleteData() {
return paperService.getAutoCompleteData(); return paperService.getAutoCompleteData();
@ -130,7 +170,7 @@ public class PaperController {
private void filterEmptyDeadlines(PaperDto paperDto) { private void filterEmptyDeadlines(PaperDto paperDto) {
paperDto.setDeadlines(paperDto.getDeadlines().stream() paperDto.setDeadlines(paperDto.getDeadlines().stream()
.filter(dto -> dto.getDate() != null || !dto.getDescription().isEmpty()) .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
} }

View File

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

View File

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

View File

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

View File

@ -2,15 +2,13 @@ package ru.ulstu.paper.model;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.Size;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.format.annotation.DateTimeFormat; import org.hibernate.validator.constraints.NotEmpty;
import ru.ulstu.core.model.BaseEntity;
import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.file.model.FileDataDto; import ru.ulstu.file.model.FileDataDto;
import ru.ulstu.user.model.UserDto; import ru.ulstu.user.model.UserDto;
import javax.validation.constraints.Size;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -28,9 +26,7 @@ public class PaperDto {
private String title; private String title;
private Paper.PaperStatus status; private Paper.PaperStatus status;
private Paper.PaperType type; private Paper.PaperType type;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSSXXX")
private Date createDate; private Date createDate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSSXXX")
private Date updateDate; private Date updateDate;
@NotEmpty @NotEmpty
private List<Deadline> deadlines = new ArrayList<>(); private List<Deadline> deadlines = new ArrayList<>();
@ -93,9 +89,10 @@ public class PaperDto {
this.deadlines = paper.getDeadlines(); this.deadlines = paper.getDeadlines();
this.comment = paper.getComment(); this.comment = paper.getComment();
this.url = paper.getUrl(); this.url = paper.getUrl();
this.latexText = paper.getLatexText();
this.locked = paper.getLocked(); this.locked = paper.getLocked();
this.files = convert(paper.getFiles(), FileDataDto::new); 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.authors = convert(paper.getAuthors(), UserDto::new);
this.references = convert(paper.getReferences(), ReferenceDto::new); this.references = convert(paper.getReferences(), ReferenceDto::new);
} }
@ -215,7 +212,7 @@ public class PaperDto {
public String getAuthorsString() { public String getAuthorsString() {
return StringUtils.abbreviate(authors return StringUtils.abbreviate(authors
.stream() .stream()
.map(UserDto::getLastName) .map(author -> author.getLastName())
.collect(Collectors.joining(", ")), MAX_AUTHORS_LENGTH); .collect(Collectors.joining(", ")), MAX_AUTHORS_LENGTH);
} }

View File

@ -1,11 +1,12 @@
package ru.ulstu.paper.model; 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; import ru.ulstu.core.model.BaseEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@Entity @Entity
public class Reference extends BaseEntity { public class Reference extends BaseEntity {

View File

@ -8,7 +8,7 @@ public class ReferenceDto {
ARTICLE("Статья"), ARTICLE("Статья"),
BOOK("Книга"); BOOK("Книга");
private final String typeName; private String typeName;
ReferenceType(String name) { ReferenceType(String name) {
this.typeName = name; this.typeName = name;
@ -23,7 +23,7 @@ public class ReferenceDto {
GOST("ГОСТ"), GOST("ГОСТ"),
SPRINGER("Springer"); SPRINGER("Springer");
private final String standardName; private String standardName;
FormatStandard(String name) { FormatStandard(String name) {
this.standardName = name; this.standardName = name;

View File

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

View File

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

View File

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

View File

@ -15,14 +15,12 @@ import ru.ulstu.paper.model.Reference;
import ru.ulstu.paper.model.ReferenceDto; import ru.ulstu.paper.model.ReferenceDto;
import ru.ulstu.paper.repository.PaperRepository; import ru.ulstu.paper.repository.PaperRepository;
import ru.ulstu.paper.repository.ReferenceRepository; import ru.ulstu.paper.repository.ReferenceRepository;
import ru.ulstu.ping.service.PingService;
import ru.ulstu.timeline.service.EventService; import ru.ulstu.timeline.service.EventService;
import ru.ulstu.user.model.User; import ru.ulstu.user.model.User;
import ru.ulstu.user.service.UserService; import ru.ulstu.user.service.UserService;
import java.io.IOException; import java.io.IOException;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.time.temporal.ChronoUnit;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.HashSet; import java.util.HashSet;
@ -56,7 +54,6 @@ public class PaperService {
private final FileService fileService; private final FileService fileService;
private final EventService eventService; private final EventService eventService;
private final ReferenceRepository referenceRepository; private final ReferenceRepository referenceRepository;
private final PingService pingService;
public PaperService(PaperRepository paperRepository, public PaperService(PaperRepository paperRepository,
ReferenceRepository referenceRepository, ReferenceRepository referenceRepository,
@ -64,8 +61,7 @@ public class PaperService {
PaperNotificationService paperNotificationService, PaperNotificationService paperNotificationService,
UserService userService, UserService userService,
DeadlineService deadlineService, DeadlineService deadlineService,
EventService eventService, EventService eventService) {
PingService pingService) {
this.paperRepository = paperRepository; this.paperRepository = paperRepository;
this.referenceRepository = referenceRepository; this.referenceRepository = referenceRepository;
this.fileService = fileService; this.fileService = fileService;
@ -73,7 +69,6 @@ public class PaperService {
this.userService = userService; this.userService = userService;
this.deadlineService = deadlineService; this.deadlineService = deadlineService;
this.eventService = eventService; this.eventService = eventService;
this.pingService = pingService;
} }
public List<Paper> findAll() { public List<Paper> findAll() {
@ -81,7 +76,9 @@ public class PaperService {
} }
public List<PaperDto> findAllDto() { 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() { public List<Paper> findAllActive() {
@ -91,38 +88,35 @@ public class PaperService {
.collect(toList()); .collect(toList());
} }
public List<Paper> findAllActiveByCurrentUser() {
return findAllActive()
.stream()
.filter(paper -> paper.getAuthors().contains(userService.getCurrentUser()))
.collect(toList());
}
public List<PaperDto> findAllActiveDto() { public List<PaperDto> findAllActiveDto() {
return convert(findAllActive(), PaperDto::new); return convert(findAllActive(), PaperDto::new);
} }
public PaperDto findOneDto(Integer id) { public PaperDto findOneDto(Integer id) {
return new PaperDto(paperRepository.findById(id).orElseThrow()); return new PaperDto(paperRepository.findOne(id));
} }
@Transactional @Transactional
public Integer create(PaperDto paperDto) throws IOException { public Integer create(PaperDto paperDto) throws IOException {
Paper newPaper = copyFromDto(new Paper(), paperDto); Paper newPaper = copyFromDto(new Paper(), paperDto);
return create(newPaper).getId(); newPaper = paperRepository.save(newPaper);
paperNotificationService.sendCreateNotification(newPaper);
eventService.createFromPaper(newPaper);
return newPaper.getId();
} }
@Transactional @Transactional
public Paper create(Paper paper) { public Paper create(Paper paper) {
Paper newPaper = paperRepository.save(paper); Paper newPaper = paperRepository.save(paper);
newPaper.setCreateDate(new Date());
paperNotificationService.sendCreateNotification(newPaper); paperNotificationService.sendCreateNotification(newPaper);
eventService.createFromPaper(newPaper);
return newPaper; return newPaper;
} }
private Paper copyFromDto(Paper paper, PaperDto paperDto) throws IOException { private Paper copyFromDto(Paper paper, PaperDto paperDto) throws IOException {
paper.setComment(paperDto.getComment()); paper.setComment(paperDto.getComment());
paper.setUrl(paperDto.getUrl()); paper.setUrl(paperDto.getUrl());
paper.setLatexText(paperDto.getLatexText());
paper.setCreateDate(paper.getCreateDate() == null ? new Date() : paper.getCreateDate()); paper.setCreateDate(paper.getCreateDate() == null ? new Date() : paper.getCreateDate());
paper.setLocked(paperDto.getLocked()); paper.setLocked(paperDto.getLocked());
paper.setStatus(paperDto.getStatus() == null ? DRAFT : paperDto.getStatus()); paper.setStatus(paperDto.getStatus() == null ? DRAFT : paperDto.getStatus());
@ -141,7 +135,7 @@ public class PaperService {
return paper; return paper;
} }
private List<Reference> saveOrCreateReferences(List<ReferenceDto> references) { public List<Reference> saveOrCreateReferences(List<ReferenceDto> references) {
return references return references
.stream() .stream()
.filter(reference -> !reference.getDeleted()) .filter(reference -> !reference.getDeleted())
@ -150,15 +144,15 @@ public class PaperService {
} }
@Transactional @Transactional
private Reference updateReference(ReferenceDto referenceDto) { public Reference updateReference(ReferenceDto referenceDto) {
Reference updateReference = referenceRepository.getOne(referenceDto.getId()); Reference updateReference = referenceRepository.findOne(referenceDto.getId());
copyFromDto(updateReference, referenceDto); copyFromDto(updateReference, referenceDto);
referenceRepository.save(updateReference); referenceRepository.save(updateReference);
return updateReference; return updateReference;
} }
@Transactional @Transactional
private Reference createReference(ReferenceDto referenceDto) { public Reference createReference(ReferenceDto referenceDto) {
Reference newReference = new Reference(); Reference newReference = new Reference();
copyFromDto(newReference, referenceDto); copyFromDto(newReference, referenceDto);
newReference = referenceRepository.save(newReference); newReference = referenceRepository.save(newReference);
@ -178,7 +172,7 @@ public class PaperService {
@Transactional @Transactional
public Integer update(PaperDto paperDto) throws IOException { public Integer update(PaperDto paperDto) throws IOException {
Paper paper = paperRepository.getOne(paperDto.getId()); Paper paper = paperRepository.findOne(paperDto.getId());
Paper.PaperStatus oldStatus = paper.getStatus(); Paper.PaperStatus oldStatus = paper.getStatus();
Set<User> oldAuthors = new HashSet<>(paper.getAuthors()); Set<User> oldAuthors = new HashSet<>(paper.getAuthors());
@ -208,29 +202,10 @@ public class PaperService {
return paper.getId(); 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 @Transactional
public void delete(Integer paperId) { public void delete(Integer paperId) {
delete(paperRepository.getOne(paperId)); Paper paper = paperRepository.findOne(paperId);
paperRepository.delete(paper);
} }
public List<Paper.PaperStatus> getPaperStatuses() { public List<Paper.PaperStatus> getPaperStatuses() {
@ -313,27 +288,19 @@ public class PaperService {
} }
} }
public void save(Paper paper) {
if (isEmpty(paper.getId())) {
create(paper);
} else {
update(paper);
}
}
public PaperDto findById(Integer paperId) { public PaperDto findById(Integer paperId) {
return new PaperDto(paperRepository.getOne(paperId)); return new PaperDto(paperRepository.findOne(paperId));
} }
public Paper findPaperById(Integer paperId) { public Paper findPaperById(Integer paperId) {
return paperRepository.getOne(paperId); return paperRepository.findOne(paperId);
} }
public List<Paper> findAllNotSelect(List<Integer> paperIds) { public List<Paper> findAllNotSelect(List<Integer> paperIds) {
if (!paperIds.isEmpty()) { if (!paperIds.isEmpty()) {
return sortPapers(paperRepository.findByIdNotInAndConferenceIsNullAndStatusNot(paperIds, COMPLETED)); return sortPapers(paperRepository.findByIdNotInAndConferencesIsNullAndStatusNot(paperIds, COMPLETED));
} else { } else {
return sortPapers(paperRepository.findByConferenceIsNullAndStatusNot(COMPLETED)); return sortPapers(paperRepository.findByConferencesIsNullAndStatusNot(COMPLETED));
} }
} }
@ -387,7 +354,7 @@ public class PaperService {
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
private String getGostReference(ReferenceDto referenceDto) { public String getGostReference(ReferenceDto referenceDto) {
return MessageFormat.format(referenceDto.getReferenceType() == BOOK ? "{0} {1} - {2}{3}. - {4}с." : "{0} {1}{5} {2}{3}. С. {4}.", return MessageFormat.format(referenceDto.getReferenceType() == BOOK ? "{0} {1} - {2}{3}. - {4}с." : "{0} {1}{5} {2}{3}. С. {4}.",
referenceDto.getAuthors(), referenceDto.getAuthors(),
referenceDto.getPublicationTitle(), referenceDto.getPublicationTitle(),
@ -397,7 +364,7 @@ public class PaperService {
StringUtils.isEmpty(referenceDto.getJournalOrCollectionTitle()) ? "." : " // " + referenceDto.getJournalOrCollectionTitle() + "."); StringUtils.isEmpty(referenceDto.getJournalOrCollectionTitle()) ? "." : " // " + referenceDto.getJournalOrCollectionTitle() + ".");
} }
private String getSpringerReference(ReferenceDto referenceDto) { public String getSpringerReference(ReferenceDto referenceDto) {
return MessageFormat.format("{0} ({1}) {2}.{3} {4}pp {5}", return MessageFormat.format("{0} ({1}) {2}.{3} {4}pp {5}",
referenceDto.getAuthors(), referenceDto.getAuthors(),
referenceDto.getPublicationYear() != null ? referenceDto.getPublicationYear().toString() : "", referenceDto.getPublicationYear() != null ? referenceDto.getPublicationYear().toString() : "",
@ -419,27 +386,4 @@ public class PaperService {
autoCompleteData.setPublishers(referenceRepository.findDistinctPublishers()); autoCompleteData.setPublishers(referenceRepository.findDistinctPublishers());
return autoCompleteData; 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);
}
} }

View File

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

View File

@ -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);
}
}

View File

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

View File

@ -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);
}
}
}

View File

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

View File

@ -1,7 +1,5 @@
package ru.ulstu.project.controller; package ru.ulstu.project.controller;
import io.swagger.v3.oas.annotations.Hidden;
import jakarta.validation.Valid;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.validation.Errors; import org.springframework.validation.Errors;
@ -11,14 +9,15 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.grant.model.GrantDto; import ru.ulstu.grant.model.GrantDto;
import ru.ulstu.project.model.Project; import ru.ulstu.project.model.Project;
import ru.ulstu.project.model.ProjectDto; import ru.ulstu.project.model.ProjectDto;
import ru.ulstu.project.service.ProjectService; import ru.ulstu.project.service.ProjectService;
import ru.ulstu.user.model.User; import ru.ulstu.user.model.User;
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -27,7 +26,7 @@ import static org.springframework.util.StringUtils.isEmpty;
@Controller() @Controller()
@RequestMapping(value = "/projects") @RequestMapping(value = "/projects")
@Hidden @ApiIgnore
public class ProjectController { public class ProjectController {
private final ProjectService projectService; private final ProjectService projectService;
@ -118,10 +117,4 @@ public class ProjectController {
.filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription())) .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
@ResponseBody
@PostMapping(value = "/ping")
public void ping(@RequestParam("projectId") int projectId) throws IOException {
projectService.ping(projectId);
}
} }

View File

@ -1,29 +1,28 @@
package ru.ulstu.project.model; 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.Fetch;
import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchMode;
import org.hibernate.validator.constraints.NotBlank;
import ru.ulstu.core.model.BaseEntity; import ru.ulstu.core.model.BaseEntity;
import ru.ulstu.core.model.EventSource; 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.deadline.model.Deadline;
import ru.ulstu.file.model.FileData; import ru.ulstu.file.model.FileData;
import ru.ulstu.grant.model.Grant; import ru.ulstu.grant.model.Grant;
import ru.ulstu.timeline.model.Event; import ru.ulstu.timeline.model.Event;
import ru.ulstu.user.model.User; import ru.ulstu.user.model.User;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.validation.constraints.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
@ -31,8 +30,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
@Entity @Entity
@DiscriminatorValue("PROJECT") public class Project extends BaseEntity implements UserContainer, EventSource {
public class Project extends BaseEntity implements UserActivity, EventSource {
public enum ProjectStatus { public enum ProjectStatus {
TECHNICAL_TASK("Техническое задание"), TECHNICAL_TASK("Техническое задание"),
@ -42,7 +40,7 @@ public class Project extends BaseEntity implements UserActivity, EventSource {
CLOSED("Закрыт"), CLOSED("Закрыт"),
FAILED("Провалены сроки"); FAILED("Провалены сроки");
private final String statusName; private String statusName;
ProjectStatus(String statusName) { ProjectStatus(String statusName) {
this.statusName = statusName; this.statusName = statusName;
@ -174,13 +172,10 @@ public class Project extends BaseEntity implements UserActivity, EventSource {
this.executors = executors; this.executors = executors;
} }
public Set<User> getUsers() {
return new HashSet<>(getExecutors());
}
@Override @Override
public Set<User> getActivityUsers() { public Set<User> getUsers() {
return new HashSet<>(); Set<User> users = new HashSet<User>(getExecutors());
return users;
} }
public List<Grant> getGrants() { public List<Grant> getGrants() {

View File

@ -2,7 +2,7 @@ package ru.ulstu.project.model;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
import org.thymeleaf.util.StringUtils; import org.thymeleaf.util.StringUtils;
import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.file.model.FileDataDto; import ru.ulstu.file.model.FileDataDto;

View File

@ -8,7 +8,6 @@ import ru.ulstu.file.model.FileDataDto;
import ru.ulstu.file.service.FileService; import ru.ulstu.file.service.FileService;
import ru.ulstu.grant.model.GrantDto; import ru.ulstu.grant.model.GrantDto;
import ru.ulstu.grant.repository.GrantRepository; import ru.ulstu.grant.repository.GrantRepository;
import ru.ulstu.ping.service.PingService;
import ru.ulstu.project.model.Project; import ru.ulstu.project.model.Project;
import ru.ulstu.project.model.ProjectDto; import ru.ulstu.project.model.ProjectDto;
import ru.ulstu.project.repository.ProjectRepository; import ru.ulstu.project.repository.ProjectRepository;
@ -36,22 +35,19 @@ public class ProjectService {
private final FileService fileService; private final FileService fileService;
private final EventService eventService; private final EventService eventService;
private final UserService userService; private final UserService userService;
private final PingService pingService;
public ProjectService(ProjectRepository projectRepository, public ProjectService(ProjectRepository projectRepository,
DeadlineService deadlineService, DeadlineService deadlineService,
GrantRepository grantRepository, GrantRepository grantRepository,
FileService fileService, FileService fileService,
EventService eventService, EventService eventService,
UserService userService, UserService userService) {
PingService pingService) {
this.projectRepository = projectRepository; this.projectRepository = projectRepository;
this.deadlineService = deadlineService; this.deadlineService = deadlineService;
this.grantRepository = grantRepository; this.grantRepository = grantRepository;
this.fileService = fileService; this.fileService = fileService;
this.eventService = eventService; this.eventService = eventService;
this.userService = userService; this.userService = userService;
this.pingService = pingService;
} }
public List<Project> findAll() { public List<Project> findAll() {
@ -65,7 +61,7 @@ public class ProjectService {
} }
public ProjectDto findOneDto(Integer id) { public ProjectDto findOneDto(Integer id) {
return new ProjectDto(projectRepository.getOne(id)); return new ProjectDto(projectRepository.findOne(id));
} }
public List<Project.ProjectStatus> getProjectStatuses() { public List<Project.ProjectStatus> getProjectStatuses() {
@ -81,8 +77,8 @@ public class ProjectService {
} }
@Transactional @Transactional
private Project update(ProjectDto projectDto) throws IOException { public Project update(ProjectDto projectDto) throws IOException {
Project project = projectRepository.getOne(projectDto.getId()); Project project = projectRepository.findOne(projectDto.getId());
projectRepository.save(copyFromDto(project, projectDto)); projectRepository.save(copyFromDto(project, projectDto));
eventService.updateProjectDeadlines(project); eventService.updateProjectDeadlines(project);
for (FileDataDto file : projectDto.getFiles().stream() for (FileDataDto file : projectDto.getFiles().stream()
@ -95,8 +91,8 @@ public class ProjectService {
@Transactional @Transactional
public boolean delete(Integer projectId) throws IOException { public boolean delete(Integer projectId) throws IOException {
if (projectRepository.existsById(projectId)) { if (projectRepository.exists(projectId)) {
Project project = projectRepository.getOne(projectId); Project project = projectRepository.findOne(projectId);
projectRepository.delete(project); projectRepository.delete(project);
return true; return true;
} }
@ -108,7 +104,7 @@ public class ProjectService {
project.setStatus(projectDto.getStatus() == null ? TECHNICAL_TASK : projectDto.getStatus()); project.setStatus(projectDto.getStatus() == null ? TECHNICAL_TASK : projectDto.getStatus());
project.setTitle(projectDto.getTitle()); project.setTitle(projectDto.getTitle());
if (projectDto.getGrant() != null && projectDto.getGrant().getId() != null) { if (projectDto.getGrant() != null && projectDto.getGrant().getId() != null) {
project.setGrant(grantRepository.getOne(projectDto.getGrant().getId())); project.setGrant(grantRepository.findOne(projectDto.getGrant().getId()));
} }
project.setRepository(projectDto.getRepository()); project.setRepository(projectDto.getRepository());
project.setDeadlines(deadlineService.saveOrCreate(projectDto.getDeadlines())); project.setDeadlines(deadlineService.saveOrCreate(projectDto.getDeadlines()));
@ -139,24 +135,21 @@ public class ProjectService {
} }
public Project findById(Integer id) { public Project findById(Integer id) {
return projectRepository.getOne(id); return projectRepository.findOne(id);
} }
public List<User> getProjectExecutors(ProjectDto projectDto) { public List<User> getProjectExecutors(ProjectDto projectDto) {
return userService.findAll(); List<User> users = userService.findAll();
} return users;
@Transactional
public void ping(int projectId) throws IOException {
pingService.addPing(findById(projectId));
} }
public List<GrantDto> getAllGrants() { public List<GrantDto> getAllGrants() {
return convert(grantRepository.findAll(), GrantDto::new); List<GrantDto> grants = convert(grantRepository.findAll(), GrantDto::new);
return grants;
} }
private List<GrantDto> getProjectGrants(List<Integer> grantIds) { public List<GrantDto> getProjectGrants(List<Integer> grantIds) {
return convert(grantRepository.findAllById(grantIds), GrantDto::new); return convert(grantRepository.findAll(grantIds), GrantDto::new);
} }
public void attachGrant(ProjectDto projectDto) { public void attachGrant(ProjectDto projectDto) {

View File

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

View File

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

View File

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

View File

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

View File

@ -1,28 +1,30 @@
package ru.ulstu.students.model; 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.Fetch;
import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchMode;
import org.hibernate.validator.constraints.NotBlank;
import ru.ulstu.core.model.BaseEntity; import ru.ulstu.core.model.BaseEntity;
import ru.ulstu.core.model.EventSource; import ru.ulstu.core.model.EventSource;
import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.tags.model.Tag; import ru.ulstu.tags.model.Tag;
import ru.ulstu.timeline.model.Event; import ru.ulstu.timeline.model.Event;
import ru.ulstu.user.model.User; import ru.ulstu.user.model.User;
import ru.ulstu.user.service.UserService;
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 javax.persistence.Transient;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
@ -37,7 +39,7 @@ public class Task extends BaseEntity implements EventSource {
FAILED("Провалены сроки"), FAILED("Провалены сроки"),
LOADED_FROM_KIAS("Загружен автоматически"); LOADED_FROM_KIAS("Загружен автоматически");
private final String statusName; private String statusName;
TaskStatus(String name) { TaskStatus(String name) {
this.statusName = name; this.statusName = name;
@ -53,10 +55,17 @@ public class Task extends BaseEntity implements EventSource {
private String description; private String description;
@Transient
private UserService userService;
public Task() { public Task() {
} }
public Task(UserService userService) {
this.userService = userService;
}
@Enumerated(value = EnumType.STRING) @Enumerated(value = EnumType.STRING)
private TaskStatus status = TaskStatus.IN_WORK; private TaskStatus status = TaskStatus.IN_WORK;

View File

@ -2,8 +2,8 @@ package ru.ulstu.students.model;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotEmpty;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.hibernate.validator.constraints.NotEmpty;
import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.tags.model.Tag; import ru.ulstu.tags.model.Tag;

View File

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

View File

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

View File

@ -55,7 +55,7 @@ public class TaskService {
} }
public List<Task> findAll() { public List<Task> findAll() {
return taskRepository.findAll(Sort.by(Sort.Direction.DESC, "createDate")); return taskRepository.findAll(new Sort(Sort.Direction.DESC, "createDate"));
} }
public List<TaskDto> findAllDto() { public List<TaskDto> findAllDto() {
@ -65,7 +65,7 @@ public class TaskService {
} }
public TaskDto findOneDto(Integer id) { public TaskDto findOneDto(Integer id) {
return new TaskDto(taskRepository.getOne(id)); return new TaskDto(taskRepository.findOne(id));
} }
public List<TaskDto> filter(TaskFilterDto filterDto) { public List<TaskDto> filter(TaskFilterDto filterDto) {
@ -101,8 +101,8 @@ public class TaskService {
} }
@Transactional @Transactional
private Integer update(TaskDto taskDto) throws IOException { public Integer update(TaskDto taskDto) throws IOException {
Task task = taskRepository.getOne(taskDto.getId()); Task task = taskRepository.findOne(taskDto.getId());
taskRepository.save(copyFromDto(task, taskDto)); taskRepository.save(copyFromDto(task, taskDto));
eventService.updateTaskDeadlines(task); eventService.updateTaskDeadlines(task);
return task.getId(); return task.getId();
@ -110,13 +110,13 @@ public class TaskService {
@Transactional @Transactional
public boolean delete(Integer taskId) throws IOException { public boolean delete(Integer taskId) throws IOException {
if (taskRepository.existsById(taskId)) { if (taskRepository.exists(taskId)) {
Task scheduleTask = taskRepository.getOne(taskId); Task scheduleTask = taskRepository.findOne(taskId);
Scheduler sch = schedulerRepository.findOneByTask(scheduleTask); Scheduler sch = schedulerRepository.findOneByTask(scheduleTask);
if (sch != null) { if (sch != null) {
schedulerRepository.deleteById(sch.getId()); schedulerRepository.delete(sch.getId());
} }
taskRepository.deleteById(taskId); taskRepository.delete(taskId);
return true; return true;
} }
return false; return false;

View File

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

View File

@ -33,17 +33,17 @@ public class TagService {
} }
@Transactional @Transactional
private Tag getExistById(Tag tag) { public Tag getExistById(Tag tag) {
return tagRepository.getOne(tag.getId()); return tagRepository.findOne(tag.getId());
} }
@Transactional @Transactional
private Tag isExistByName(String tagName) { public Tag isExistByName(String tagName) {
return tagRepository.findByName(tagName); return tagRepository.findByName(tagName);
} }
@Transactional @Transactional
private Tag create(Tag tag) { public Tag create(Tag tag) {
Tag newTag = new Tag(); Tag newTag = new Tag();
newTag.setTagName(tag.getTagName()); newTag.setTagName(tag.getTagName());
newTag = tagRepository.save(newTag); newTag = tagRepository.save(newTag);
@ -55,7 +55,7 @@ public class TagService {
} }
public Tag findById(Integer tagId) { public Tag findById(Integer tagId) {
return tagRepository.getOne(tagId); return tagRepository.findOne(tagId);
} }
} }

View File

@ -1,6 +1,5 @@
package ru.ulstu.timeline.controller; package ru.ulstu.timeline.controller;
import jakarta.validation.Valid;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
@ -14,11 +13,15 @@ import ru.ulstu.core.model.response.Response;
import ru.ulstu.timeline.model.EventDto; import ru.ulstu.timeline.model.EventDto;
import ru.ulstu.timeline.service.EventService; import ru.ulstu.timeline.service.EventService;
import javax.validation.Valid;
import java.util.List; import java.util.List;
import static ru.ulstu.timeline.controller.EventController.URL;
@RestController @RestController
@RequestMapping(Constants.API_1_0 + "events") @RequestMapping(URL)
public class EventController { public class EventController {
public static final String URL = Constants.API_1_0 + "events";
private final EventService eventService; private final EventService eventService;
@ -37,18 +40,18 @@ public class EventController {
} }
@PostMapping @PostMapping
public Response<Integer> createEvent(@RequestBody @Valid EventDto timelineDto) { public Response createEvent(@RequestBody @Valid EventDto timelineDto) {
return new Response<>(eventService.create(timelineDto)); return new Response(eventService.create(timelineDto));
} }
@PutMapping @PutMapping
public Response<Integer> updateEvent(@RequestBody @Valid EventDto eventDto) { public Response updateEvent(@RequestBody @Valid EventDto eventDto) {
return new Response<>(eventService.update(eventDto)); return new Response(eventService.update(eventDto));
} }
@DeleteMapping("/{event-id}") @DeleteMapping("/{event-id}")
public Response<Boolean> delete(@PathVariable("event-id") Integer eventId) { public Response delete(@PathVariable("event-id") Integer eventId) {
eventService.delete(eventId); eventService.delete(eventId);
return new Response<>(Boolean.TRUE); return new Response(true);
} }
} }

Some files were not shown because too many files have changed in this diff Show More