diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb4c0ed..b064dce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,16 +1,16 @@ -image: romanov73/is:ng-tracker-container +image: romanov73/is:ng-tracker-container-11 variables: GRADLE_OPTS: "-Dorg.gradle.daemon=false" before_script: - - service postgresql stop - - service postgresql start - - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - git log --pretty="%cn;%cd;%s" > src/main/resources/commits.log + - service postgresql stop + - service postgresql start + - eval $(ssh-agent -s) + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - git log --pretty="%cn;%cd;%s" > src/main/resources/commits.log build: stage: build diff --git a/build.gradle b/build.gradle index 9b29d62..232cd74 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - versionSpringBoot = '1.5.10.RELEASE' + versionSpringBoot = '2.1.6.RELEASE' } repositories { @@ -105,13 +105,14 @@ dependencies { 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: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect' + compile group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity5' 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.postgresql', name: 'postgresql', version: '42.2.5' - compile group: 'org.liquibase', name: 'liquibase-core', version: '3.5.3' + compile group: 'org.liquibase', name: 'liquibase-core', version: '3.6.3' compile group: 'com.mattbertolini', name: 'liquibase-slf4j', version: '2.0.0' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7' @@ -129,8 +130,11 @@ dependencies { compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.6.0' compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.6.0' + compile group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.35.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' + testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19' } \ No newline at end of file diff --git a/deploy/gdccloud/deploy.sh b/deploy/gdccloud/deploy.sh index de785fd..50d3d5c 100644 --- a/deploy/gdccloud/deploy.sh +++ b/deploy/gdccloud/deploy.sh @@ -18,6 +18,6 @@ fi ssh $USERSERVER "cd /tmp && rm -rf $ARTIFACT_NAME*.jar && echo `date` 'killed' >> log_$ARTIFACT_NAME" scp build/libs/$ARTIFACT_NAME-0.1.0-SNAPSHOT.jar $USERSERVER:/tmp/$ARTIFACT_NAME-0.1.0-SNAPSHOT.jar -ssh $USERSERVER -f "cd /tmp/ && /opt/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" & +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 --ng-tracker.driver-path=/home/user >> /home/user/logfile_$ARTIFACT_NAME" & sleep 10 echo "is deployed" \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 568c50b..663c448 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip diff --git a/src/main/java/ru/ulstu/commit/controller/CommitController.java b/src/main/java/ru/ulstu/commit/controller/CommitController.java index 44f99cb..3d929a4 100644 --- a/src/main/java/ru/ulstu/commit/controller/CommitController.java +++ b/src/main/java/ru/ulstu/commit/controller/CommitController.java @@ -4,20 +4,17 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import ru.ulstu.configuration.Constants; -import ru.ulstu.core.model.response.PageableItems; import ru.ulstu.commit.model.CommitListDto; import ru.ulstu.commit.service.CommitService; +import ru.ulstu.configuration.Constants; +import ru.ulstu.core.model.response.PageableItems; import ru.ulstu.core.model.response.Response; import ru.ulstu.odin.controller.OdinController; import ru.ulstu.odin.model.OdinVoid; -import static ru.ulstu.commit.controller.CommitController.URL; - @RestController -@RequestMapping(URL) +@RequestMapping(Constants.API_1_0 + "commits") public class CommitController extends OdinController { - public static final String URL = Constants.API_1_0 + "commits"; private final CommitService commitService; public CommitController(CommitService commitService) { diff --git a/src/main/java/ru/ulstu/conference/model/Conference.java b/src/main/java/ru/ulstu/conference/model/Conference.java index 4df1a1f..d11901f 100644 --- a/src/main/java/ru/ulstu/conference/model/Conference.java +++ b/src/main/java/ru/ulstu/conference/model/Conference.java @@ -2,14 +2,18 @@ package ru.ulstu.conference.model; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.validator.constraints.NotBlank; import org.springframework.format.annotation.DateTimeFormat; import ru.ulstu.core.model.BaseEntity; +import ru.ulstu.core.model.EventSource; +import ru.ulstu.core.model.UserActivity; import ru.ulstu.deadline.model.Deadline; import ru.ulstu.paper.model.Paper; +import ru.ulstu.timeline.model.Event; +import ru.ulstu.user.model.User; import javax.persistence.CascadeType; import javax.persistence.Column; +import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.JoinColumn; @@ -20,15 +24,19 @@ import javax.persistence.OrderBy; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.validation.constraints.NotBlank; import java.util.ArrayList; import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; @Entity @Table(name = "conference") -public class Conference extends BaseEntity { +@DiscriminatorValue("CONFERENCE") +public class Conference extends BaseEntity implements UserActivity, EventSource { @NotBlank private String title; @@ -71,6 +79,19 @@ public class Conference extends BaseEntity { return title; } + @Override + public List getRecipients() { + List list = new ArrayList<>(); + + getUsers().forEach(conferenceUser -> list.add(conferenceUser.getUser())); + return list; + } + + @Override + public void addObjectToEvent(Event event) { + event.setConference(this); + } + public void setTitle(String title) { this.title = title; } @@ -147,4 +168,9 @@ public class Conference extends BaseEntity { .filter(d -> d.getDate().after(new Date())) .findFirst(); } + + @Override + public Set getActivityUsers() { + return getUsers().stream().map(ConferenceUser::getUser).collect(Collectors.toSet()); + } } diff --git a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java index 5759f4e..7246854 100644 --- a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java +++ b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java @@ -2,14 +2,15 @@ package ru.ulstu.conference.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; import org.springframework.format.annotation.DateTimeFormat; +import ru.ulstu.core.model.BaseEntity; import ru.ulstu.deadline.model.Deadline; import ru.ulstu.name.NameContainer; import ru.ulstu.paper.model.Paper; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.Date; @@ -90,8 +91,8 @@ public class ConferenceDto extends NameContainer { this.beginDate = conference.getBeginDate(); this.endDate = conference.getEndDate(); this.deadlines = conference.getDeadlines(); - this.userIds = convert(conference.getUsers(), user -> user.getId()); - this.paperIds = convert(conference.getPapers(), paper -> paper.getId()); + this.userIds = convert(conference.getUsers(), BaseEntity::getId); + this.paperIds = convert(conference.getPapers(), BaseEntity::getId); this.users = conference.getUsers(); this.papers = conference.getPapers(); } diff --git a/src/main/java/ru/ulstu/conference/model/ConferenceUser.java b/src/main/java/ru/ulstu/conference/model/ConferenceUser.java index 63eeb6d..f00b9fa 100644 --- a/src/main/java/ru/ulstu/conference/model/ConferenceUser.java +++ b/src/main/java/ru/ulstu/conference/model/ConferenceUser.java @@ -22,7 +22,7 @@ public class ConferenceUser extends BaseEntity { INTRAMURAL("Очная"), EXTRAMURAL("Заочная"); - private String participationName; + private final String participationName; Participation(String name) { this.participationName = name; @@ -38,7 +38,7 @@ public class ConferenceUser extends BaseEntity { REPORT("Доклад"), PRESENTATION("Презентация"); - private String depositName; + private final String depositName; Deposit(String name) { this.depositName = name; diff --git a/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java b/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java index 2b0a428..8f9e05f 100644 --- a/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java +++ b/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java @@ -29,4 +29,8 @@ public interface ConferenceRepository extends JpaRepository @Override @Query("SELECT title FROM Conference c WHERE (c.title = :name) AND (:id IS NULL OR c.id != :id) ") String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id); + + @Query("SELECT c FROM Conference c LEFT JOIN c.users u WHERE (:user IS NULL OR u.user = :user) " + + "AND (u.participation = 'INTRAMURAL') AND (c.beginDate <= CURRENT_DATE) AND (c.endDate >= CURRENT_DATE)") + Conference findActiveByUser(@Param("user") User user); } diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java b/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java index ddb8130..961d369 100644 --- a/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java +++ b/src/main/java/ru/ulstu/conference/service/ConferenceNotificationService.java @@ -63,7 +63,7 @@ public class ConferenceNotificationService { public void sendCreateNotification(Conference conference) { Map variables = ImmutableMap.of("conference", conference); - sendForAllUsers(variables, TEMPLATE_CREATE, String.format(TITLE_CREATE, conference.getTitle())); + sendForAllUsers(variables, String.format(TITLE_CREATE, conference.getTitle())); } public void updateDeadlineNotification(Conference conference) { @@ -76,8 +76,8 @@ public class ConferenceNotificationService { sendForAllParticipants(variables, conference, TEMPLATE_UPDATE_DATES, String.format(TITLE_UPDATE_DATES, conference.getTitle())); } - private void sendForAllUsers(Map variables, String template, String title) { - userService.findAll().forEach(user -> mailService.sendEmailFromTemplate(variables, user, template, title)); + private void sendForAllUsers(Map variables, String title) { + userService.findAll().forEach(user -> mailService.sendEmailFromTemplate(variables, user, ConferenceNotificationService.TEMPLATE_CREATE, title)); } private void sendForAllParticipants(Map variables, Conference conference, String template, String title) { diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java index 4ee4198..470e712 100644 --- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java +++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java @@ -16,7 +16,6 @@ import ru.ulstu.deadline.service.DeadlineService; import ru.ulstu.name.BaseService; import ru.ulstu.paper.model.Paper; import ru.ulstu.paper.service.PaperService; -import ru.ulstu.ping.model.Ping; import ru.ulstu.ping.service.PingService; import ru.ulstu.timeline.service.EventService; import ru.ulstu.user.model.User; @@ -25,6 +24,7 @@ import ru.ulstu.user.service.UserService; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -65,7 +65,7 @@ public class ConferenceService extends BaseService { } public ConferenceDto getExistConferenceById(Integer id) { - ConferenceDto conferenceDto = new ConferenceDto(conferenceRepository.findOne(id)); + ConferenceDto conferenceDto = new ConferenceDto(conferenceRepository.getOne(id)); conferenceDto.setNotSelectedPapers(getNotSelectPapers(conferenceDto.getPaperIds())); conferenceDto.setDisabledTakePart(isCurrentUserParticipant(conferenceDto.getUsers())); return conferenceDto; @@ -96,7 +96,6 @@ public class ConferenceService extends BaseService { checkUniqueName(conferenceDto, errors, conferenceDto.getId(), - "title", "Конференция с таким именем уже существует"); if (errors.hasErrors()) { return false; @@ -116,13 +115,13 @@ public class ConferenceService extends BaseService { Conference newConference = copyFromDto(new Conference(), conferenceDto); newConference = conferenceRepository.save(newConference); conferenceNotificationService.sendCreateNotification(newConference); - eventService.createFromConference(newConference); + eventService.createFromObject(newConference, Collections.emptyList(), false, "конференции"); return newConference; } @Transactional - public Conference update(ConferenceDto conferenceDto) throws IOException { - Conference conference = conferenceRepository.findOne(conferenceDto.getId()); + private Conference update(ConferenceDto conferenceDto) throws IOException { + Conference conference = conferenceRepository.getOne(conferenceDto.getId()); List oldDeadlines = conference.getDeadlines().stream() .map(this::copyDeadline) .collect(Collectors.toList()); @@ -140,9 +139,9 @@ public class ConferenceService extends BaseService { @Transactional public boolean delete(Integer conferenceId) { - if (conferenceRepository.exists(conferenceId)) { - eventService.removeConferencesEvent(conferenceRepository.findOne(conferenceId)); - conferenceRepository.delete(conferenceId); + if (conferenceRepository.existsById(conferenceId)) { + eventService.removeConferencesEvent(conferenceRepository.getOne(conferenceId)); + conferenceRepository.deleteById(conferenceId); return true; } return false; @@ -242,14 +241,13 @@ public class ConferenceService extends BaseService { } @Transactional - public Ping ping(ConferenceDto conferenceDto) throws IOException { - Ping ping = pingService.addPing(findOne(conferenceDto.getId())); + public void ping(ConferenceDto conferenceDto) throws IOException { + pingService.addPing(findOne(conferenceDto.getId())); conferenceRepository.updatePingConference(conferenceDto.getId()); - return ping; } private Conference findOne(Integer conferenceId) { - return conferenceRepository.findOne(conferenceId); + return conferenceRepository.getOne(conferenceId); } public void setChartData(ModelMap modelMap) { @@ -294,7 +292,7 @@ public class ConferenceService extends BaseService { return newDeadline; } - public void checkEmptyFieldsOfDeadline(ConferenceDto conferenceDto, Errors errors) { + private void checkEmptyFieldsOfDeadline(ConferenceDto conferenceDto, Errors errors) { for (Deadline deadline : conferenceDto.getDeadlines()) { if (deadline.getDate() == null || deadline.getDescription().isEmpty()) { errors.rejectValue("deadlines", "errorCode", "Все поля дедлайна должны быть заполнены"); @@ -313,4 +311,8 @@ public class ConferenceService extends BaseService { .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription())) .collect(Collectors.toList())); } + + public Conference getActiveConferenceByUser(User user) { + return conferenceRepository.findActiveByUser(user); + } } diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java b/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java index f771b2a..01d02d6 100644 --- a/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java +++ b/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java @@ -26,8 +26,8 @@ public class ConferenceUserService { } @Transactional - public ConferenceUser update(ConferenceUser user) { - ConferenceUser updateUser = conferenceUserRepository.findOne(user.getId()); + private ConferenceUser update(ConferenceUser user) { + ConferenceUser updateUser = conferenceUserRepository.getOne(user.getId()); updateUser.setDeposit(user.getDeposit()); updateUser.setParticipation(user.getParticipation()); conferenceUserRepository.save(updateUser); @@ -35,7 +35,7 @@ public class ConferenceUserService { } @Transactional - public ConferenceUser create(ConferenceUser user) { + private ConferenceUser create(ConferenceUser user) { ConferenceUser newUser = new ConferenceUser(); newUser.setDeposit(user.getDeposit()); newUser.setParticipation(user.getParticipation()); @@ -43,6 +43,4 @@ public class ConferenceUserService { newUser = conferenceUserRepository.save(newUser); return newUser; } - - } diff --git a/src/main/java/ru/ulstu/configuration/ApplicationProperties.java b/src/main/java/ru/ulstu/configuration/ApplicationProperties.java index 49efac4..878e0b4 100644 --- a/src/main/java/ru/ulstu/configuration/ApplicationProperties.java +++ b/src/main/java/ru/ulstu/configuration/ApplicationProperties.java @@ -1,10 +1,11 @@ package ru.ulstu.configuration; -import org.hibernate.validator.constraints.NotBlank; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; import org.springframework.validation.annotation.Validated; +import javax.validation.constraints.NotBlank; + @Component @ConfigurationProperties(prefix = "ng-tracker") @Validated @@ -23,6 +24,8 @@ public class ApplicationProperties { private String debugEmail; + private String driverPath; + public boolean isUseHttps() { return useHttps; } @@ -70,4 +73,12 @@ public class ApplicationProperties { public void setDebugEmail(String debugEmail) { this.debugEmail = debugEmail; } + + public String getDriverPath() { + return driverPath; + } + + public void setDriverPath(String driverPath) { + this.driverPath = driverPath; + } } diff --git a/src/main/java/ru/ulstu/configuration/HttpListenerConfiguration.java b/src/main/java/ru/ulstu/configuration/HttpListenerConfiguration.java index bcbcab8..514319d 100644 --- a/src/main/java/ru/ulstu/configuration/HttpListenerConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/HttpListenerConfiguration.java @@ -2,18 +2,18 @@ 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.boot.web.embedded.jetty.JettyServerCustomizer; +import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory; +import org.springframework.boot.web.server.ConfigurableWebServerFactory; +import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.context.annotation.Configuration; @Configuration -public class HttpListenerConfiguration implements EmbeddedServletContainerCustomizer { +public class HttpListenerConfiguration implements WebServerFactoryCustomizer { @Value("${server.http.port}") private int httpPort; - private void configureJetty(JettyEmbeddedServletContainerFactory jettyFactory) { + private void configureJetty(JettyServletWebServerFactory jettyFactory) { jettyFactory.addServerCustomizers((JettyServerCustomizer) server -> { ServerConnector serverConnector = new ServerConnector(server); serverConnector.setPort(httpPort); @@ -22,9 +22,9 @@ public class HttpListenerConfiguration implements EmbeddedServletContainerCustom } @Override - public void customize(ConfigurableEmbeddedServletContainer container) { - if (container instanceof JettyEmbeddedServletContainerFactory) { - configureJetty((JettyEmbeddedServletContainerFactory) container); + public void customize(ConfigurableWebServerFactory factory) { + if (factory instanceof JettyServletWebServerFactory) { + configureJetty((JettyServletWebServerFactory) factory); } } } diff --git a/src/main/java/ru/ulstu/configuration/MailTemplateConfiguration.java b/src/main/java/ru/ulstu/configuration/MailTemplateConfiguration.java index 6cf3b11..5df2377 100644 --- a/src/main/java/ru/ulstu/configuration/MailTemplateConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/MailTemplateConfiguration.java @@ -3,8 +3,8 @@ package ru.ulstu.configuration; import nz.net.ultraq.thymeleaf.LayoutDialect; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect; -import org.thymeleaf.spring4.SpringTemplateEngine; +import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect; +import org.thymeleaf.spring5.SpringTemplateEngine; import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver; import org.thymeleaf.templateresolver.ITemplateResolver; @@ -22,12 +22,11 @@ public class MailTemplateConfiguration { return templateEngine; } - public ClassLoaderTemplateResolver emailTemplateResolver() { + private ClassLoaderTemplateResolver emailTemplateResolver() { ClassLoaderTemplateResolver emailTemplateResolver = new ClassLoaderTemplateResolver(); - emailTemplateResolver.setPrefix("mail_templates/"); - emailTemplateResolver.setTemplateMode("HTML5"); + emailTemplateResolver.setPrefix("/mail_templates/"); + emailTemplateResolver.setTemplateMode("HTML"); emailTemplateResolver.setSuffix(".html"); - emailTemplateResolver.setOrder(1); emailTemplateResolver.setCharacterEncoding(StandardCharsets.UTF_8.name()); return emailTemplateResolver; } diff --git a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java index 894cf39..5eb7220 100644 --- a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java @@ -13,8 +13,10 @@ 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.WebSecurityConfigurerAdapter; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.web.authentication.AuthenticationFailureHandler; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; +import ru.ulstu.core.model.AuthFailureHandler; import ru.ulstu.user.controller.UserController; import ru.ulstu.user.model.UserRoleConstants; import ru.ulstu.user.service.UserService; @@ -35,17 +37,20 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { private final AuthenticationSuccessHandler authenticationSuccessHandler; private final LogoutSuccessHandler logoutSuccessHandler; private final ApplicationProperties applicationProperties; + private final AuthenticationFailureHandler authenticationFailureHandler; public SecurityConfiguration(UserService userService, BCryptPasswordEncoder bCryptPasswordEncoder, AuthenticationSuccessHandler authenticationSuccessHandler, LogoutSuccessHandler logoutSuccessHandler, - ApplicationProperties applicationProperties) { + ApplicationProperties applicationProperties, + AuthFailureHandler authenticationFailureHandler) { this.userService = userService; this.bCryptPasswordEncoder = bCryptPasswordEncoder; this.authenticationSuccessHandler = authenticationSuccessHandler; this.logoutSuccessHandler = logoutSuccessHandler; this.applicationProperties = applicationProperties; + this.authenticationFailureHandler = authenticationFailureHandler; } @Override @@ -66,6 +71,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { .antMatchers(UserController.ACTIVATE_URL).permitAll() .antMatchers(Constants.PASSWORD_RESET_REQUEST_PAGE).permitAll() .antMatchers(Constants.PASSWORD_RESET_PAGE).permitAll() + .antMatchers("/users/block").permitAll() .antMatchers(UserController.URL + UserController.REGISTER_URL).permitAll() .antMatchers(UserController.URL + UserController.ACTIVATE_URL).permitAll() .antMatchers(UserController.URL + UserController.PASSWORD_RESET_REQUEST_URL).permitAll() @@ -76,6 +82,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { .formLogin() .loginPage("/login") .successHandler(authenticationSuccessHandler) + .failureHandler(authenticationFailureHandler) .permitAll() .and() .logout() diff --git a/src/main/java/ru/ulstu/core/jpa/OffsetablePageRequest.java b/src/main/java/ru/ulstu/core/jpa/OffsetablePageRequest.java index 388e9a1..148a931 100644 --- a/src/main/java/ru/ulstu/core/jpa/OffsetablePageRequest.java +++ b/src/main/java/ru/ulstu/core/jpa/OffsetablePageRequest.java @@ -6,19 +6,19 @@ import org.springframework.data.domain.Sort; import java.io.Serializable; public class OffsetablePageRequest implements Pageable, Serializable { - private final int offset; + private final long offset; private final int count; private final Sort sort; - public OffsetablePageRequest(int offset, int count) { + public OffsetablePageRequest(long offset, int count) { this(offset, count, null); } - public OffsetablePageRequest(int offset, int count, Sort.Direction direction, String... properties) { + public OffsetablePageRequest(long offset, int count, Sort.Direction direction, String... properties) { this(offset, count, new Sort(direction, properties)); } - public OffsetablePageRequest(int offset, int count, Sort sort) { + public OffsetablePageRequest(long offset, int count, Sort sort) { if (offset < 0) { throw new IllegalArgumentException("Offset value must not be less than zero!"); } @@ -42,11 +42,11 @@ public class OffsetablePageRequest implements Pageable, Serializable { @Override public int getPageNumber() { - return offset / count; + return (int) (offset / count); } @Override - public int getOffset() { + public long getOffset() { return offset; } @@ -65,7 +65,7 @@ public class OffsetablePageRequest implements Pageable, Serializable { return hasPrevious() ? previous() : first(); } - public Pageable previous() { + private Pageable previous() { return getOffset() == 0 ? this : new OffsetablePageRequest(getOffset() - getPageSize(), getPageSize(), getSort()); } @@ -89,9 +89,9 @@ public class OffsetablePageRequest implements Pageable, Serializable { @Override public int hashCode() { final int prime = 31; - int result = 1; + long result = 1; result = prime * result + offset; result = prime * result + count; - return result; + return (int) result; } } diff --git a/src/main/java/ru/ulstu/core/model/AuthFailureHandler.java b/src/main/java/ru/ulstu/core/model/AuthFailureHandler.java new file mode 100644 index 0000000..8b6bd9d --- /dev/null +++ b/src/main/java/ru/ulstu/core/model/AuthFailureHandler.java @@ -0,0 +1,21 @@ +package ru.ulstu.core.model; + +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 javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +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"); + } + } +} \ No newline at end of file diff --git a/src/main/java/ru/ulstu/core/model/BaseEntity.java b/src/main/java/ru/ulstu/core/model/BaseEntity.java index d3dfa76..a985dcc 100644 --- a/src/main/java/ru/ulstu/core/model/BaseEntity.java +++ b/src/main/java/ru/ulstu/core/model/BaseEntity.java @@ -5,10 +5,11 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.MappedSuperclass; import javax.persistence.Version; +import javax.validation.constraints.NotNull; import java.io.Serializable; @MappedSuperclass -public abstract class BaseEntity implements Serializable, Comparable { +public abstract class BaseEntity implements Serializable, Comparable { @Id @GeneratedValue(strategy = GenerationType.TABLE) private Integer id; @@ -16,14 +17,6 @@ public abstract class BaseEntity implements Serializable, Comparable { @Version private Integer version; - public BaseEntity() { - } - - public BaseEntity(Integer id, Integer version) { - this.id = id; - this.version = version; - } - public Integer getId() { return id; } @@ -75,8 +68,8 @@ public abstract class BaseEntity implements Serializable, Comparable { } @Override - public int compareTo(Object o) { - return id != null ? id.compareTo(((BaseEntity) o).getId()) : -1; + public int compareTo(@NotNull BaseEntity o) { + return id != null ? id.compareTo(o.getId()) : -1; } public void reset() { diff --git a/src/main/java/ru/ulstu/core/model/ErrorConstants.java b/src/main/java/ru/ulstu/core/model/ErrorConstants.java index 017725a..59f34fa 100644 --- a/src/main/java/ru/ulstu/core/model/ErrorConstants.java +++ b/src/main/java/ru/ulstu/core/model/ErrorConstants.java @@ -16,8 +16,8 @@ public enum ErrorConstants { FILE_UPLOAD_ERROR(110, "File upload error"), USER_SENDING_MAIL_EXCEPTION(111, "Во время отправки приглашения пользователю произошла ошибка"); - private int code; - private String message; + private final int code; + private final String message; ErrorConstants(int code, String message) { this.code = code; diff --git a/src/main/java/ru/ulstu/core/model/EventSource.java b/src/main/java/ru/ulstu/core/model/EventSource.java new file mode 100644 index 0000000..32ffcf2 --- /dev/null +++ b/src/main/java/ru/ulstu/core/model/EventSource.java @@ -0,0 +1,17 @@ +package ru.ulstu.core.model; + +import ru.ulstu.deadline.model.Deadline; +import ru.ulstu.timeline.model.Event; +import ru.ulstu.user.model.User; + +import java.util.List; + +public interface EventSource { + List getDeadlines(); + + String getTitle(); + + List getRecipients(); + + void addObjectToEvent(Event event); +} diff --git a/src/main/java/ru/ulstu/core/model/TreeDto.java b/src/main/java/ru/ulstu/core/model/TreeDto.java deleted file mode 100644 index 491553c..0000000 --- a/src/main/java/ru/ulstu/core/model/TreeDto.java +++ /dev/null @@ -1,34 +0,0 @@ -package ru.ulstu.core.model; - -import java.util.ArrayList; -import java.util.List; - -public class TreeDto { - private Integer id; - private String text; - private List children = new ArrayList<>(); - - public TreeDto() { - } - - public 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 getChildren() { - return children; - } - - public Integer getId() { - return id; - } -} diff --git a/src/main/java/ru/ulstu/core/model/TreeEntity.java b/src/main/java/ru/ulstu/core/model/TreeEntity.java deleted file mode 100644 index 48f1202..0000000 --- a/src/main/java/ru/ulstu/core/model/TreeEntity.java +++ /dev/null @@ -1,16 +0,0 @@ -package ru.ulstu.core.model; - -import java.util.List; - -public interface TreeEntity { - - Integer getId(); - - List getChildren(); - - void setChildren(List children); - - T getParent(); - - void setParent(T parent); -} diff --git a/src/main/java/ru/ulstu/core/model/UserActivity.java b/src/main/java/ru/ulstu/core/model/UserActivity.java new file mode 100644 index 0000000..f45819d --- /dev/null +++ b/src/main/java/ru/ulstu/core/model/UserActivity.java @@ -0,0 +1,11 @@ +package ru.ulstu.core.model; + +import ru.ulstu.user.model.User; + +import java.util.Set; + +public interface UserActivity { + String getTitle(); + + Set getActivityUsers(); +} diff --git a/src/main/java/ru/ulstu/core/model/UserContainer.java b/src/main/java/ru/ulstu/core/model/UserContainer.java deleted file mode 100644 index 7f83cd3..0000000 --- a/src/main/java/ru/ulstu/core/model/UserContainer.java +++ /dev/null @@ -1,9 +0,0 @@ -package ru.ulstu.core.model; - -import ru.ulstu.user.model.User; - -import java.util.Set; - -public interface UserContainer { - Set getUsers(); -} diff --git a/src/main/java/ru/ulstu/core/model/response/ControllerResponse.java b/src/main/java/ru/ulstu/core/model/response/ControllerResponse.java index 72c5ebf..52ede55 100644 --- a/src/main/java/ru/ulstu/core/model/response/ControllerResponse.java +++ b/src/main/java/ru/ulstu/core/model/response/ControllerResponse.java @@ -1,8 +1,8 @@ package ru.ulstu.core.model.response; class ControllerResponse { - private D data; - private ControllerResponseError error; + private final D data; + private final ControllerResponseError error; ControllerResponse(D data) { this.data = data; diff --git a/src/main/java/ru/ulstu/core/model/response/ControllerResponseError.java b/src/main/java/ru/ulstu/core/model/response/ControllerResponseError.java index a26b088..48661b6 100644 --- a/src/main/java/ru/ulstu/core/model/response/ControllerResponseError.java +++ b/src/main/java/ru/ulstu/core/model/response/ControllerResponseError.java @@ -3,8 +3,8 @@ package ru.ulstu.core.model.response; import ru.ulstu.core.model.ErrorConstants; class ControllerResponseError { - private ErrorConstants description; - private D data; + private final ErrorConstants description; + private final D data; ControllerResponseError(ErrorConstants description, D data) { this.description = description; diff --git a/src/main/java/ru/ulstu/core/repository/JpaDetachableRepositoryImpl.java b/src/main/java/ru/ulstu/core/repository/JpaDetachableRepositoryImpl.java index 097a2a5..facc071 100644 --- a/src/main/java/ru/ulstu/core/repository/JpaDetachableRepositoryImpl.java +++ b/src/main/java/ru/ulstu/core/repository/JpaDetachableRepositoryImpl.java @@ -8,7 +8,7 @@ import java.io.Serializable; public class JpaDetachableRepositoryImpl extends SimpleJpaRepository implements JpaDetachableRepository { - private EntityManager entityManager; + private final EntityManager entityManager; public JpaDetachableRepositoryImpl(JpaEntityInformation entityInformation, EntityManager entityManager) { super(entityInformation, entityManager); diff --git a/src/main/java/ru/ulstu/core/util/DateUtils.java b/src/main/java/ru/ulstu/core/util/DateUtils.java index 3a38452..bbcc86b 100644 --- a/src/main/java/ru/ulstu/core/util/DateUtils.java +++ b/src/main/java/ru/ulstu/core/util/DateUtils.java @@ -16,7 +16,7 @@ public class DateUtils { public static Date clearTime(Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); - calendar.set(Calendar.HOUR, 0); + calendar.set(Calendar.HOUR_OF_DAY, 0); calendar.set(Calendar.MINUTE, 0); calendar.set(Calendar.SECOND, 0); calendar.set(Calendar.MILLISECOND, 0); diff --git a/src/main/java/ru/ulstu/core/util/NumberUtils.java b/src/main/java/ru/ulstu/core/util/NumberUtils.java deleted file mode 100644 index 5e002cd..0000000 --- a/src/main/java/ru/ulstu/core/util/NumberUtils.java +++ /dev/null @@ -1,17 +0,0 @@ -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; - } -} diff --git a/src/main/java/ru/ulstu/core/util/StreamApiUtils.java b/src/main/java/ru/ulstu/core/util/StreamApiUtils.java index ab8d66f..9a6e58d 100644 --- a/src/main/java/ru/ulstu/core/util/StreamApiUtils.java +++ b/src/main/java/ru/ulstu/core/util/StreamApiUtils.java @@ -11,12 +11,12 @@ public class StreamApiUtils { public static List convert(List entities, Function converter) { return entities == null ? Collections.emptyList() - : entities.stream().map(e -> converter.apply(e)).collect(Collectors.toList()); + : entities.stream().map(converter).collect(Collectors.toList()); } public static Set convert(Set entities, Function converter) { return entities == null ? Collections.emptySet() - : entities.stream().map(e -> converter.apply(e)).collect(Collectors.toSet()); + : entities.stream().map(converter).collect(Collectors.toSet()); } } diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java index 6c564aa..d0564a0 100644 --- a/src/main/java/ru/ulstu/deadline/model/Deadline.java +++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java @@ -4,11 +4,15 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import org.springframework.format.annotation.DateTimeFormat; import ru.ulstu.core.model.BaseEntity; +import ru.ulstu.user.model.User; import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.OneToMany; import javax.persistence.Temporal; import javax.persistence.TemporalType; import java.util.Date; +import java.util.List; import java.util.Objects; @Entity @@ -16,10 +20,15 @@ public class Deadline extends BaseEntity { private String description; - @Temporal(value = TemporalType.TIMESTAMP) + @Temporal(value = TemporalType.DATE) @DateTimeFormat(pattern = "yyyy-MM-dd") private Date date; + @OneToMany(targetEntity = User.class, fetch = FetchType.EAGER) + private List executors; + + private Boolean done; + public Deadline() { } @@ -28,13 +37,24 @@ public class Deadline extends BaseEntity { this.description = description; } + public Deadline(Date deadlineDate, String description, List executors, Boolean done) { + this.date = deadlineDate; + this.description = description; + this.executors = executors; + this.done = done; + } + @JsonCreator public Deadline(@JsonProperty("id") Integer id, @JsonProperty("description") String description, - @JsonProperty("date") Date date) { + @JsonProperty("date") Date date, + @JsonProperty("executors") List executors, + @JsonProperty("done") Boolean done) { this.setId(id); this.description = description; this.date = date; + this.executors = executors; + this.done = done; } public String getDescription() { @@ -53,6 +73,22 @@ public class Deadline extends BaseEntity { this.date = date; } + public List getExecutors() { + return executors; + } + + public void setExecutors(List executors) { + this.executors = executors; + } + + public Boolean getDone() { + return done; + } + + public void setDone(Boolean done) { + this.done = done; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -72,11 +108,13 @@ public class Deadline extends BaseEntity { } return getId().equals(deadline.getId()) && description.equals(deadline.description) && - date.equals(deadline.date); + date.equals(deadline.date) && + executors.equals(deadline.executors) && + done.equals(deadline.done); } @Override public int hashCode() { - return Objects.hash(super.hashCode(), description, date); + return Objects.hash(super.hashCode(), description, date, executors, done); } } diff --git a/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java b/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java index 3f237e4..652f01d 100644 --- a/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java +++ b/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java @@ -3,14 +3,13 @@ package ru.ulstu.deadline.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import ru.ulstu.deadline.model.Deadline; import java.util.Date; public interface DeadlineRepository extends JpaRepository { - @Query( - value = "SELECT date FROM Deadline d WHERE (d.grant_id = ?1) AND (d.date = ?2)", - nativeQuery = true) - Date findByGrantIdAndDate(Integer grantId, Date date); + @Query("SELECT d.date FROM Grant g JOIN g.deadlines d WHERE (g.id = :id) AND (d.date = :date)") + Date findByGrantIdAndDate(@Param("id") Integer grantId, @Param("date") Date date); } diff --git a/src/main/java/ru/ulstu/deadline/service/DeadlineService.java b/src/main/java/ru/ulstu/deadline/service/DeadlineService.java index e82211d..039ddbf 100644 --- a/src/main/java/ru/ulstu/deadline/service/DeadlineService.java +++ b/src/main/java/ru/ulstu/deadline/service/DeadlineService.java @@ -26,10 +26,12 @@ public class DeadlineService { } @Transactional - public Deadline update(Deadline deadline) { - Deadline updateDeadline = deadlineRepository.findOne(deadline.getId()); + private Deadline update(Deadline deadline) { + Deadline updateDeadline = deadlineRepository.getOne(deadline.getId()); updateDeadline.setDate(deadline.getDate()); updateDeadline.setDescription(deadline.getDescription()); + updateDeadline.setExecutors(deadline.getExecutors()); + updateDeadline.setDone(deadline.getDone()); deadlineRepository.save(updateDeadline); return updateDeadline; } @@ -39,13 +41,15 @@ public class DeadlineService { Deadline newDeadline = new Deadline(); newDeadline.setDate(deadline.getDate()); newDeadline.setDescription(deadline.getDescription()); + newDeadline.setExecutors(deadline.getExecutors()); + newDeadline.setDone(deadline.getDone()); newDeadline = deadlineRepository.save(newDeadline); return newDeadline; } @Transactional public void remove(Integer deadlineId) { - deadlineRepository.delete(deadlineId); + deadlineRepository.deleteById(deadlineId); } public Date findByGrantIdAndDate(Integer id, Date date) { diff --git a/src/main/java/ru/ulstu/file/FileController.java b/src/main/java/ru/ulstu/file/FileController.java index ac08ac1..02421aa 100644 --- a/src/main/java/ru/ulstu/file/FileController.java +++ b/src/main/java/ru/ulstu/file/FileController.java @@ -21,13 +21,10 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import static java.nio.charset.StandardCharsets.UTF_8; -import static ru.ulstu.file.FileController.URL; @RestController -@RequestMapping(URL) +@RequestMapping(Constants.API_1_0 + "files") public class FileController { - public static final String URL = Constants.API_1_0 + "files"; - private final FileService fileService; public FileController(FileService fileService) { @@ -53,6 +50,6 @@ public class FileController { @PostMapping("/uploadTmpFile") public Response upload(@RequestParam("file") MultipartFile multipartFile) throws IOException { - return new Response(fileService.createFromMultipartFile(multipartFile)); + return new Response<>(fileService.createFromMultipartFile(multipartFile)); } } diff --git a/src/main/java/ru/ulstu/file/service/FileService.java b/src/main/java/ru/ulstu/file/service/FileService.java index 4bb1658..c7d7dc2 100644 --- a/src/main/java/ru/ulstu/file/service/FileService.java +++ b/src/main/java/ru/ulstu/file/service/FileService.java @@ -27,15 +27,15 @@ public class FileService { private final static int META_FILE_NAME_INDEX = 0; private final static int META_FILE_SIZE_INDEX = 1; - private String tmpDir; - private FileRepository fileRepository; + private final String tmpDir; + private final FileRepository fileRepository; public FileService(FileRepository fileRepository) { tmpDir = System.getProperty("java.io.tmpdir"); this.fileRepository = fileRepository; } - public FileData createFileFromTmp(String tmpFileName) throws IOException { + private FileData createFileFromTmp(String tmpFileName) throws IOException { FileData fileData = new FileData(); fileData.setData(getTmpFile(tmpFileName)); fileData.setSize(getTmpFileSize(tmpFileName)); @@ -43,7 +43,7 @@ public class FileService { return fileRepository.save(fileData); } - public String uploadToTmpDir(MultipartFile multipartFile) throws IOException { + private String uploadToTmpDir(MultipartFile multipartFile) throws IOException { String tmpFileName = String.valueOf(System.currentTimeMillis()) + UUID.randomUUID(); Files.write(getTmpFilePath(tmpFileName), multipartFile.getBytes()); String meta = multipartFile.getOriginalFilename() + "\n" + multipartFile.getSize(); @@ -56,7 +56,7 @@ public class FileService { .split("\n"); } - public long getTmpFileSize(String tmpFileName) throws IOException { + private long getTmpFileSize(String tmpFileName) throws IOException { return Long.valueOf(getMeta(tmpFileName)[META_FILE_SIZE_INDEX]).longValue(); } @@ -69,7 +69,7 @@ public class FileService { } public FileData getFile(Integer fileId) { - return fileRepository.findOne(fileId); + return fileRepository.getOne(fileId); } public void deleteTmpFile(String tmpFileName) throws IOException { @@ -97,13 +97,13 @@ public class FileService { } @Transactional - public FileData update(FileDataDto fileDataDto) { - FileData file = fileRepository.findOne(fileDataDto.getId()); + private FileData update(FileDataDto fileDataDto) { + FileData file = fileRepository.getOne(fileDataDto.getId()); return fileRepository.save(copyFromDto(file, fileDataDto)); } @Transactional - public FileData create(FileDataDto fileDataDto) throws IOException { + private FileData create(FileDataDto fileDataDto) throws IOException { FileData newFile = createFileFromTmp(fileDataDto.getTmpFileName()); copyFromDto(newFile, fileDataDto); return fileRepository.save(newFile); @@ -117,7 +117,7 @@ public class FileService { @Transactional public void delete(Integer fileId) { - fileRepository.delete(fileRepository.findOne(fileId)); + fileRepository.delete(fileRepository.getOne(fileId)); } public FileDataDto createFromMultipartFile(MultipartFile multipartFile) throws IOException { @@ -134,7 +134,7 @@ public class FileService { File renamed = getTmpFilePath(fileDataDto.getName()).toFile(); oldFile.renameTo(renamed); } else { - Files.write(getTmpFilePath(fileDataDto.getName()), fileRepository.findOne(fileDataDto.getId()).getData()); + Files.write(getTmpFilePath(fileDataDto.getName()), fileRepository.getOne(fileDataDto.getId()).getData()); } } } diff --git a/src/main/java/ru/ulstu/grant/controller/GrantController.java b/src/main/java/ru/ulstu/grant/controller/GrantController.java index a9c01ed..48dee8e 100644 --- a/src/main/java/ru/ulstu/grant/controller/GrantController.java +++ b/src/main/java/ru/ulstu/grant/controller/GrantController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import ru.ulstu.deadline.model.Deadline; import ru.ulstu.grant.model.Grant; import ru.ulstu.grant.model.GrantDto; @@ -49,7 +50,7 @@ public class GrantController { @GetMapping("/grant") public void getGrant(ModelMap modelMap, @RequestParam(value = "id") Integer id) { if (id != null && id > 0) { - GrantDto grantDto = grantService.findOneDto(id); + GrantDto grantDto = grantService.getExistGrantById(id); attachPaper(grantDto); modelMap.put("grantDto", grantDto); } else { @@ -123,4 +124,10 @@ public class GrantController { public List getAllPapers() { return grantService.getAllUncompletedPapers(); } + + @ResponseBody + @PostMapping(value = "/ping") + public void ping(@RequestParam("grantId") int grantId) throws IOException { + grantService.ping(grantId); + } } diff --git a/src/main/java/ru/ulstu/grant/controller/GrantRestController.java b/src/main/java/ru/ulstu/grant/controller/GrantRestController.java new file mode 100644 index 0000000..9b90a4d --- /dev/null +++ b/src/main/java/ru/ulstu/grant/controller/GrantRestController.java @@ -0,0 +1,29 @@ +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(); + } +} diff --git a/src/main/java/ru/ulstu/grant/model/Grant.java b/src/main/java/ru/ulstu/grant/model/Grant.java index 369568f..0d16f77 100644 --- a/src/main/java/ru/ulstu/grant/model/Grant.java +++ b/src/main/java/ru/ulstu/grant/model/Grant.java @@ -2,9 +2,9 @@ package ru.ulstu.grant.model; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.validator.constraints.NotBlank; import ru.ulstu.core.model.BaseEntity; -import ru.ulstu.core.model.UserContainer; +import ru.ulstu.core.model.EventSource; +import ru.ulstu.core.model.UserActivity; import ru.ulstu.deadline.model.Deadline; import ru.ulstu.file.model.FileData; import ru.ulstu.paper.model.Paper; @@ -13,6 +13,7 @@ import ru.ulstu.timeline.model.Event; import ru.ulstu.user.model.User; import javax.persistence.CascadeType; +import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; @@ -24,8 +25,10 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.OrderBy; import javax.persistence.Table; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.HashSet; @@ -35,7 +38,8 @@ import java.util.Set; @Entity @Table(name = "grants") -public class Grant extends BaseEntity implements UserContainer { +@DiscriminatorValue("GRANT") +public class Grant extends BaseEntity implements UserActivity, EventSource { public enum GrantStatus { APPLICATION("Заявка"), ON_COMPETITION("Отправлен на конкурс"), @@ -46,7 +50,7 @@ public class Grant extends BaseEntity implements UserContainer { LOADED_FROM_KIAS("Загружен автоматически"), SKIPPED("Не интересует"); - private String statusName; + private final String statusName; GrantStatus(String statusName) { this.statusName = statusName; @@ -134,6 +138,16 @@ public class Grant extends BaseEntity implements UserContainer { return title; } + @Override + public List getRecipients() { + return authors != null ? new ArrayList<>(authors) : Collections.emptyList(); + } + + @Override + public void addObjectToEvent(Event event) { + event.setGrant(this); + } + public void setTitle(String title) { this.title = title; } @@ -155,7 +169,7 @@ public class Grant extends BaseEntity implements UserContainer { } @Override - public Set getUsers() { + public Set getActivityUsers() { return getAuthors(); } diff --git a/src/main/java/ru/ulstu/grant/model/GrantDto.java b/src/main/java/ru/ulstu/grant/model/GrantDto.java index 9e59d86..541dae8 100644 --- a/src/main/java/ru/ulstu/grant/model/GrantDto.java +++ b/src/main/java/ru/ulstu/grant/model/GrantDto.java @@ -3,7 +3,6 @@ package ru.ulstu.grant.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.StringUtils; -import org.hibernate.validator.constraints.NotEmpty; import ru.ulstu.deadline.model.Deadline; import ru.ulstu.file.model.FileDataDto; import ru.ulstu.name.NameContainer; @@ -11,6 +10,7 @@ import ru.ulstu.paper.model.PaperDto; import ru.ulstu.project.model.ProjectDto; import ru.ulstu.user.model.UserDto; +import javax.validation.constraints.NotEmpty; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/src/main/java/ru/ulstu/grant/page/KiasPage.java b/src/main/java/ru/ulstu/grant/page/KiasPage.java index 631f5db..49d54a0 100644 --- a/src/main/java/ru/ulstu/grant/page/KiasPage.java +++ b/src/main/java/ru/ulstu/grant/page/KiasPage.java @@ -1,8 +1,9 @@ package ru.ulstu.grant.page; -import org.openqa.selenium.By; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; +import com.gargoylesoftware.htmlunit.html.DomNode; +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import com.gargoylesoftware.htmlunit.html.HtmlTableRow; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -11,16 +12,17 @@ import java.util.List; public class KiasPage { private final static String KIAS_GRANT_DATE_FORMAT = "dd.MM.yyyy HH:mm"; - private WebDriver driver; + private final HtmlPage page; - public KiasPage(WebDriver webDriver) { - this.driver = webDriver; + public KiasPage(HtmlPage page) { + this.page = page; } public boolean goToNextPage() { try { - if (driver.findElements(By.id("js-ctrlNext")).size() > 0) { - driver.findElement(By.id("js-ctrlNext")).click(); + HtmlElement nextPageLink = page.getHtmlElementById("js-ctrlNext"); + if (nextPageLink.isDisplayed()) { + nextPageLink.click(); return true; } } finally { @@ -28,23 +30,26 @@ public class KiasPage { } } - public List getPageOfGrants() { - WebElement listContest = driver.findElement(By.tagName("tBody")); - List grants = listContest.findElements(By.cssSelector("tr.tr")); - return grants; + public List getPageOfGrants() { + return page.getByXPath("/html/body/div[2]/div/div[2]/main/div[1]/table/tbody/tr"); } - public String getGrantTitle(WebElement grant) { - return grant.findElement(By.cssSelector("td.tertiary")).findElement(By.tagName("a")).getText(); + public String getGrantTitle(DomNode grant) { + return ((DomNode) grant.getFirstByXPath("td[2]")).getTextContent() + " " + + ((DomNode) grant.getFirstByXPath("td[@class='tertiary']/a")).getTextContent(); } - public Date parseDeadLineDate(WebElement grantElement) throws ParseException { + public Date parseDeadLineDate(DomNode grantElement) throws ParseException { String deadlineDate = getFirstDeadline(grantElement); //10.06.2019 23:59 SimpleDateFormat formatter = new SimpleDateFormat(KIAS_GRANT_DATE_FORMAT); return formatter.parse(deadlineDate); } - private String getFirstDeadline(WebElement grantElement) { - return grantElement.findElement(By.xpath("./td[5]")).getText(); + private String getFirstDeadline(DomNode grantElement) { + return ((DomNode) grantElement.getFirstByXPath("td[5]")).getTextContent(); + } + + public boolean isTableRowGrantLine(DomNode grantElement) { + return !((HtmlTableRow) grantElement).getAttribute("class").contains("pagerSavedHeightSpacer"); } } diff --git a/src/main/java/ru/ulstu/grant/repository/GrantRepository.java b/src/main/java/ru/ulstu/grant/repository/GrantRepository.java index 876a8c1..50fad13 100644 --- a/src/main/java/ru/ulstu/grant/repository/GrantRepository.java +++ b/src/main/java/ru/ulstu/grant/repository/GrantRepository.java @@ -14,6 +14,8 @@ public interface GrantRepository extends JpaRepository, BaseRepo Grant findByTitle(String title); + Grant findGrantById(Integer grantId); + @Override @Query("SELECT title FROM Grant g WHERE (g.title = :name) AND (:id IS NULL OR g.id != :id) ") String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id); diff --git a/src/main/java/ru/ulstu/grant/service/GrantScheduler.java b/src/main/java/ru/ulstu/grant/service/GrantScheduler.java index a2950a6..d026911 100644 --- a/src/main/java/ru/ulstu/grant/service/GrantScheduler.java +++ b/src/main/java/ru/ulstu/grant/service/GrantScheduler.java @@ -27,7 +27,7 @@ public class GrantScheduler { @Scheduled(cron = "0 0 8 * * MON", zone = "Europe/Samara") public void checkDeadlineBeforeWeek() { log.debug("GrantScheduler.checkDeadlineBeforeWeek started"); - grantNotificationService.sendDeadlineNotifications(grantService.findAll(), IS_DEADLINE_NOTIFICATION_BEFORE_WEEK); + grantNotificationService.sendDeadlineNotifications(grantService.findAllActive(), IS_DEADLINE_NOTIFICATION_BEFORE_WEEK); log.debug("GrantScheduler.checkDeadlineBeforeWeek finished"); } diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java index 86f8f1b..28d3f8c 100644 --- a/src/main/java/ru/ulstu/grant/service/GrantService.java +++ b/src/main/java/ru/ulstu/grant/service/GrantService.java @@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.Errors; +import ru.ulstu.core.util.DateUtils; import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.service.DeadlineService; import ru.ulstu.file.model.FileDataDto; @@ -17,7 +18,7 @@ import ru.ulstu.name.BaseService; import ru.ulstu.paper.model.Paper; import ru.ulstu.paper.model.PaperDto; import ru.ulstu.paper.service.PaperService; -import ru.ulstu.project.model.Project; +import ru.ulstu.ping.service.PingService; import ru.ulstu.project.model.ProjectDto; import ru.ulstu.project.service.ProjectService; import ru.ulstu.timeline.service.EventService; @@ -52,6 +53,7 @@ public class GrantService extends BaseService { private final EventService eventService; private final GrantNotificationService grantNotificationService; private final KiasService kiasService; + private final PingService pingService; public GrantService(GrantRepository grantRepository, FileService fileService, @@ -61,7 +63,8 @@ public class GrantService extends BaseService { PaperService paperService, EventService eventService, GrantNotificationService grantNotificationService, - KiasService kiasService) { + KiasService kiasService, + PingService pingService) { this.grantRepository = grantRepository; this.kiasService = kiasService; this.baseRepository = grantRepository; @@ -72,6 +75,11 @@ public class GrantService extends BaseService { this.paperService = paperService; this.eventService = eventService; this.grantNotificationService = grantNotificationService; + this.pingService = pingService; + } + + public GrantDto getExistGrantById(Integer id) { + return new GrantDto(findById(id)); } public List findAll() { @@ -82,17 +90,13 @@ public class GrantService extends BaseService { return convert(findAll(), GrantDto::new); } - public GrantDto findOneDto(Integer id) { - return new GrantDto(grantRepository.findOne(id)); - } - @Transactional - public Integer create(GrantDto grantDto) throws IOException { + public Grant create(GrantDto grantDto) throws IOException { Grant newGrant = copyFromDto(new Grant(), grantDto); newGrant = grantRepository.save(newGrant); - eventService.createFromGrant(newGrant); + eventService.createFromObject(newGrant, Collections.emptyList(), false, "гранта"); grantNotificationService.sendCreateNotification(newGrant); - return newGrant.getId(); + return newGrant; } private Grant copyFromDto(Grant grant, GrantDto grantDto) throws IOException { @@ -103,9 +107,11 @@ public class GrantService extends BaseService { grant.setProject(projectService.findById(grantDto.getProject().getId())); } grant.setDeadlines(deadlineService.saveOrCreate(grantDto.getDeadlines())); - grant.setFiles(fileService.saveOrCreate(grantDto.getFiles().stream() - .filter(f -> !f.isDeleted()) - .collect(toList()))); + if (!grant.getFiles().isEmpty()) { + grant.setFiles(fileService.saveOrCreate(grantDto.getFiles().stream() + .filter(f -> !f.isDeleted()) + .collect(toList()))); + } grant.getAuthors().clear(); if (grantDto.getAuthorIds() != null && !grantDto.getAuthorIds().isEmpty()) { grantDto.getAuthorIds().forEach(authorIds -> grant.getAuthors().add(userService.findById(authorIds))); @@ -120,14 +126,15 @@ public class GrantService extends BaseService { return grant; } + public void createProject(GrantDto grantDto) throws IOException { grantDto.setProject( new ProjectDto(projectService.save(new ProjectDto(grantDto.getTitle())))); } @Transactional - public Integer update(GrantDto grantDto) throws IOException { - Grant grant = grantRepository.findOne(grantDto.getId()); + private Integer update(GrantDto grantDto) throws IOException { + Grant grant = findById(grantDto.getId()); Set oldAuthors = new HashSet<>(grant.getAuthors()); User oldLeader = grant.getLeader(); for (FileDataDto file : grantDto.getFiles().stream() @@ -156,40 +163,25 @@ public class GrantService extends BaseService { } @Transactional - public void delete(Integer grantId) throws IOException { - Grant grant = grantRepository.findOne(grantId); - grantRepository.delete(grant); + public boolean delete(Integer grantId) throws IOException { + Grant grant = findById(grantId); + if (grant != null) { + grantRepository.delete(grant); + return true; + } + return false; } public List getGrantStatuses() { 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.createFromGrant(grant); - grantNotificationService.sendCreateNotification(grant); - - return grant; - } - public boolean save(GrantDto grantDto, Errors errors) throws IOException { grantDto.setName(grantDto.getTitle()); filterEmptyDeadlines(grantDto); checkEmptyDeadlines(grantDto, errors); checkEmptyLeader(grantDto, errors); - checkUniqueName(grantDto, errors, grantDto.getId(), "title", "Грант с таким именем уже существует"); + checkUniqueName(grantDto, errors, grantDto.getId(), "Грант с таким именем уже существует"); if (errors.hasErrors()) { return false; } @@ -201,7 +193,7 @@ public class GrantService extends BaseService { return true; } - public boolean saveFromKias(GrantDto grantDto) throws IOException { + private boolean saveFromKias(GrantDto grantDto) throws IOException { grantDto.setName(grantDto.getTitle()); String title = checkUniqueName(grantDto, grantDto.getId()); //проверка уникальности имени if (title != null) { @@ -231,11 +223,9 @@ public class GrantService extends BaseService { } private boolean checkSameDeadline(GrantDto grantDto, Integer id) { - Date date = grantDto.getDeadlines().get(0).getDate(); //дата с сайта киас - if (deadlineService.findByGrantIdAndDate(id, date).compareTo(date) == 0) { //если есть такая строка с датой - return true; - } - return false; + Date date = DateUtils.clearTime(grantDto.getDeadlines().get(0).getDate()); //дата с сайта киас + Date foundGrantDate = DateUtils.clearTime(deadlineService.findByGrantIdAndDate(id, date)); + return foundGrantDate != null && foundGrantDate.compareTo(date) == 0; } public List getGrantAuthors(GrantDto grantDto) { @@ -273,20 +263,22 @@ public class GrantService extends BaseService { return paperService.findAllNotCompleted(); } - public void attachPaper(GrantDto grantDto) { + public List attachPaper(GrantDto grantDto) { if (!grantDto.getPaperIds().isEmpty()) { grantDto.getPapers().clear(); grantDto.setPapers(getGrantPapers(grantDto.getPaperIds())); } else { grantDto.getPapers().clear(); } + return grantDto.getPapers(); } - public void removeDeadline(GrantDto grantDto, Integer deadlineId) { + public GrantDto removeDeadline(GrantDto grantDto, Integer deadlineId) { if (grantDto.getDeadlines().get(deadlineId).getId() != null) { grantDto.getRemovedDeadlineIds().add(grantDto.getDeadlines().get(deadlineId).getId()); } grantDto.getDeadlines().remove((int) deadlineId); + return grantDto; } private List getCompletedPapersAuthors(Paper.PaperType type) { @@ -312,10 +304,11 @@ public class GrantService extends BaseService { .collect(toList()); } - public void filterEmptyDeadlines(GrantDto grantDto) { + public List filterEmptyDeadlines(GrantDto grantDto) { grantDto.setDeadlines(grantDto.getDeadlines().stream() - .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription())) + .filter(dto -> dto.getDate() != null || !StringUtils.isEmpty(dto.getDescription())) .collect(Collectors.toList())); + return grantDto.getDeadlines(); } @Transactional @@ -333,7 +326,16 @@ public class GrantService extends BaseService { return convert(findAllActive(), GrantDto::new); } - private List findAllActive() { + public List findAllActive() { return grantRepository.findAllActive(); } + + public Grant findById(Integer id) { + return grantRepository.getOne(id); + } + + @Transactional + public void ping(int grantId) throws IOException { + pingService.addPing(findById(grantId)); + } } diff --git a/src/main/java/ru/ulstu/grant/service/KiasService.java b/src/main/java/ru/ulstu/grant/service/KiasService.java index 618e83c..dea6f55 100644 --- a/src/main/java/ru/ulstu/grant/service/KiasService.java +++ b/src/main/java/ru/ulstu/grant/service/KiasService.java @@ -1,14 +1,15 @@ package ru.ulstu.grant.service; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.chrome.ChromeDriver; -import org.openqa.selenium.chrome.ChromeOptions; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.html.DomNode; +import com.gargoylesoftware.htmlunit.html.HtmlPage; import org.springframework.stereotype.Service; +import ru.ulstu.configuration.ApplicationProperties; import ru.ulstu.grant.model.GrantDto; import ru.ulstu.grant.page.KiasPage; import ru.ulstu.user.service.UserService; +import java.io.IOException; import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; @@ -21,33 +22,29 @@ public class KiasService { private final static String CONTEST_STATUS_ID = "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; - public KiasService(UserService userService) { + public KiasService(UserService userService, + ApplicationProperties applicationProperties) { this.userService = userService; } - public List getNewGrantsDto() throws ParseException { - WebDriver webDriver = getDriver(); + public List getNewGrantsDto() throws ParseException, IOException { Integer leaderId = userService.findOneByLoginIgnoreCase("admin").getId(); List grants = new ArrayList<>(); - for (Integer year : generateGrantYears()) { - webDriver.get(String.format(BASE_URL, CONTEST_STATUS_ID, CONTEST_TYPE, year)); - grants.addAll(getKiasGrants(webDriver)); + try (final WebClient webClient = new WebClient()) { + 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)); - webDriver.quit(); return grants; } - public List getKiasGrants(WebDriver webDriver) throws ParseException { + private List getKiasGrants(HtmlPage page) throws ParseException { List newGrants = new ArrayList<>(); - KiasPage kiasPage = new KiasPage(webDriver); + KiasPage kiasPage = new KiasPage(page); do { newGrants.addAll(getGrantsFromPage(kiasPage)); } while (kiasPage.goToNextPage()); //проверка существования следующей страницы с грантами @@ -56,11 +53,13 @@ public class KiasService { private List getGrantsFromPage(KiasPage kiasPage) throws ParseException { List grants = new ArrayList<>(); - for (WebElement grantElement : kiasPage.getPageOfGrants()) { - GrantDto grantDto = new GrantDto( - kiasPage.getGrantTitle(grantElement), - kiasPage.parseDeadLineDate(grantElement)); - grants.add(grantDto); + for (DomNode grantElement : kiasPage.getPageOfGrants()) { + if (kiasPage.isTableRowGrantLine(grantElement)) { + GrantDto grantDto = new GrantDto( + kiasPage.getGrantTitle(grantElement), + kiasPage.parseDeadLineDate(grantElement)); + grants.add(grantDto); + } } return grants; } @@ -69,24 +68,4 @@ public class KiasService { return Arrays.asList(Calendar.getInstance().get(Calendar.YEAR), 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"); - } } diff --git a/src/main/java/ru/ulstu/name/BaseService.java b/src/main/java/ru/ulstu/name/BaseService.java index fd63cbf..adcdc74 100644 --- a/src/main/java/ru/ulstu/name/BaseService.java +++ b/src/main/java/ru/ulstu/name/BaseService.java @@ -8,13 +8,13 @@ public abstract class BaseService { public BaseRepository baseRepository; - public void checkUniqueName(NameContainer nameContainer, Errors errors, Integer id, String checkField, String errorMessage) { + protected void checkUniqueName(NameContainer nameContainer, Errors errors, Integer id, String errorMessage) { if (nameContainer.getName().equals(baseRepository.findByNameAndNotId(nameContainer.getName(), id))) { - errors.rejectValue(checkField, "errorCode", errorMessage); + errors.rejectValue("title", "errorCode", errorMessage); } } - public String checkUniqueName(NameContainer nameContainer, Integer id) { + protected String checkUniqueName(NameContainer nameContainer, Integer id) { if (nameContainer.getName().equals(baseRepository.findByNameAndNotId(nameContainer.getName(), id))) { return baseRepository.findByNameAndNotId(nameContainer.getName(), id); } diff --git a/src/main/java/ru/ulstu/odin/controller/OdinController.java b/src/main/java/ru/ulstu/odin/controller/OdinController.java index 8d4fcf4..90b0a2b 100644 --- a/src/main/java/ru/ulstu/odin/controller/OdinController.java +++ b/src/main/java/ru/ulstu/odin/controller/OdinController.java @@ -9,10 +9,10 @@ import ru.ulstu.odin.service.OdinService; public abstract class OdinController { public static final String META_LIST_URL = "/meta/list"; - public static final String META_ELEMENT_URL = "/meta/element"; + private static final String META_ELEMENT_URL = "/meta/element"; - private Class listDtoClass; - private Class elementDtoClass; + private final Class listDtoClass; + private final Class elementDtoClass; @Autowired private OdinService odinService; diff --git a/src/main/java/ru/ulstu/odin/model/OdinCollectionField.java b/src/main/java/ru/ulstu/odin/model/OdinCollectionField.java index 171e78c..f8299cf 100644 --- a/src/main/java/ru/ulstu/odin/model/OdinCollectionField.java +++ b/src/main/java/ru/ulstu/odin/model/OdinCollectionField.java @@ -3,6 +3,7 @@ package ru.ulstu.odin.model; import ru.ulstu.core.error.OdinException; import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -14,9 +15,9 @@ public class OdinCollectionField extends OdinField { ParameterizedType genericType = (ParameterizedType) field.getGenericType(); Type fieldElementClass = genericType.getActualTypeArguments()[0]; try { - OdinDto someInstance = (OdinDto) ((Class) (fieldElementClass)).newInstance(); + OdinDto someInstance = (OdinDto) ((Class) (fieldElementClass)).getDeclaredConstructor().newInstance(); this.path = someInstance.getControllerPath(); - } catch (IllegalAccessException | InstantiationException e) { + } catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) { throw new OdinException(String.format("Can't create new instance, check default constructor of %s", fieldElementClass.getTypeName())); } diff --git a/src/main/java/ru/ulstu/odin/model/OdinField.java b/src/main/java/ru/ulstu/odin/model/OdinField.java index c60c945..b0d99c9 100644 --- a/src/main/java/ru/ulstu/odin/model/OdinField.java +++ b/src/main/java/ru/ulstu/odin/model/OdinField.java @@ -1,13 +1,13 @@ package ru.ulstu.odin.model; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotBlank; -import org.hibernate.validator.constraints.NotEmpty; import ru.ulstu.core.error.OdinException; import ru.ulstu.odin.model.annotation.OdinCaption; import ru.ulstu.odin.model.annotation.OdinReadOnly; import ru.ulstu.odin.model.annotation.OdinVisible; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -31,15 +31,16 @@ public abstract class OdinField implements Comparable { return this.name().toLowerCase(); } } - protected final OdinFieldType fieldType; - protected final String fieldName; - protected final String caption; - protected final OdinVisible.OdinVisibleType visible; - protected final boolean readOnly; - protected final boolean notEmpty; - private Field field; - public OdinField(Field field, OdinFieldType fieldType) { + private final OdinFieldType fieldType; + private final String fieldName; + private final String caption; + private final OdinVisible.OdinVisibleType visible; + private final boolean readOnly; + private final boolean notEmpty; + private final Field field; + + OdinField(Field field, OdinFieldType fieldType) { this.field = field; this.fieldName = getFieldName(field); this.caption = Optional.ofNullable(getValueFromAnnotation(OdinCaption.class, "value")) @@ -92,7 +93,7 @@ public abstract class OdinField implements Comparable { } } - protected T getValue(Class annotationClass, String valueName, Class clazz) { + T getValue(Class annotationClass, String valueName, Class clazz) { if (field.isAnnotationPresent(annotationClass)) { return cast(getValueFromAnnotation(annotationClass, valueName), clazz); } diff --git a/src/main/java/ru/ulstu/odin/model/OdinObjectField.java b/src/main/java/ru/ulstu/odin/model/OdinObjectField.java index d19e748..10d3606 100644 --- a/src/main/java/ru/ulstu/odin/model/OdinObjectField.java +++ b/src/main/java/ru/ulstu/odin/model/OdinObjectField.java @@ -3,6 +3,7 @@ package ru.ulstu.odin.model; import ru.ulstu.core.error.OdinException; import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Type; public class OdinObjectField extends OdinField { @@ -12,9 +13,9 @@ public class OdinObjectField extends OdinField { super(field, OdinFieldType.OBJECT); Type fieldElementClass = field.getType(); try { - OdinDto someInstance = (OdinDto) ((Class) (fieldElementClass)).newInstance(); + OdinDto someInstance = (OdinDto) ((Class) (fieldElementClass)).getDeclaredConstructor().newInstance(); this.path = someInstance.getControllerPath(); - } catch (IllegalAccessException | InstantiationException e) { + } catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) { throw new OdinException(String.format("Can't create new instance, check default constructor of %s", fieldElementClass.getTypeName())); } diff --git a/src/main/java/ru/ulstu/odin/model/OdinStringField.java b/src/main/java/ru/ulstu/odin/model/OdinStringField.java index 5157d7e..498b375 100644 --- a/src/main/java/ru/ulstu/odin/model/OdinStringField.java +++ b/src/main/java/ru/ulstu/odin/model/OdinStringField.java @@ -1,9 +1,9 @@ package ru.ulstu.odin.model; -import org.hibernate.validator.constraints.Email; import ru.ulstu.odin.model.annotation.OdinString; import ru.ulstu.odin.model.annotation.OdinString.OdinStringType; +import javax.validation.constraints.Email; import javax.validation.constraints.Size; import java.lang.reflect.Field; diff --git a/src/main/java/ru/ulstu/odinexample/controller/OdinExampleController.java b/src/main/java/ru/ulstu/odinexample/controller/OdinExampleController.java deleted file mode 100644 index 0101531..0000000 --- a/src/main/java/ru/ulstu/odinexample/controller/OdinExampleController.java +++ /dev/null @@ -1,4 +0,0 @@ -package ru.ulstu.odinexample.controller; - -public class OdinExampleController { -} diff --git a/src/main/java/ru/ulstu/odinexample/model/OdinExampleDto.java b/src/main/java/ru/ulstu/odinexample/model/OdinExampleDto.java deleted file mode 100644 index 027d96f..0000000 --- a/src/main/java/ru/ulstu/odinexample/model/OdinExampleDto.java +++ /dev/null @@ -1,4 +0,0 @@ -package ru.ulstu.odinexample.model; - -public class OdinExampleDto { -} diff --git a/src/main/java/ru/ulstu/odinexample/model/OdinExampleListDto.java b/src/main/java/ru/ulstu/odinexample/model/OdinExampleListDto.java deleted file mode 100644 index 6924519..0000000 --- a/src/main/java/ru/ulstu/odinexample/model/OdinExampleListDto.java +++ /dev/null @@ -1,103 +0,0 @@ -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; - } - -} diff --git a/src/main/java/ru/ulstu/odinexample/service/OdinExampleService.java b/src/main/java/ru/ulstu/odinexample/service/OdinExampleService.java deleted file mode 100644 index 57cea21..0000000 --- a/src/main/java/ru/ulstu/odinexample/service/OdinExampleService.java +++ /dev/null @@ -1,4 +0,0 @@ -package ru.ulstu.odinexample.service; - -public class OdinExampleService { -} diff --git a/src/main/java/ru/ulstu/paper/controller/PaperRestController.java b/src/main/java/ru/ulstu/paper/controller/PaperRestController.java index 5e5496a..c1c6faa 100644 --- a/src/main/java/ru/ulstu/paper/controller/PaperRestController.java +++ b/src/main/java/ru/ulstu/paper/controller/PaperRestController.java @@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import ru.ulstu.configuration.Constants; import ru.ulstu.core.model.response.Response; @@ -47,7 +48,7 @@ public class PaperRestController { @GetMapping("/{paper-id}") public Response getPaper(@PathVariable("paper-id") Integer paperId) { - return new Response(paperService.findById(paperId)); + return new Response<>(paperService.findById(paperId)); } @PostMapping @@ -63,7 +64,7 @@ public class PaperRestController { @DeleteMapping("/{paper-id}") public Response delete(@PathVariable("paper-id") Integer paperId) throws IOException { paperService.delete(paperId); - return new Response<>(true); + return new Response<>(Boolean.TRUE); } @PostMapping("/filter") @@ -81,6 +82,11 @@ public class PaperRestController { return new Response<>(paperService.getFormattedReference(referenceDto)); } + @PostMapping(value = "/ping") + public void ping(@RequestParam("paperId") int paperId) throws IOException { + paperService.ping(paperId); + } + @GetMapping("/allAuthors") public Response> getAllAuthors() { return new Response<>(paperService.getPaperAuthors()); diff --git a/src/main/java/ru/ulstu/paper/error/PaperConferenceRelationExistException.java b/src/main/java/ru/ulstu/paper/error/PaperConferenceRelationExistException.java deleted file mode 100644 index ddb3b5e..0000000 --- a/src/main/java/ru/ulstu/paper/error/PaperConferenceRelationExistException.java +++ /dev/null @@ -1,7 +0,0 @@ -package ru.ulstu.paper.error; - -public class PaperConferenceRelationExistException extends RuntimeException { - public PaperConferenceRelationExistException(String message) { - super(message); - } -} diff --git a/src/main/java/ru/ulstu/paper/model/Paper.java b/src/main/java/ru/ulstu/paper/model/Paper.java index 413c5db..f7b851c 100644 --- a/src/main/java/ru/ulstu/paper/model/Paper.java +++ b/src/main/java/ru/ulstu/paper/model/Paper.java @@ -2,10 +2,10 @@ package ru.ulstu.paper.model; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.validator.constraints.NotBlank; import ru.ulstu.conference.model.Conference; import ru.ulstu.core.model.BaseEntity; -import ru.ulstu.core.model.UserContainer; +import ru.ulstu.core.model.EventSource; +import ru.ulstu.core.model.UserActivity; import ru.ulstu.deadline.model.Deadline; import ru.ulstu.file.model.FileData; import ru.ulstu.grant.model.Grant; @@ -14,6 +14,7 @@ import ru.ulstu.user.model.User; import javax.persistence.CascadeType; import javax.persistence.Column; +import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; @@ -24,6 +25,7 @@ import javax.persistence.OneToMany; import javax.persistence.OrderBy; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.validation.constraints.NotBlank; import java.util.ArrayList; import java.util.Comparator; import java.util.Date; @@ -34,7 +36,8 @@ import java.util.Optional; import java.util.Set; @Entity -public class Paper extends BaseEntity implements UserContainer { +@DiscriminatorValue("PAPER") +public class Paper extends BaseEntity implements UserActivity, EventSource { public enum PaperStatus { ATTENTION("Обратить внимание"), ON_PREPARATION("На подготовке"), @@ -45,7 +48,7 @@ public class Paper extends BaseEntity implements UserContainer { DRAFT("Черновик"), FAILED("Провалены сроки"); - private String statusName; + private final String statusName; PaperStatus(String name) { this.statusName = name; @@ -62,7 +65,7 @@ public class Paper extends BaseEntity implements UserContainer { SCOPUS("Scopus"), WEB_OF_SCIENCE("Web Of Science"); - private String typeName; + private final String typeName; PaperType(String name) { this.typeName = name; @@ -196,6 +199,16 @@ public class Paper extends BaseEntity implements UserContainer { return title; } + @Override + public List getRecipients() { + return new ArrayList<>(authors); + } + + @Override + public void addObjectToEvent(Event event) { + event.setPaper(this); + } + public void setTitle(String title) { this.title = title; } @@ -249,7 +262,7 @@ public class Paper extends BaseEntity implements UserContainer { } @Override - public Set getUsers() { + public Set getActivityUsers() { return getAuthors(); } diff --git a/src/main/java/ru/ulstu/paper/model/PaperDto.java b/src/main/java/ru/ulstu/paper/model/PaperDto.java index 8474a34..cc44af5 100644 --- a/src/main/java/ru/ulstu/paper/model/PaperDto.java +++ b/src/main/java/ru/ulstu/paper/model/PaperDto.java @@ -3,11 +3,11 @@ package ru.ulstu.paper.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.StringUtils; -import org.hibernate.validator.constraints.NotEmpty; import ru.ulstu.deadline.model.Deadline; import ru.ulstu.file.model.FileDataDto; import ru.ulstu.user.model.UserDto; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/ru/ulstu/paper/model/ReferenceDto.java b/src/main/java/ru/ulstu/paper/model/ReferenceDto.java index 1705e08..bf7fed2 100644 --- a/src/main/java/ru/ulstu/paper/model/ReferenceDto.java +++ b/src/main/java/ru/ulstu/paper/model/ReferenceDto.java @@ -8,7 +8,7 @@ public class ReferenceDto { ARTICLE("Статья"), BOOK("Книга"); - private String typeName; + private final String typeName; ReferenceType(String name) { this.typeName = name; @@ -23,7 +23,7 @@ public class ReferenceDto { GOST("ГОСТ"), SPRINGER("Springer"); - private String standardName; + private final String standardName; FormatStandard(String name) { this.standardName = name; diff --git a/src/main/java/ru/ulstu/paper/service/LatexService.java b/src/main/java/ru/ulstu/paper/service/LatexService.java index 82dd1ba..ea1bcfc 100644 --- a/src/main/java/ru/ulstu/paper/service/LatexService.java +++ b/src/main/java/ru/ulstu/paper/service/LatexService.java @@ -12,11 +12,11 @@ import java.nio.file.Files; @Service public class LatexService { - private final String pdfLatexError = "Errors occurred while executing pdfLaTeX."; - private final String bibtexError = "Errors occurred while executing bibtex."; + private static final String PDF_LATEX_ERROR = "Errors occurred while executing pdfLaTeX."; + private static final String BIBTEX_ERROR = "Errors occurred while executing bibtex."; private String errorMessage; private File pdfFile; - private FileService fileService; + private final FileService fileService; public LatexService(FileService fileService) { this.fileService = fileService; @@ -42,8 +42,9 @@ public class LatexService { InputStreamReader inputStreamReader = new InputStreamReader(process.getInputStream()); try (BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) { - while ((bufferedReader.readLine()) != null) { - // + String line = bufferedReader.readLine(); + while (line != null) { + line = bufferedReader.readLine(); } } @@ -55,9 +56,9 @@ public class LatexService { } private boolean generate(String filename, File dir) throws IOException, InterruptedException { - startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, pdfLatexError); - startProcess(new String[]{"bibtex", filename}, dir, bibtexError); - if (startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, pdfLatexError) != 0) { + startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, PDF_LATEX_ERROR); + startProcess(new String[]{"bibtex", filename}, dir, BIBTEX_ERROR); + if (startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, PDF_LATEX_ERROR) != 0) { return false; } return checkPdf(filename, dir); diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java index cc3df2c..9264205 100644 --- a/src/main/java/ru/ulstu/paper/service/PaperService.java +++ b/src/main/java/ru/ulstu/paper/service/PaperService.java @@ -11,12 +11,13 @@ import ru.ulstu.paper.model.AutoCompleteData; import ru.ulstu.paper.model.Paper; import ru.ulstu.paper.model.PaperDto; import ru.ulstu.paper.model.PaperListDto; -import ru.ulstu.paper.model.Reference; import ru.ulstu.paper.model.PaperStatusDto; import ru.ulstu.paper.model.PaperTypeDto; +import ru.ulstu.paper.model.Reference; import ru.ulstu.paper.model.ReferenceDto; import ru.ulstu.paper.repository.PaperRepository; import ru.ulstu.paper.repository.ReferenceRepository; +import ru.ulstu.ping.service.PingService; import ru.ulstu.timeline.service.EventService; import ru.ulstu.user.model.User; import ru.ulstu.user.service.UserService; @@ -56,6 +57,7 @@ public class PaperService { private final FileService fileService; private final EventService eventService; private final ReferenceRepository referenceRepository; + private final PingService pingService; public PaperService(PaperRepository paperRepository, ReferenceRepository referenceRepository, @@ -63,7 +65,8 @@ public class PaperService { PaperNotificationService paperNotificationService, UserService userService, DeadlineService deadlineService, - EventService eventService) { + EventService eventService, + PingService pingService) { this.paperRepository = paperRepository; this.referenceRepository = referenceRepository; this.fileService = fileService; @@ -71,6 +74,7 @@ public class PaperService { this.userService = userService; this.deadlineService = deadlineService; this.eventService = eventService; + this.pingService = pingService; } public List findAll() { @@ -83,7 +87,7 @@ public class PaperService { return papers; } - public List findAllActive() { + private List findAllActive() { return findAll() .stream() .filter(paper -> paper.getStatus() != COMPLETED && paper.getStatus() != FAILED) @@ -95,7 +99,7 @@ public class PaperService { } public PaperDto findOneDto(Integer id) { - return new PaperDto(paperRepository.findOne(id)); + return new PaperDto(paperRepository.getOne(id)); } @Transactional @@ -137,7 +141,7 @@ public class PaperService { return paper; } - public List saveOrCreateReferences(List references) { + private List saveOrCreateReferences(List references) { return references .stream() .filter(reference -> !reference.getDeleted()) @@ -146,15 +150,15 @@ public class PaperService { } @Transactional - public Reference updateReference(ReferenceDto referenceDto) { - Reference updateReference = referenceRepository.findOne(referenceDto.getId()); + private Reference updateReference(ReferenceDto referenceDto) { + Reference updateReference = referenceRepository.getOne(referenceDto.getId()); copyFromDto(updateReference, referenceDto); referenceRepository.save(updateReference); return updateReference; } @Transactional - public Reference createReference(ReferenceDto referenceDto) { + private Reference createReference(ReferenceDto referenceDto) { Reference newReference = new Reference(); copyFromDto(newReference, referenceDto); newReference = referenceRepository.save(newReference); @@ -174,7 +178,7 @@ public class PaperService { @Transactional public Integer update(PaperDto paperDto) throws IOException { - Paper paper = paperRepository.findOne(paperDto.getId()); + Paper paper = paperRepository.getOne(paperDto.getId()); Paper.PaperStatus oldStatus = paper.getStatus(); Set oldAuthors = new HashSet<>(paper.getAuthors()); @@ -206,7 +210,7 @@ public class PaperService { @Transactional public void delete(Integer paperId) { - Paper paper = paperRepository.findOne(paperId); + Paper paper = paperRepository.getOne(paperId); paperRepository.delete(paper); } @@ -291,11 +295,11 @@ public class PaperService { } public PaperDto findById(Integer paperId) { - return new PaperDto(paperRepository.findOne(paperId)); + return new PaperDto(paperRepository.getOne(paperId)); } public Paper findPaperById(Integer paperId) { - return paperRepository.findOne(paperId); + return paperRepository.getOne(paperId); } public List findAllNotSelect(List paperIds) { @@ -356,7 +360,7 @@ public class PaperService { .collect(Collectors.toList())); } - public String getGostReference(ReferenceDto referenceDto) { + private String getGostReference(ReferenceDto referenceDto) { return MessageFormat.format(referenceDto.getReferenceType() == BOOK ? "{0} {1} - {2}{3}. - {4}с." : "{0} {1}{5} {2}{3}. С. {4}.", referenceDto.getAuthors(), referenceDto.getPublicationTitle(), @@ -366,7 +370,7 @@ public class PaperService { StringUtils.isEmpty(referenceDto.getJournalOrCollectionTitle()) ? "." : " // " + referenceDto.getJournalOrCollectionTitle() + "."); } - public String getSpringerReference(ReferenceDto referenceDto) { + private String getSpringerReference(ReferenceDto referenceDto) { return MessageFormat.format("{0} ({1}) {2}.{3} {4}pp {5}", referenceDto.getAuthors(), referenceDto.getPublicationYear() != null ? referenceDto.getPublicationYear().toString() : "", @@ -388,4 +392,9 @@ public class PaperService { autoCompleteData.setPublishers(referenceRepository.findDistinctPublishers()); return autoCompleteData; } + + @Transactional + public void ping(int paperId) throws IOException { + pingService.addPing(findPaperById(paperId)); + } } diff --git a/src/main/java/ru/ulstu/ping/model/Ping.java b/src/main/java/ru/ulstu/ping/model/Ping.java index c7e4c5e..7118c22 100644 --- a/src/main/java/ru/ulstu/ping/model/Ping.java +++ b/src/main/java/ru/ulstu/ping/model/Ping.java @@ -1,12 +1,20 @@ package ru.ulstu.ping.model; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.hibernate.annotations.Any; +import org.hibernate.annotations.AnyMetaDef; +import org.hibernate.annotations.MetaValue; import org.springframework.format.annotation.DateTimeFormat; import ru.ulstu.conference.model.Conference; import ru.ulstu.core.model.BaseEntity; +import ru.ulstu.core.model.UserActivity; +import ru.ulstu.grant.model.Grant; +import ru.ulstu.paper.model.Paper; +import ru.ulstu.project.model.Project; import ru.ulstu.user.model.User; +import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; @@ -25,9 +33,24 @@ public class Ping extends BaseEntity { @JoinColumn(name = "users_id") private User user; - @ManyToOne(optional = false) - @JoinColumn(name = "conference_id") - private Conference conference; + @Column(name = "activity_type", insertable = false, updatable = false) + private String activityType; + + @Any( + metaColumn = @Column(name = "activity_type"), + fetch = FetchType.LAZY + ) + @AnyMetaDef( + idType = "integer", metaType = "string", + metaValues = { + @MetaValue(targetEntity = Conference.class, value = "CONFERENCE"), + @MetaValue(targetEntity = Paper.class, value = "PAPER"), + @MetaValue(targetEntity = Project.class, value = "PROJECT"), + @MetaValue(targetEntity = Grant.class, value = "GRANT") + } + ) + @JoinColumn(name = "activity_id") + private UserActivity activity; public Ping() { } @@ -37,16 +60,6 @@ public class Ping extends BaseEntity { this.user = user; } - public Ping(@JsonProperty("id") Integer id, - @JsonProperty("date") Date date, - @JsonProperty("user") User user, - @JsonProperty("conference") Conference conference) { - setId(id); - this.date = date; - this.user = user; - this.conference = conference; - } - public Date getDate() { return date; } @@ -63,11 +76,11 @@ public class Ping extends BaseEntity { this.user = user; } - public Conference getConference() { - return conference; + public UserActivity getActivity() { + return this.activity; } - public void setConference(Conference conference) { - this.conference = conference; + public void setActivity(UserActivity activity) { + this.activity = activity; } } diff --git a/src/main/java/ru/ulstu/ping/model/PingInfo.java b/src/main/java/ru/ulstu/ping/model/PingInfo.java new file mode 100644 index 0000000..e8b943b --- /dev/null +++ b/src/main/java/ru/ulstu/ping/model/PingInfo.java @@ -0,0 +1,35 @@ +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 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 getPings() { + return pings; + } + + public void setPings(List pings) { + this.pings = pings; + } + + public void addPing(Ping ping) { + this.pings.add(ping); + } +} diff --git a/src/main/java/ru/ulstu/ping/repository/PingRepository.java b/src/main/java/ru/ulstu/ping/repository/PingRepository.java index de79dd7..cec24e7 100644 --- a/src/main/java/ru/ulstu/ping/repository/PingRepository.java +++ b/src/main/java/ru/ulstu/ping/repository/PingRepository.java @@ -6,8 +6,17 @@ import org.springframework.data.repository.query.Param; import ru.ulstu.conference.model.Conference; import ru.ulstu.ping.model.Ping; +import java.util.Date; +import java.util.List; + public interface PingRepository extends JpaRepository { - @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)") + @Query("SELECT count(*) FROM Ping p WHERE (DAY(p.date) = :day) AND (MONTH(p.date) = :month) AND (YEAR(p.date) = :year) AND (p.activityType = 'conference') AND (p.activity = :conference)") long countByConferenceAndDate(@Param("conference") Conference conference, @Param("day") Integer day, @Param("month") Integer month, @Param("year") Integer year); + + @Query("SELECT p FROM Ping p WHERE (:activity = '' OR p.activityType = :activity)") + List getPings(@Param("activity") String activity); + + @Query("SELECT p FROM Ping p WHERE (:dateFrom < date)") + List findByDate(@Param("dateFrom") Date dateFrom); } diff --git a/src/main/java/ru/ulstu/ping/service/PingScheduler.java b/src/main/java/ru/ulstu/ping/service/PingScheduler.java new file mode 100644 index 0000000..ca8724d --- /dev/null +++ b/src/main/java/ru/ulstu/ping/service/PingScheduler.java @@ -0,0 +1,58 @@ +package ru.ulstu.ping.service; + +import com.google.common.collect.ImmutableMap; +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.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 pingInfos = new ArrayList<>(); + + for (Ping ping : pingRepository.findByDate(java.sql.Date.valueOf(LocalDate.now().minusWeeks(1)))) { + UserActivity pingActivity = ping.getActivity(); + Set 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(ImmutableMap.of("pings", pingInfo.getPings()), + pingInfo.getUser(), "pingsInfoWeekEmail", PING_MAIL_SUBJECT); + } + } +} diff --git a/src/main/java/ru/ulstu/ping/service/PingService.java b/src/main/java/ru/ulstu/ping/service/PingService.java index 6666fdd..99ca26f 100644 --- a/src/main/java/ru/ulstu/ping/service/PingService.java +++ b/src/main/java/ru/ulstu/ping/service/PingService.java @@ -3,6 +3,7 @@ package ru.ulstu.ping.service; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ru.ulstu.conference.model.Conference; +import ru.ulstu.core.model.UserActivity; import ru.ulstu.ping.model.Ping; import ru.ulstu.ping.repository.PingRepository; import ru.ulstu.user.service.UserService; @@ -10,6 +11,7 @@ import ru.ulstu.user.service.UserService; import java.io.IOException; import java.util.Calendar; import java.util.Date; +import java.util.List; @Service public class PingService { @@ -17,15 +19,16 @@ public class PingService { private final UserService userService; public PingService(PingRepository pingRepository, - UserService userService) { + UserService userService, + PingScheduler pingScheduler) { this.pingRepository = pingRepository; this.userService = userService; } @Transactional - public Ping addPing(Conference conference) throws IOException { + public Ping addPing(UserActivity activity) throws IOException { Ping newPing = new Ping(new Date(), userService.getCurrentUser()); - newPing.setConference(conference); + newPing.setActivity(activity); return pingRepository.save(newPing); } @@ -33,4 +36,8 @@ public class PingService { return Math.toIntExact(pingRepository.countByConferenceAndDate(conference, calendar.get(Calendar.DAY_OF_MONTH), calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.YEAR))); } + + public List getPings(String activity) { + return pingRepository.getPings(activity); + } } diff --git a/src/main/java/ru/ulstu/project/controller/ProjectController.java b/src/main/java/ru/ulstu/project/controller/ProjectController.java index ae09658..09438fd 100644 --- a/src/main/java/ru/ulstu/project/controller/ProjectController.java +++ b/src/main/java/ru/ulstu/project/controller/ProjectController.java @@ -9,10 +9,13 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import ru.ulstu.deadline.model.Deadline; +import ru.ulstu.grant.model.GrantDto; import ru.ulstu.project.model.Project; import ru.ulstu.project.model.ProjectDto; import ru.ulstu.project.service.ProjectService; +import ru.ulstu.user.model.User; import springfox.documentation.annotations.ApiIgnore; import javax.validation.Valid; @@ -45,6 +48,8 @@ public class ProjectController { @GetMapping("/project") public void getProject(ModelMap modelMap, @RequestParam(value = "id") Integer id) { if (id != null && id > 0) { + ProjectDto projectDto = projectService.findOneDto(id); + attachGrant(projectDto); modelMap.put("projectDto", projectService.findOneDto(id)); } else { modelMap.put("projectDto", new ProjectDto()); @@ -69,6 +74,12 @@ public class ProjectController { return String.format("redirect:%s", "/projects/projects"); } + @PostMapping(value = "/project", params = "attachGrant") + public String attachGrant(ProjectDto projectDto) { + projectService.attachGrant(projectDto); + return "/projects/project"; + } + @PostMapping(value = "/project", params = "addDeadline") public String addDeadline(@Valid ProjectDto projectDto, Errors errors) { filterEmptyDeadlines(projectDto); @@ -79,15 +90,38 @@ public class ProjectController { return "/projects/project"; } + @PostMapping(value = "/project", params = "removeDeadline") + public String removeDeadline(ProjectDto projectDto, + @RequestParam(value = "removeDeadline") Integer deadlineId) { + projectService.removeDeadline(projectDto, deadlineId); + return "/projects/project"; + } + @GetMapping("/delete/{project-id}") public String delete(@PathVariable("project-id") Integer projectId) throws IOException { projectService.delete(projectId); return String.format("redirect:%s", "/projects/projects"); } + @ModelAttribute("allExecutors") + public List getAllExecutors(ProjectDto projectDto) { + return projectService.getProjectExecutors(projectDto); + } + + @ModelAttribute("allGrants") + public List getAllGrants() { + return projectService.getAllGrants(); + } + private void filterEmptyDeadlines(ProjectDto projectDto) { projectDto.setDeadlines(projectDto.getDeadlines().stream() .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription())) .collect(Collectors.toList())); } + + @ResponseBody + @PostMapping(value = "/ping") + public void ping(@RequestParam("projectId") int projectId) throws IOException { + projectService.ping(projectId); + } } diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java index c971c4b..0ddb982 100644 --- a/src/main/java/ru/ulstu/project/model/Project.java +++ b/src/main/java/ru/ulstu/project/model/Project.java @@ -1,33 +1,48 @@ package ru.ulstu.project.model; -import org.hibernate.validator.constraints.NotBlank; +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; import ru.ulstu.core.model.BaseEntity; +import ru.ulstu.core.model.EventSource; +import ru.ulstu.core.model.UserActivity; import ru.ulstu.deadline.model.Deadline; import ru.ulstu.file.model.FileData; import ru.ulstu.grant.model.Grant; +import ru.ulstu.timeline.model.Event; +import ru.ulstu.user.model.User; import javax.persistence.CascadeType; +import javax.persistence.DiscriminatorValue; 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.NotBlank; import javax.validation.constraints.NotNull; import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; @Entity -public class Project extends BaseEntity { +@DiscriminatorValue("PROJECT") +public class Project extends BaseEntity implements UserActivity, EventSource { + public enum ProjectStatus { - APPLICATION("Заявка"), - ON_COMPETITION("Отправлен на конкурс"), - SUCCESSFUL_PASSAGE("Успешное прохождение"), + TECHNICAL_TASK("Техническое задание"), + OPEN("Открыт"), IN_WORK("В работе"), - COMPLETED("Завершен"), + CERTIFICATE_ISSUED("Оформление свидетельства"), + CLOSED("Закрыт"), FAILED("Провалены сроки"); - private String statusName; + private final String statusName; ProjectStatus(String statusName) { this.statusName = statusName; @@ -42,7 +57,7 @@ public class Project extends BaseEntity { private String title; @Enumerated(value = EnumType.STRING) - private ProjectStatus status = ProjectStatus.APPLICATION; + private ProjectStatus status = ProjectStatus.TECHNICAL_TASK; @NotNull private String description; @@ -58,14 +73,39 @@ public class Project extends BaseEntity { @NotNull private String repository; - @ManyToOne - @JoinColumn(name = "file_id") - private FileData application; + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @JoinColumn(name = "project_id", unique = true) + @Fetch(FetchMode.SUBSELECT) + private List files = new ArrayList<>(); + + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @JoinColumn(name = "project_id") + private List events = new ArrayList<>(); + + @ManyToMany(fetch = FetchType.LAZY) + private List executors = new ArrayList<>(); + + @ManyToMany(fetch = FetchType.LAZY) + @JoinTable(name = "project_grants", + joinColumns = {@JoinColumn(name = "project_id")}, + inverseJoinColumns = {@JoinColumn(name = "grants_id")}) + @Fetch(FetchMode.SUBSELECT) + private List grants = new ArrayList<>(); public String getTitle() { return title; } + @Override + public List getRecipients() { + return executors != null ? new ArrayList<>(executors) : Collections.emptyList(); + } + + @Override + public void addObjectToEvent(Event event) { + event.setProject(this); + } + public void setTitle(String title) { this.title = title; } @@ -110,11 +150,44 @@ public class Project extends BaseEntity { this.deadlines = deadlines; } - public FileData getApplication() { - return application; + public List getFiles() { + return files; + } + + public void setFiles(List files) { + this.files = files; + } + + public List getEvents() { + return events; + } + + public void setEvents(List events) { + this.events = events; + } + + public List getExecutors() { + return executors; + } + + public void setExecutors(List executors) { + this.executors = executors; + } + + public Set getUsers() { + return new HashSet<>(getExecutors()); + } + + @Override + public Set getActivityUsers() { + return new HashSet<>(); + } + + public List getGrants() { + return grants; } - public void setApplication(FileData application) { - this.application = application; + public void setGrants(List grants) { + this.grants = grants; } } diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java index 4e03365..d5a8345 100644 --- a/src/main/java/ru/ulstu/project/model/ProjectDto.java +++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java @@ -2,12 +2,21 @@ package ru.ulstu.project.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; +import org.thymeleaf.util.StringUtils; import ru.ulstu.deadline.model.Deadline; +import ru.ulstu.file.model.FileDataDto; import ru.ulstu.grant.model.GrantDto; +import ru.ulstu.user.model.User; +import ru.ulstu.user.model.UserDto; +import javax.validation.constraints.NotEmpty; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import static ru.ulstu.core.util.StreamApiUtils.convert; public class ProjectDto { private Integer id; @@ -19,7 +28,14 @@ public class ProjectDto { private List deadlines = new ArrayList<>(); private GrantDto grant; private String repository; - private String applicationFileName; + private List files = new ArrayList<>(); + private List removedDeadlineIds = new ArrayList<>(); + private Set executorIds; + private List executors; + private List grantIds; + private List grants; + + private final static int MAX_EXECUTORS_LENGTH = 40; public ProjectDto() { } @@ -35,7 +51,12 @@ public class ProjectDto { @JsonProperty("description") String description, @JsonProperty("grant") GrantDto grant, @JsonProperty("repository") String repository, - @JsonProperty("deadlines") List deadlines) { + @JsonProperty("files") List files, + @JsonProperty("deadlines") List deadlines, + @JsonProperty("executorIds") Set executorIds, + @JsonProperty("executors") List executors, + @JsonProperty("grantIds") List grantIds, + @JsonProperty("grants") List grants) { this.id = id; this.title = title; this.status = status; @@ -43,19 +64,28 @@ public class ProjectDto { this.grant = grant; this.repository = repository; this.deadlines = deadlines; - this.applicationFileName = null; + this.files = files; + this.executorIds = executorIds; + this.executors = executors; + this.grantIds = grantIds; + this.grants = grants; } public ProjectDto(Project project) { + Set users = new HashSet(project.getExecutors()); this.id = project.getId(); this.title = project.getTitle(); this.status = project.getStatus(); this.description = project.getDescription(); - this.applicationFileName = project.getApplication() == null ? null : project.getApplication().getName(); + this.files = convert(project.getFiles(), FileDataDto::new); this.grant = project.getGrant() == null ? null : new GrantDto(project.getGrant()); this.repository = project.getRepository(); this.deadlines = project.getDeadlines(); + this.executorIds = convert(users, user -> user.getId()); + this.executors = convert(project.getExecutors(), UserDto::new); + this.grantIds = convert(project.getGrants(), grant -> grant.getId()); + this.grants = convert(project.getGrants(), GrantDto::new); } public Integer getId() { @@ -114,11 +144,58 @@ public class ProjectDto { this.deadlines = deadlines; } - public String getApplicationFileName() { - return applicationFileName; + public List getFiles() { + return files; + } + + public void setFiles(List files) { + this.files = files; + } + + public List getRemovedDeadlineIds() { + return removedDeadlineIds; + } + + public void setRemovedDeadlineIds(List removedDeadlineIds) { + this.removedDeadlineIds = removedDeadlineIds; + } + + public Set getExecutorIds() { + return executorIds; + } + + public void setExecutorIds(Set executorIds) { + this.executorIds = executorIds; + } + + public List getExecutors() { + return executors; + } + + public void setExecutors(List executors) { + this.executors = executors; + } + + public String getExecutorsString() { + return StringUtils.abbreviate(executors + .stream() + .map(executor -> executor.getLastName()) + .collect(Collectors.joining(", ")), MAX_EXECUTORS_LENGTH); + } + + public List getGrantIds() { + return grantIds; + } + + public void setGrantIds(List grantIds) { + this.grantIds = grantIds; + } + + public List getGrants() { + return grants; } - public void setApplicationFileName(String applicationFileName) { - this.applicationFileName = applicationFileName; + public void setGrants(List grants) { + this.grants = grants; } } diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java index 247624d..07b07fa 100644 --- a/src/main/java/ru/ulstu/project/service/ProjectService.java +++ b/src/main/java/ru/ulstu/project/service/ProjectService.java @@ -4,19 +4,27 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.thymeleaf.util.StringUtils; import ru.ulstu.deadline.service.DeadlineService; +import ru.ulstu.file.model.FileDataDto; import ru.ulstu.file.service.FileService; +import ru.ulstu.grant.model.GrantDto; import ru.ulstu.grant.repository.GrantRepository; +import ru.ulstu.ping.service.PingService; import ru.ulstu.project.model.Project; import ru.ulstu.project.model.ProjectDto; import ru.ulstu.project.repository.ProjectRepository; +import ru.ulstu.timeline.service.EventService; +import ru.ulstu.user.model.User; +import ru.ulstu.user.service.UserService; import java.io.IOException; import java.util.Arrays; +import java.util.Collections; import java.util.List; +import static java.util.stream.Collectors.toList; import static org.springframework.util.ObjectUtils.isEmpty; import static ru.ulstu.core.util.StreamApiUtils.convert; -import static ru.ulstu.project.model.Project.ProjectStatus.APPLICATION; +import static ru.ulstu.project.model.Project.ProjectStatus.TECHNICAL_TASK; @Service public class ProjectService { @@ -26,15 +34,24 @@ public class ProjectService { private final DeadlineService deadlineService; private final GrantRepository grantRepository; private final FileService fileService; + private final EventService eventService; + private final UserService userService; + private final PingService pingService; public ProjectService(ProjectRepository projectRepository, DeadlineService deadlineService, GrantRepository grantRepository, - FileService fileService) { + FileService fileService, + EventService eventService, + UserService userService, + PingService pingService) { this.projectRepository = projectRepository; this.deadlineService = deadlineService; this.grantRepository = grantRepository; this.fileService = fileService; + this.eventService = eventService; + this.userService = userService; + this.pingService = pingService; } public List findAll() { @@ -48,7 +65,7 @@ public class ProjectService { } public ProjectDto findOneDto(Integer id) { - return new ProjectDto(projectRepository.findOne(id)); + return new ProjectDto(projectRepository.getOne(id)); } public List getProjectStatuses() { @@ -59,39 +76,48 @@ public class ProjectService { public Project create(ProjectDto projectDto) throws IOException { Project newProject = copyFromDto(new Project(), projectDto); newProject = projectRepository.save(newProject); + eventService.createFromObject(newProject, Collections.emptyList(), false, "проекта"); return newProject; } @Transactional - public Project update(ProjectDto projectDto) throws IOException { - Project project = projectRepository.findOne(projectDto.getId()); - if (projectDto.getApplicationFileName() != null && project.getApplication() != null) { - fileService.deleteFile(project.getApplication()); - } + private Project update(ProjectDto projectDto) throws IOException { + Project project = projectRepository.getOne(projectDto.getId()); projectRepository.save(copyFromDto(project, projectDto)); + eventService.updateProjectDeadlines(project); + for (FileDataDto file : projectDto.getFiles().stream() + .filter(f -> f.isDeleted() && f.getId() != null) + .collect(toList())) { + fileService.delete(file.getId()); + } return project; } @Transactional - public void delete(Integer projectId) throws IOException { - Project project = projectRepository.findOne(projectId); - if (project.getApplication() != null) { - fileService.deleteFile(project.getApplication()); + public boolean delete(Integer projectId) throws IOException { + if (projectRepository.existsById(projectId)) { + Project project = projectRepository.getOne(projectId); + projectRepository.delete(project); + return true; } - projectRepository.delete(project); + return false; } private Project copyFromDto(Project project, ProjectDto projectDto) throws IOException { project.setDescription(projectDto.getDescription()); - project.setStatus(projectDto.getStatus() == null ? APPLICATION : projectDto.getStatus()); + project.setStatus(projectDto.getStatus() == null ? TECHNICAL_TASK : projectDto.getStatus()); project.setTitle(projectDto.getTitle()); if (projectDto.getGrant() != null && projectDto.getGrant().getId() != null) { - project.setGrant(grantRepository.findOne(projectDto.getGrant().getId())); + project.setGrant(grantRepository.getOne(projectDto.getGrant().getId())); } project.setRepository(projectDto.getRepository()); project.setDeadlines(deadlineService.saveOrCreate(projectDto.getDeadlines())); - if (projectDto.getApplicationFileName() != null) { - project.setApplication(fileService.createFileFromTmp(projectDto.getApplicationFileName())); + project.setFiles(fileService.saveOrCreate(projectDto.getFiles().stream() + .filter(f -> !f.isDeleted()) + .collect(toList()))); + project.getGrants().clear(); + if (projectDto.getGrantIds() != null && !projectDto.getGrantIds().isEmpty()) { + projectDto.getGrantIds().forEach(grantIds -> project.getGrants().add(grantRepository.findGrantById(grantIds))); } return project; } @@ -104,8 +130,42 @@ public class ProjectService { } } + public ProjectDto removeDeadline(ProjectDto projectDto, Integer deadlineId) { + if (deadlineId != null) { + projectDto.getRemovedDeadlineIds().add(deadlineId); + } + projectDto.getDeadlines().remove((int) deadlineId); + return projectDto; + } + public Project findById(Integer id) { - return projectRepository.findOne(id); + return projectRepository.getOne(id); + } + + public List getProjectExecutors(ProjectDto projectDto) { + return userService.findAll(); + } + + @Transactional + public void ping(int projectId) throws IOException { + pingService.addPing(findById(projectId)); + } + + public List getAllGrants() { + return convert(grantRepository.findAll(), GrantDto::new); + } + + private List getProjectGrants(List grantIds) { + return convert(grantRepository.findAllById(grantIds), GrantDto::new); + } + + public void attachGrant(ProjectDto projectDto) { + if (!projectDto.getGrantIds().isEmpty()) { + projectDto.getGrants().clear(); + projectDto.setGrants(getProjectGrants(projectDto.getGrantIds())); + } else { + projectDto.getGrants().clear(); + } } } diff --git a/src/main/java/ru/ulstu/strategy/api/EntityCreateStrategy.java b/src/main/java/ru/ulstu/strategy/api/EntityCreateStrategy.java index 8449e10..bf857a0 100644 --- a/src/main/java/ru/ulstu/strategy/api/EntityCreateStrategy.java +++ b/src/main/java/ru/ulstu/strategy/api/EntityCreateStrategy.java @@ -1,21 +1,21 @@ package ru.ulstu.strategy.api; -import ru.ulstu.core.model.UserContainer; +import ru.ulstu.core.model.UserActivity; import ru.ulstu.user.model.User; import java.util.List; import java.util.stream.Collectors; -public abstract class EntityCreateStrategy { +public abstract class EntityCreateStrategy { protected abstract List getActiveEntities(); protected abstract void createEntity(User user); - protected void createDefaultEntityIfNeed(List allUsers, List entities) { + private void createDefaultEntityIfNeed(List allUsers, List entities) { allUsers.forEach(user -> { if (entities .stream() - .filter(entity -> entity.getUsers().contains(user)) + .filter(entity -> entity.getActivityUsers().contains(user)) .collect(Collectors.toSet()).isEmpty()) { createEntity(user); } diff --git a/src/main/java/ru/ulstu/students/controller/Navigation.java b/src/main/java/ru/ulstu/students/controller/Navigation.java index 3804a8b..348f062 100644 --- a/src/main/java/ru/ulstu/students/controller/Navigation.java +++ b/src/main/java/ru/ulstu/students/controller/Navigation.java @@ -2,7 +2,7 @@ package ru.ulstu.students.controller; import org.springframework.validation.Errors; -public class Navigation { +class Navigation { public static final String REDIRECT_TO = "redirect:%s"; public static final String TASKS_PAGE = "/students/tasks"; public static final String TASK_PAGE = "/students/task"; diff --git a/src/main/java/ru/ulstu/students/model/Task.java b/src/main/java/ru/ulstu/students/model/Task.java index 2a03e37..4da0aa2 100644 --- a/src/main/java/ru/ulstu/students/model/Task.java +++ b/src/main/java/ru/ulstu/students/model/Task.java @@ -2,10 +2,12 @@ package ru.ulstu.students.model; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.validator.constraints.NotBlank; import ru.ulstu.core.model.BaseEntity; +import ru.ulstu.core.model.EventSource; import ru.ulstu.deadline.model.Deadline; import ru.ulstu.tags.model.Tag; +import ru.ulstu.timeline.model.Event; +import ru.ulstu.user.model.User; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -20,12 +22,14 @@ import javax.persistence.OneToMany; import javax.persistence.OrderBy; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.validation.constraints.NotBlank; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; @Entity -public class Task extends BaseEntity { +public class Task extends BaseEntity implements EventSource { public enum TaskStatus { IN_WORK("В работе"), @@ -33,7 +37,7 @@ public class Task extends BaseEntity { FAILED("Провалены сроки"), LOADED_FROM_KIAS("Загружен автоматически"); - private String statusName; + private final String statusName; TaskStatus(String name) { this.statusName = name; @@ -49,6 +53,10 @@ public class Task extends BaseEntity { private String description; + public Task() { + + } + @Enumerated(value = EnumType.STRING) private TaskStatus status = TaskStatus.IN_WORK; @@ -77,6 +85,16 @@ public class Task extends BaseEntity { return title; } + @Override + public List getRecipients() { + return Collections.emptyList(); + } + + @Override + public void addObjectToEvent(Event event) { + event.setTask(this); + } + public void setTitle(String title) { this.title = title; } diff --git a/src/main/java/ru/ulstu/students/model/TaskDto.java b/src/main/java/ru/ulstu/students/model/TaskDto.java index 2df691f..24ad204 100644 --- a/src/main/java/ru/ulstu/students/model/TaskDto.java +++ b/src/main/java/ru/ulstu/students/model/TaskDto.java @@ -3,10 +3,10 @@ package ru.ulstu.students.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.StringUtils; -import org.hibernate.validator.constraints.NotEmpty; import ru.ulstu.deadline.model.Deadline; import ru.ulstu.tags.model.Tag; +import javax.validation.constraints.NotEmpty; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/src/main/java/ru/ulstu/students/service/SchedulerService.java b/src/main/java/ru/ulstu/students/service/SchedulerService.java index 9d14926..b192130 100644 --- a/src/main/java/ru/ulstu/students/service/SchedulerService.java +++ b/src/main/java/ru/ulstu/students/service/SchedulerService.java @@ -38,8 +38,8 @@ public class SchedulerService { @Transactional private void delete(Integer schedulerId) { - if (schedulerRepository.exists(schedulerId)) { - schedulerRepository.delete(schedulerId); + if (schedulerRepository.existsById(schedulerId)) { + schedulerRepository.deleteById(schedulerId); } } diff --git a/src/main/java/ru/ulstu/students/service/TaskService.java b/src/main/java/ru/ulstu/students/service/TaskService.java index e89aedf..c3b4f3a 100644 --- a/src/main/java/ru/ulstu/students/service/TaskService.java +++ b/src/main/java/ru/ulstu/students/service/TaskService.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; @@ -64,7 +65,7 @@ public class TaskService { } public TaskDto findOneDto(Integer id) { - return new TaskDto(taskRepository.findOne(id)); + return new TaskDto(taskRepository.getOne(id)); } public List filter(TaskFilterDto filterDto) { @@ -83,7 +84,7 @@ public class TaskService { public Integer create(TaskDto taskDto) throws IOException { Task newTask = copyFromDto(new Task(), taskDto); newTask = taskRepository.save(newTask); - eventService.createFromTask(newTask); + eventService.createFromObject(newTask, Collections.emptyList(), true, "задачи"); return newTask.getId(); } @@ -100,8 +101,8 @@ public class TaskService { } @Transactional - public Integer update(TaskDto taskDto) throws IOException { - Task task = taskRepository.findOne(taskDto.getId()); + private Integer update(TaskDto taskDto) throws IOException { + Task task = taskRepository.getOne(taskDto.getId()); taskRepository.save(copyFromDto(task, taskDto)); eventService.updateTaskDeadlines(task); return task.getId(); @@ -109,13 +110,13 @@ public class TaskService { @Transactional public boolean delete(Integer taskId) throws IOException { - if (taskRepository.exists(taskId)) { - Task scheduleTask = taskRepository.findOne(taskId); + if (taskRepository.existsById(taskId)) { + Task scheduleTask = taskRepository.getOne(taskId); Scheduler sch = schedulerRepository.findOneByTask(scheduleTask); if (sch != null) { - schedulerRepository.delete(sch.getId()); + schedulerRepository.deleteById(sch.getId()); } - taskRepository.delete(taskId); + taskRepository.deleteById(taskId); return true; } return false; diff --git a/src/main/java/ru/ulstu/tags/model/Tag.java b/src/main/java/ru/ulstu/tags/model/Tag.java index e1c63d2..023cfb4 100644 --- a/src/main/java/ru/ulstu/tags/model/Tag.java +++ b/src/main/java/ru/ulstu/tags/model/Tag.java @@ -2,12 +2,12 @@ package ru.ulstu.tags.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotEmpty; import ru.ulstu.core.model.BaseEntity; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Size; import java.util.Objects; diff --git a/src/main/java/ru/ulstu/tags/service/TagService.java b/src/main/java/ru/ulstu/tags/service/TagService.java index ba942f1..f85889d 100644 --- a/src/main/java/ru/ulstu/tags/service/TagService.java +++ b/src/main/java/ru/ulstu/tags/service/TagService.java @@ -33,17 +33,17 @@ public class TagService { } @Transactional - public Tag getExistById(Tag tag) { - return tagRepository.findOne(tag.getId()); + private Tag getExistById(Tag tag) { + return tagRepository.getOne(tag.getId()); } @Transactional - public Tag isExistByName(String tagName) { + private Tag isExistByName(String tagName) { return tagRepository.findByName(tagName); } @Transactional - public Tag create(Tag tag) { + private Tag create(Tag tag) { Tag newTag = new Tag(); newTag.setTagName(tag.getTagName()); newTag = tagRepository.save(newTag); @@ -55,7 +55,7 @@ public class TagService { } public Tag findById(Integer tagId) { - return tagRepository.findOne(tagId); + return tagRepository.getOne(tagId); } } diff --git a/src/main/java/ru/ulstu/timeline/controller/EventController.java b/src/main/java/ru/ulstu/timeline/controller/EventController.java index 77cb118..2a9245c 100644 --- a/src/main/java/ru/ulstu/timeline/controller/EventController.java +++ b/src/main/java/ru/ulstu/timeline/controller/EventController.java @@ -16,12 +16,9 @@ import ru.ulstu.timeline.service.EventService; import javax.validation.Valid; import java.util.List; -import static ru.ulstu.timeline.controller.EventController.URL; - @RestController -@RequestMapping(URL) +@RequestMapping(Constants.API_1_0 + "events") public class EventController { - public static final String URL = Constants.API_1_0 + "events"; private final EventService eventService; @@ -40,18 +37,18 @@ public class EventController { } @PostMapping - public Response createEvent(@RequestBody @Valid EventDto timelineDto) { - return new Response(eventService.create(timelineDto)); + public Response createEvent(@RequestBody @Valid EventDto timelineDto) { + return new Response<>(eventService.create(timelineDto)); } @PutMapping - public Response updateEvent(@RequestBody @Valid EventDto eventDto) { - return new Response(eventService.update(eventDto)); + public Response updateEvent(@RequestBody @Valid EventDto eventDto) { + return new Response<>(eventService.update(eventDto)); } @DeleteMapping("/{event-id}") - public Response delete(@PathVariable("event-id") Integer eventId) { + public Response delete(@PathVariable("event-id") Integer eventId) { eventService.delete(eventId); - return new Response(true); + return new Response<>(Boolean.TRUE); } } diff --git a/src/main/java/ru/ulstu/timeline/model/Event.java b/src/main/java/ru/ulstu/timeline/model/Event.java index 8038f0b..bf69a70 100644 --- a/src/main/java/ru/ulstu/timeline/model/Event.java +++ b/src/main/java/ru/ulstu/timeline/model/Event.java @@ -1,10 +1,10 @@ package ru.ulstu.timeline.model; -import org.hibernate.validator.constraints.NotBlank; import ru.ulstu.conference.model.Conference; import ru.ulstu.core.model.BaseEntity; import ru.ulstu.grant.model.Grant; import ru.ulstu.paper.model.Paper; +import ru.ulstu.project.model.Project; import ru.ulstu.students.model.Task; import ru.ulstu.user.model.User; @@ -20,6 +20,7 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Date; @@ -30,7 +31,7 @@ public class Event extends BaseEntity { public enum EventStatus { POSSIBLE("Возможное"), NEW("Новое"), IN_PROGRESS("В процессе"), COMPLETED("Завершено"); - private String name; + private final String name; EventStatus(String name) { this.name = name; @@ -88,6 +89,10 @@ public class Event extends BaseEntity { @JoinColumn(name = "grant_id") private Grant grant; + @ManyToOne + @JoinColumn(name = "project_id") + private Project project; + @ManyToOne @JoinColumn(name = "task_id") private Task task; @@ -196,6 +201,14 @@ public class Event extends BaseEntity { this.grant = grant; } + public Project getProject() { + return project; + } + + public void setProject(Project project) { + this.project = project; + } + public Task getTask() { return task; } diff --git a/src/main/java/ru/ulstu/timeline/model/EventDto.java b/src/main/java/ru/ulstu/timeline/model/EventDto.java index ccf0f0a..7c3a836 100644 --- a/src/main/java/ru/ulstu/timeline/model/EventDto.java +++ b/src/main/java/ru/ulstu/timeline/model/EventDto.java @@ -2,13 +2,14 @@ package ru.ulstu.timeline.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import org.hibernate.validator.constraints.NotBlank; import ru.ulstu.conference.model.ConferenceDto; import ru.ulstu.grant.model.GrantDto; import ru.ulstu.paper.model.PaperDto; +import ru.ulstu.project.model.ProjectDto; import ru.ulstu.students.model.TaskDto; import ru.ulstu.user.model.UserDto; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; @@ -30,6 +31,7 @@ public class EventDto { private PaperDto paperDto; private ConferenceDto conferenceDto; private GrantDto grantDto; + private ProjectDto projectDto; private TaskDto taskDto; @JsonCreator @@ -45,6 +47,7 @@ public class EventDto { @JsonProperty("recipients") List recipients, @JsonProperty("conferenceDto") ConferenceDto conferenceDto, @JsonProperty("grantDto") GrantDto grantDto, + @JsonProperty("projectDto") ProjectDto projectDto, @JsonProperty("taskDto") TaskDto taskDto) { this.id = id; this.title = title; @@ -58,6 +61,7 @@ public class EventDto { this.paperDto = paperDto; this.conferenceDto = conferenceDto; this.grantDto = grantDto; + this.projectDto = projectDto; this.taskDto = taskDto; } @@ -80,6 +84,9 @@ public class EventDto { if (grantDto != null) { this.grantDto = new GrantDto(event.getGrant()); } + if (projectDto != null) { + this.projectDto = new ProjectDto(event.getProject()); + } if (taskDto != null) { this.taskDto = new TaskDto(event.getTask()); } @@ -145,6 +152,14 @@ public class EventDto { this.grantDto = grantDto; } + public ProjectDto getProjectDto() { + return projectDto; + } + + public void setProjectDto(ProjectDto projectDto) { + this.projectDto = projectDto; + } + public TaskDto getTaskDto() { return taskDto; } diff --git a/src/main/java/ru/ulstu/timeline/model/EventStatusDto.java b/src/main/java/ru/ulstu/timeline/model/EventStatusDto.java deleted file mode 100644 index 6bb4bbc..0000000 --- a/src/main/java/ru/ulstu/timeline/model/EventStatusDto.java +++ /dev/null @@ -1,19 +0,0 @@ -package ru.ulstu.timeline.model; - -public class EventStatusDto { - private final String id; - private final String name; - - public EventStatusDto(Event.EventStatus status) { - this.id = status.name(); - this.name = status.getName(); - } - - public String getId() { - return id; - } - - public String getName() { - return name; - } -} diff --git a/src/main/java/ru/ulstu/timeline/model/PeriodEvent.java b/src/main/java/ru/ulstu/timeline/model/PeriodEvent.java index c25528e..39eaffb 100644 --- a/src/main/java/ru/ulstu/timeline/model/PeriodEvent.java +++ b/src/main/java/ru/ulstu/timeline/model/PeriodEvent.java @@ -8,8 +8,8 @@ public enum PeriodEvent { EVERY_WEEK(Period.ofWeeks(1), "Каждую неделю"), EVERY_DAY(Period.ofDays(1), "Каждый день"); - private Period period; - private String message; + private final Period period; + private final String message; PeriodEvent(Period period, String message) { this.period = period; diff --git a/src/main/java/ru/ulstu/timeline/repository/EventRepository.java b/src/main/java/ru/ulstu/timeline/repository/EventRepository.java index 7ebd3c9..15e1355 100644 --- a/src/main/java/ru/ulstu/timeline/repository/EventRepository.java +++ b/src/main/java/ru/ulstu/timeline/repository/EventRepository.java @@ -5,6 +5,7 @@ import org.springframework.data.jpa.repository.Query; import ru.ulstu.conference.model.Conference; import ru.ulstu.grant.model.Grant; import ru.ulstu.paper.model.Paper; +import ru.ulstu.project.model.Project; import ru.ulstu.students.model.Task; import ru.ulstu.timeline.model.Event; @@ -23,5 +24,7 @@ public interface EventRepository extends JpaRepository { List findAllByGrant(Grant grant); + List findAllByProject(Project project); + List findAllByTask(Task task); } diff --git a/src/main/java/ru/ulstu/timeline/service/EventService.java b/src/main/java/ru/ulstu/timeline/service/EventService.java index 8c68291..c7639c2 100644 --- a/src/main/java/ru/ulstu/timeline/service/EventService.java +++ b/src/main/java/ru/ulstu/timeline/service/EventService.java @@ -5,9 +5,11 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ru.ulstu.conference.model.Conference; +import ru.ulstu.core.model.EventSource; import ru.ulstu.deadline.model.Deadline; import ru.ulstu.grant.model.Grant; import ru.ulstu.paper.model.Paper; +import ru.ulstu.project.model.Project; import ru.ulstu.students.model.Task; import ru.ulstu.timeline.model.Event; import ru.ulstu.timeline.model.EventDto; @@ -16,7 +18,7 @@ import ru.ulstu.timeline.repository.EventRepository; import ru.ulstu.user.model.UserDto; import ru.ulstu.user.service.UserService; -import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -47,7 +49,7 @@ public class EventService { } @Transactional - public int create(EventDto eventDto) { + public Integer create(EventDto eventDto) { return eventRepository.save(copyFromDto(new Event(), eventDto)).getId(); } @@ -65,7 +67,7 @@ public class EventService { @Transactional public Integer update(EventDto eventDto) { - Event event = eventRepository.findOne(eventDto.getId()); + Event event = eventRepository.getOne(eventDto.getId()); return eventRepository.save(copyFromDto(event, eventDto)).getId(); } @@ -76,13 +78,13 @@ public class EventService { @Transactional public void delete(Integer eventId) { - Event event = eventRepository.findOne(eventId); + Event event = eventRepository.getOne(eventId); event.setParents(null); eventRepository.delete(event); } public List findByIds(List ids) { - return eventRepository.findAll(ids); + return eventRepository.findAllById(ids); } public void createBasedOn(Event event, Date executeDate) { @@ -97,46 +99,53 @@ public class EventService { event = eventRepository.save(event); //set child to parent - Event parentEvent = eventRepository.findOne(parentEventId); + Event parentEvent = eventRepository.getOne(parentEventId); parentEvent.setChild(event); eventRepository.save(parentEvent); } public void createFromPaper(Paper newPaper) { + createFromObject(newPaper, Collections.emptyList(), false, "статьи"); + } + + public void createFromObject(EventSource eventSource, List events, Boolean addCurrentUser, String suffix) { List timelines = timelineService.findAll(); Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0); - for (Deadline deadline : newPaper.getDeadlines() + timeline.getEvents().removeAll(events); + for (Deadline deadline : eventSource.getDeadlines() .stream() .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date())) .collect(Collectors.toList())) { Event newEvent = new Event(); - newEvent.setTitle("Дедлайн статьи"); + newEvent.setTitle("Дедлайн " + suffix); newEvent.setStatus(Event.EventStatus.NEW); newEvent.setExecuteDate(deadline.getDate()); newEvent.setCreateDate(new Date()); newEvent.setUpdateDate(new Date()); - newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' cтатьи '" + newPaper.getTitle() + "'"); - newEvent.setRecipients(new ArrayList(newPaper.getAuthors())); - newEvent.setPaper(newPaper); - eventRepository.save(newEvent); - - timeline.getEvents().add(newEvent); - timelineService.save(timeline); + newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' " + suffix + " '" + + eventSource.getTitle() + "'"); + if (addCurrentUser) { + newEvent.getRecipients().add(userService.getCurrentUser()); + } + newEvent.setRecipients(eventSource.getRecipients()); + eventSource.addObjectToEvent(newEvent); + timeline.getEvents().add(eventRepository.save(newEvent)); } + timelineService.save(timeline); } public void updatePaperDeadlines(Paper paper) { - eventRepository.delete(eventRepository.findAllByPaper(paper)); - - createFromPaper(paper); + List foundEvents = eventRepository.findAllByPaper(paper); + eventRepository.deleteAll(foundEvents); + createFromObject(paper, foundEvents, false, "статьи"); } public List findByCurrentDate() { return eventRepository.findByCurrentDate(); } - public List findAllFuture() { + private List findAllFuture() { return eventRepository.findAllFuture(); } @@ -144,98 +153,28 @@ public class EventService { return convert(findAllFuture(), EventDto::new); } - public void createFromConference(Conference newConference) { - List timelines = timelineService.findAll(); - Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0); - - for (Deadline deadline : newConference.getDeadlines() - .stream() - .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date())) - .collect(Collectors.toList())) { - Event newEvent = new Event(); - newEvent.setTitle("Дедлайн конференции"); - newEvent.setStatus(Event.EventStatus.NEW); - newEvent.setExecuteDate(deadline.getDate()); - newEvent.setCreateDate(new Date()); - newEvent.setUpdateDate(new Date()); - newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' конференции '" + newConference.getTitle() + "'"); - newConference.getUsers().forEach(conferenceUser -> newEvent.getRecipients().add(conferenceUser.getUser())); - newEvent.setConference(newConference); - save(newEvent); - - timeline.getEvents().add(newEvent); - timelineService.save(timeline); - } - } - public void updateConferenceDeadlines(Conference conference) { - eventRepository.delete(eventRepository.findAllByConference(conference)); - createFromConference(conference); + eventRepository.deleteAll(eventRepository.findAllByConference(conference)); + createFromObject(conference, Collections.emptyList(), false, "конференции"); } - public void createFromGrant(Grant newGrant) { - List timelines = timelineService.findAll(); - Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0); - - for (Deadline deadline : newGrant.getDeadlines() - .stream() - .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date())) - .collect(Collectors.toList())) { - Event newEvent = new Event(); - newEvent.setTitle("Дедлайн гранта"); - newEvent.setStatus(Event.EventStatus.NEW); - newEvent.setExecuteDate(deadline.getDate()); - newEvent.setCreateDate(new Date()); - newEvent.setUpdateDate(new Date()); - newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' гранта '" + newGrant.getTitle() + "'"); - if (newGrant.getAuthors() != null) { - newEvent.setRecipients(new ArrayList(newGrant.getAuthors())); - } - newEvent.getRecipients().add(newGrant.getLeader()); - newEvent.setGrant(newGrant); - eventRepository.save(newEvent); - - timeline.getEvents().add(newEvent); - timelineService.save(timeline); - } + public void updateGrantDeadlines(Grant grant) { + eventRepository.deleteAll(eventRepository.findAllByGrant(grant)); + createFromObject(grant, Collections.emptyList(), false, "гранта"); } - public void updateGrantDeadlines(Grant grant) { - eventRepository.delete(eventRepository.findAllByGrant(grant)); - createFromGrant(grant); + public void updateProjectDeadlines(Project project) { + eventRepository.deleteAll(eventRepository.findAllByProject(project)); + createFromObject(project, Collections.emptyList(), false, "проекта"); } public void removeConferencesEvent(Conference conference) { List eventList = eventRepository.findAllByConference(conference); - eventList.forEach(event -> eventRepository.delete(event.getId())); - } - - public void createFromTask(Task newTask) { - List timelines = timelineService.findAll(); - Timeline timeline = timelines.isEmpty() ? new Timeline() : timelines.get(0); - - for (Deadline deadline : newTask.getDeadlines() - .stream() - .filter(d -> d.getDate().after(new Date()) || DateUtils.isSameDay(d.getDate(), new Date())) - .collect(Collectors.toList())) { - Event newEvent = new Event(); - newEvent.setTitle("Дедлайн задачи"); - newEvent.setStatus(Event.EventStatus.NEW); - newEvent.setExecuteDate(deadline.getDate()); - newEvent.setCreateDate(new Date()); - newEvent.setUpdateDate(new Date()); - newEvent.setDescription("Дедлайн '" + deadline.getDescription() + "' задачи '" + newTask.getTitle() + "'"); - newEvent.getRecipients().add(userService.getCurrentUser()); - newEvent.setTask(newTask); - eventRepository.save(newEvent); - - timeline.getEvents().add(newEvent); - timelineService.save(timeline); - } + eventList.forEach(event -> eventRepository.deleteById(event.getId())); } public void updateTaskDeadlines(Task task) { - eventRepository.delete(eventRepository.findAllByTask(task)); - createFromTask(task); + eventRepository.deleteAll(eventRepository.findAllByTask(task)); + createFromObject(task, Collections.emptyList(), true, "задачи"); } -} +} \ No newline at end of file diff --git a/src/main/java/ru/ulstu/timeline/service/TimelineService.java b/src/main/java/ru/ulstu/timeline/service/TimelineService.java index 09f90c0..dd5c384 100644 --- a/src/main/java/ru/ulstu/timeline/service/TimelineService.java +++ b/src/main/java/ru/ulstu/timeline/service/TimelineService.java @@ -48,13 +48,13 @@ public class TimelineService { @Transactional public Integer update(TimelineDto timelineDto) { - Timeline timeline = timelineRepository.findOne(timelineDto.getId()); + Timeline timeline = timelineRepository.getOne(timelineDto.getId()); return timelineRepository.save(copyFromDto(timeline, timelineDto)).getId(); } @Transactional public void delete(Integer timelineId) { - Timeline timeline = timelineRepository.findOne(timelineId); + Timeline timeline = timelineRepository.getOne(timelineId); timelineRepository.delete(timeline); } } diff --git a/src/main/java/ru/ulstu/user/component/IpAddressResolver.java b/src/main/java/ru/ulstu/user/component/IpAddressResolver.java index 4c74923..ede78de 100644 --- a/src/main/java/ru/ulstu/user/component/IpAddressResolver.java +++ b/src/main/java/ru/ulstu/user/component/IpAddressResolver.java @@ -4,7 +4,7 @@ import org.springframework.util.StringUtils; import javax.servlet.http.HttpServletRequest; -public final class IpAddressResolver { +final class IpAddressResolver { private static final String CLIENT_IP_HEADER = "Client-IP"; private static final String FORWARDED_FOR_HEADER = "X-Forwarded-For"; diff --git a/src/main/java/ru/ulstu/user/controller/UserController.java b/src/main/java/ru/ulstu/user/controller/UserController.java index c40ed8f..3e653fb 100644 --- a/src/main/java/ru/ulstu/user/controller/UserController.java +++ b/src/main/java/ru/ulstu/user/controller/UserController.java @@ -3,7 +3,6 @@ package ru.ulstu.user.controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.annotation.Secured; -import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -33,7 +32,6 @@ import ru.ulstu.user.service.UserSessionService; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import javax.validation.Valid; - import java.util.Map; import static ru.ulstu.user.controller.UserController.URL; @@ -43,9 +41,9 @@ import static ru.ulstu.user.controller.UserController.URL; public class UserController extends OdinController { public static final String URL = Constants.API_1_0 + "users"; public static final String ROLES_URL = "/roles"; - public static final String ROLES_META_URL = ROLES_URL + OdinController.META_LIST_URL; - public static final String SESSIONS_URL = "/sessions"; - public static final String SESSIONS_META_URL = SESSIONS_URL + OdinController.META_LIST_URL; + private static final String ROLES_META_URL = ROLES_URL + OdinController.META_LIST_URL; + private static final String SESSIONS_URL = "/sessions"; + private static final String SESSIONS_META_URL = SESSIONS_URL + OdinController.META_LIST_URL; public static final String REGISTER_URL = "/register"; public static final String ACTIVATE_URL = "/activate"; public static final String PASSWORD_RESET_REQUEST_URL = "/password-reset-request"; @@ -171,4 +169,15 @@ public class UserController extends OdinController { public void inviteUser(@RequestParam("email") String email) { userService.inviteUser(email); } + + @GetMapping("/activities/pings") + public Response> getActivitesStats(@RequestParam(value = "userId", required = false) Integer userId, + @RequestParam(value = "activity", required = false) String activity) { + return new Response<>(userService.getActivitiesPings(userId, activity)); + } + + @PostMapping("/block") + public void blockUser(@RequestParam("userId") Integer userId) { + userService.blockUser(userId); + } } diff --git a/src/main/java/ru/ulstu/user/controller/UserMvcController.java b/src/main/java/ru/ulstu/user/controller/UserMvcController.java index 5bcbd13..1207219 100644 --- a/src/main/java/ru/ulstu/user/controller/UserMvcController.java +++ b/src/main/java/ru/ulstu/user/controller/UserMvcController.java @@ -1,22 +1,26 @@ package ru.ulstu.user.controller; +import com.google.common.collect.ImmutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import ru.ulstu.configuration.Constants; import ru.ulstu.odin.controller.OdinController; -import ru.ulstu.user.model.UserDto; import ru.ulstu.user.model.User; +import ru.ulstu.user.model.UserDto; import ru.ulstu.user.model.UserListDto; import ru.ulstu.user.service.UserService; import ru.ulstu.user.service.UserSessionService; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import java.util.List; +import java.util.Map; @Controller @RequestMapping(value = "/users") @@ -48,4 +52,23 @@ public class UserMvcController extends OdinController { User user = userSessionService.getUserBySessionId(sessionId); modelMap.addAttribute("userDto", userService.updateUserInformation(user, userDto)); } + + @GetMapping("/dashboard") + public void getUsersDashboard(ModelMap modelMap) { + modelMap.addAllAttributes(userService.getUsersInfo()); + } + + @ModelAttribute("allUsers") + public List getAllUsers() { + return userService.findAll(); + } + + @ModelAttribute("allActivities") + public Map getAllActivites() { + return ImmutableMap.of("PAPER", "Статьи", + "GRANT", "Гранты", + "PROJECT", "Проекты", + "CONFERENCE", "Конференции"); + } + } diff --git a/src/main/java/ru/ulstu/user/error/UserBlockedException.java b/src/main/java/ru/ulstu/user/error/UserBlockedException.java new file mode 100644 index 0000000..23b9b3a --- /dev/null +++ b/src/main/java/ru/ulstu/user/error/UserBlockedException.java @@ -0,0 +1,9 @@ +package ru.ulstu.user.error; + +import org.springframework.security.core.AuthenticationException; + +public class UserBlockedException extends AuthenticationException { + public UserBlockedException(String message) { + super(message); + } +} diff --git a/src/main/java/ru/ulstu/user/model/User.java b/src/main/java/ru/ulstu/user/model/User.java index 520b439..e4461d5 100644 --- a/src/main/java/ru/ulstu/user/model/User.java +++ b/src/main/java/ru/ulstu/user/model/User.java @@ -1,7 +1,6 @@ package ru.ulstu.user.model; import org.hibernate.annotations.BatchSize; -import org.hibernate.validator.constraints.Email; import ru.ulstu.configuration.Constants; import ru.ulstu.core.model.BaseEntity; @@ -12,9 +11,11 @@ import javax.persistence.Enumerated; import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.validation.constraints.Email; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; @@ -91,11 +92,15 @@ public class User extends BaseEntity { @Temporal(TemporalType.TIMESTAMP) private Date birthDate; + @ManyToOne() + @JoinColumn(name = "blocker_id") + private User blocker; + public enum UserDegree { CANDIDATE("Кандидат технических наук"), DOCTOR("Доктор технических наук"); - private String degreeName; + private final String degreeName; UserDegree(String degreeName) { this.degreeName = degreeName; @@ -229,6 +234,14 @@ public class User extends BaseEntity { this.degree = degree; } + public User getBlocker() { + return blocker; + } + + public void setBlocker(User blocker) { + this.blocker = blocker; + } + public String getUserAbbreviate() { return String.format(USER_ABBREVIATE_TEMPLATE, lastName == null ? "" : lastName, diff --git a/src/main/java/ru/ulstu/user/model/UserDto.java b/src/main/java/ru/ulstu/user/model/UserDto.java index 39ff913..a2f33f6 100644 --- a/src/main/java/ru/ulstu/user/model/UserDto.java +++ b/src/main/java/ru/ulstu/user/model/UserDto.java @@ -1,8 +1,6 @@ package ru.ulstu.user.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.hibernate.validator.constraints.Email; -import org.hibernate.validator.constraints.NotBlank; import org.springframework.util.StringUtils; import ru.ulstu.configuration.Constants; import ru.ulstu.odin.model.OdinDto; @@ -12,6 +10,8 @@ import ru.ulstu.odin.model.annotation.OdinString; import ru.ulstu.odin.model.annotation.OdinVisible; import ru.ulstu.user.controller.UserController; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import java.util.Collection; @@ -53,7 +53,7 @@ public class UserDto implements OdinDto { private boolean activated; @OdinCaption("Роли") - private LinkedHashSet roles; + private final LinkedHashSet roles; @OdinString(type = PASSWORD) @OdinVisible(type = OdinVisible.OdinVisibleType.ON_UPDATE) @@ -189,9 +189,9 @@ public class UserDto implements OdinDto { @JsonIgnore public boolean isPasswordsValid() { if (StringUtils.isEmpty(password) || StringUtils.isEmpty(passwordConfirm)) { - return false; + return true; } - return Objects.equals(password, passwordConfirm); + return !Objects.equals(password, passwordConfirm); } @JsonIgnore diff --git a/src/main/java/ru/ulstu/user/model/UserInfoNow.java b/src/main/java/ru/ulstu/user/model/UserInfoNow.java new file mode 100644 index 0000000..7d69c56 --- /dev/null +++ b/src/main/java/ru/ulstu/user/model/UserInfoNow.java @@ -0,0 +1,50 @@ +package ru.ulstu.user.model; + +import ru.ulstu.conference.model.Conference; +import ru.ulstu.utils.timetable.model.Lesson; + +public class UserInfoNow { + private Lesson lesson; + private Conference conference; + private User user; + private boolean isOnline; + + public UserInfoNow(Lesson lesson, Conference conference, User user, boolean isOnline) { + this.lesson = lesson; + this.conference = conference; + this.user = user; + this.isOnline = isOnline; + } + + public Lesson getLesson() { + return lesson; + } + + public void setLesson(Lesson lesson) { + this.lesson = lesson; + } + + public Conference getConference() { + return conference; + } + + public void setConference(Conference conference) { + this.conference = conference; + } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + public boolean isOnline() { + return isOnline; + } + + public void setOnline(boolean online) { + isOnline = online; + } +} diff --git a/src/main/java/ru/ulstu/user/model/UserListDto.java b/src/main/java/ru/ulstu/user/model/UserListDto.java index 2df2174..4f108dc 100644 --- a/src/main/java/ru/ulstu/user/model/UserListDto.java +++ b/src/main/java/ru/ulstu/user/model/UserListDto.java @@ -11,19 +11,19 @@ import java.util.Optional; public class UserListDto implements OdinDto { @OdinVisible(type = OdinVisible.OdinVisibleType.NONE) - private int id; + private final int id; @OdinCaption("Логин") - private String login; + private final String login; @OdinCaption("Имя") - private String firstName; + private final String firstName; @OdinCaption("Фамилия") - private String lastName; + private final String lastName; @OdinCaption("E-Mail") - private String email; + private final String email; @OdinCaption("Аккаунт активен") - private boolean activated; + private final boolean activated; @OdinCaption("Права администратора") - private boolean admin; + private final boolean admin; public UserListDto(User user) { this.id = user.getId(); diff --git a/src/main/java/ru/ulstu/user/model/UserResetPasswordDto.java b/src/main/java/ru/ulstu/user/model/UserResetPasswordDto.java index 58e7462..58e76ff 100644 --- a/src/main/java/ru/ulstu/user/model/UserResetPasswordDto.java +++ b/src/main/java/ru/ulstu/user/model/UserResetPasswordDto.java @@ -1,8 +1,8 @@ package ru.ulstu.user.model; -import org.hibernate.validator.constraints.NotEmpty; import ru.ulstu.configuration.Constants; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Size; import java.util.Objects; diff --git a/src/main/java/ru/ulstu/user/model/UserSessionListDto.java b/src/main/java/ru/ulstu/user/model/UserSessionListDto.java index ebfd653..5325762 100644 --- a/src/main/java/ru/ulstu/user/model/UserSessionListDto.java +++ b/src/main/java/ru/ulstu/user/model/UserSessionListDto.java @@ -7,19 +7,19 @@ import java.util.Date; public class UserSessionListDto { @OdinCaption("Сессия") - private String sessionId; + private final String sessionId; @OdinCaption("Пользователь") - private String login; + private final String login; @OdinCaption("IP адрес") - private String ipAddress; + private final String ipAddress; @OdinCaption("Хост") - private String host; + private final String host; @OdinCaption("Вход") @OdinDate(type = OdinDate.OdinDateType.DATETIME) - private Date loginTime; + private final Date loginTime; @OdinCaption("Выход") @OdinDate(type = OdinDate.OdinDateType.DATETIME) - private Date logoutTime; + private final Date logoutTime; public UserSessionListDto(UserSession userSession) { this.sessionId = userSession.getSessionId(); diff --git a/src/main/java/ru/ulstu/user/repository/UserSessionRepository.java b/src/main/java/ru/ulstu/user/repository/UserSessionRepository.java index b922e4f..5319245 100644 --- a/src/main/java/ru/ulstu/user/repository/UserSessionRepository.java +++ b/src/main/java/ru/ulstu/user/repository/UserSessionRepository.java @@ -1,6 +1,7 @@ package ru.ulstu.user.repository; import org.springframework.data.jpa.repository.JpaRepository; +import ru.ulstu.user.model.User; import ru.ulstu.user.model.UserSession; import java.util.Date; @@ -10,4 +11,6 @@ public interface UserSessionRepository extends JpaRepository findAllByLogoutTimeIsNullAndLoginTimeBefore(Date date); + + List findAllByUserAndLogoutTimeIsNullAndLoginTimeBefore(User user, Date date); } diff --git a/src/main/java/ru/ulstu/user/service/MailService.java b/src/main/java/ru/ulstu/user/service/MailService.java index 3724792..369b459 100644 --- a/src/main/java/ru/ulstu/user/service/MailService.java +++ b/src/main/java/ru/ulstu/user/service/MailService.java @@ -10,7 +10,7 @@ import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.thymeleaf.context.Context; -import org.thymeleaf.spring4.SpringTemplateEngine; +import org.thymeleaf.spring5.SpringTemplateEngine; import ru.ulstu.configuration.ApplicationProperties; import ru.ulstu.configuration.Constants; import ru.ulstu.user.model.User; @@ -39,7 +39,7 @@ public class MailService { } @Async - public void sendEmail(String to, String subject, String content) throws MessagingException, MailException { + private void sendEmail(String to, String subject, String content) throws MessagingException, MailException { log.debug("Send email to '{}' with subject '{}'", to, subject); MimeMessage mimeMessage = javaMailSender.createMimeMessage(); MimeMessageHelper message = new MimeMessageHelper(mimeMessage, false, StandardCharsets.UTF_8.name()); @@ -60,7 +60,7 @@ public class MailService { } @Async - public void sendEmailFromTemplate(User user, String templateName, String subject) { + private void sendEmailFromTemplate(User user, String templateName, String subject) { Context context = new Context(); context.setVariable(USER, user); context.setVariable(BASE_URL, applicationProperties.getBaseUrl()); @@ -99,7 +99,7 @@ public class MailService { } @Async - public void sendEmailFromTemplate(Map variables, String templateName, String subject, String email) + private void sendEmailFromTemplate(Map variables, String templateName, String subject, String email) throws MessagingException { Context context = new Context(); variables.entrySet().forEach(entry -> context.setVariable(entry.getKey(), entry.getValue())); diff --git a/src/main/java/ru/ulstu/user/service/UserMapper.java b/src/main/java/ru/ulstu/user/service/UserMapper.java index 7359bba..7a195ae 100644 --- a/src/main/java/ru/ulstu/user/service/UserMapper.java +++ b/src/main/java/ru/ulstu/user/service/UserMapper.java @@ -26,7 +26,7 @@ public class UserMapper { public Set rolesFromDto(Set strings) { return Optional.ofNullable(strings).orElse(Collections.emptySet()).stream() .filter(Objects::nonNull) - .map(role -> userRoleRepository.findOne(role.getId().toString())) + .map(role -> userRoleRepository.getOne(role.getId().toString())) .filter(Objects::nonNull) .collect(Collectors.toSet()); } @@ -38,7 +38,7 @@ public class UserMapper { return new UserDto(userEntity); } - public UserListDto userEntityToUserListDto(User userEntity) { + private UserListDto userEntityToUserListDto(User userEntity) { if (userEntity == null) { return null; } diff --git a/src/main/java/ru/ulstu/user/service/UserService.java b/src/main/java/ru/ulstu/user/service/UserService.java index 7534110..0f69c8e 100644 --- a/src/main/java/ru/ulstu/user/service/UserService.java +++ b/src/main/java/ru/ulstu/user/service/UserService.java @@ -1,355 +1,435 @@ -package ru.ulstu.user.service; - -import com.google.common.collect.ImmutableMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Sort; -import org.springframework.mail.MailException; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; -import ru.ulstu.configuration.ApplicationProperties; -import ru.ulstu.core.error.EntityIdIsNullException; -import ru.ulstu.core.jpa.OffsetablePageRequest; -import ru.ulstu.core.model.BaseEntity; -import ru.ulstu.core.model.response.PageableItems; -import ru.ulstu.user.error.UserActivationError; -import ru.ulstu.user.error.UserEmailExistsException; -import ru.ulstu.user.error.UserIdExistsException; -import ru.ulstu.user.error.UserIsUndeadException; -import ru.ulstu.user.error.UserLoginExistsException; -import ru.ulstu.user.error.UserNotActivatedException; -import ru.ulstu.user.error.UserNotFoundException; -import ru.ulstu.user.error.UserPasswordsNotValidOrNotMatchException; -import ru.ulstu.user.error.UserResetKeyError; -import ru.ulstu.user.error.UserSendingMailException; -import ru.ulstu.user.model.User; -import ru.ulstu.user.model.UserDto; -import ru.ulstu.user.model.UserListDto; -import ru.ulstu.user.model.UserResetPasswordDto; -import ru.ulstu.user.model.UserRole; -import ru.ulstu.user.model.UserRoleConstants; -import ru.ulstu.user.model.UserRoleDto; -import ru.ulstu.user.repository.UserRepository; -import ru.ulstu.user.repository.UserRoleRepository; -import ru.ulstu.user.util.UserUtils; - -import javax.mail.MessagingException; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - -@Service -@Transactional -public class UserService implements UserDetailsService { - private static final String INVITE_USER_EXCEPTION = "Во время отправки приглашения произошла ошибка"; - - private final Logger log = LoggerFactory.getLogger(UserService.class); - private final UserRepository userRepository; - private final PasswordEncoder passwordEncoder; - private final UserRoleRepository userRoleRepository; - private final UserMapper userMapper; - private final MailService mailService; - private final ApplicationProperties applicationProperties; - - public UserService(UserRepository userRepository, - PasswordEncoder passwordEncoder, - UserRoleRepository userRoleRepository, - UserMapper userMapper, - MailService mailService, - ApplicationProperties applicationProperties) { - this.userRepository = userRepository; - this.passwordEncoder = passwordEncoder; - this.userRoleRepository = userRoleRepository; - this.userMapper = userMapper; - this.mailService = mailService; - this.applicationProperties = applicationProperties; - } - - private User getUserByEmail(String email) { - return userRepository.findOneByEmailIgnoreCase(email); - } - - private User getUserByActivationKey(String activationKey) { - return userRepository.findOneByActivationKey(activationKey); - } - - public User getUserByLogin(String login) { - return userRepository.findOneByLoginIgnoreCase(login); - } - - @Transactional(readOnly = true) - public UserDto getUserWithRolesById(Integer userId) { - final User userEntity = userRepository.findOneWithRolesById(userId); - if (userEntity == null) { - throw new UserNotFoundException(userId.toString()); - } - return userMapper.userEntityToUserDto(userEntity); - } - - @Transactional(readOnly = true) - public PageableItems getAllUsers(int offset, int count) { - final Page page = userRepository.findAll(new OffsetablePageRequest(offset, count, new Sort("id"))); - return new PageableItems<>(page.getTotalElements(), userMapper.userEntitiesToUserListDtos(page.getContent())); - } - - // TODO: read only active users - public List findAll() { - return userRepository.findAll(); - } - - @Transactional(readOnly = true) - public PageableItems getUserRoles() { - final List roles = userRoleRepository.findAll().stream() - .map(UserRoleDto::new) - .sorted(Comparator.comparing(UserRoleDto::getViewValue)) - .collect(Collectors.toList()); - return new PageableItems<>(roles.size(), roles); - } - - public UserDto createUser(UserDto userDto) { - if (userDto.getId() != null) { - throw new UserIdExistsException(); - } - if (getUserByLogin(userDto.getLogin()) != null) { - throw new UserLoginExistsException(userDto.getLogin()); - } - if (getUserByEmail(userDto.getEmail()) != null) { - throw new UserEmailExistsException(userDto.getEmail()); - } - if (!userDto.isPasswordsValid()) { - throw new UserPasswordsNotValidOrNotMatchException(""); - } - User user = userMapper.userDtoToUserEntity(userDto); - user.setActivated(false); - user.setActivationKey(UserUtils.generateActivationKey()); - user.setRoles(Collections.singleton(new UserRole(UserRoleConstants.USER))); - user.setPassword(passwordEncoder.encode(userDto.getPassword())); - user = userRepository.save(user); - mailService.sendActivationEmail(user); - log.debug("Created Information for User: {}", user.getLogin()); - return userMapper.userEntityToUserDto(user); - } - - public UserDto activateUser(String activationKey) { - final User user = getUserByActivationKey(activationKey); - if (user == null) { - throw new UserActivationError(activationKey); - } - user.setActivated(true); - user.setActivationKey(null); - user.setActivationDate(null); - log.debug("Activated user: {}", user.getLogin()); - return userMapper.userEntityToUserDto(userRepository.save(user)); - } - - public UserDto updateUser(UserDto userDto) { - if (userDto.getId() == null) { - throw new EntityIdIsNullException(); - } - if (!Objects.equals( - Optional.ofNullable(getUserByEmail(userDto.getEmail())) - .map(BaseEntity::getId).orElse(userDto.getId()), - userDto.getId())) { - throw new UserEmailExistsException(userDto.getEmail()); - } - if (!Objects.equals( - Optional.ofNullable(getUserByLogin(userDto.getLogin())) - .map(BaseEntity::getId).orElse(userDto.getId()), - userDto.getId())) { - throw new UserLoginExistsException(userDto.getLogin()); - } - User user = userRepository.findOne(userDto.getId()); - if (user == null) { - throw new UserNotFoundException(userDto.getId().toString()); - } - if (applicationProperties.getUndeadUserLogin().equalsIgnoreCase(user.getLogin())) { - userDto.setLogin(applicationProperties.getUndeadUserLogin()); - userDto.setActivated(true); - userDto.setRoles(Collections.singletonList(new UserRoleDto(UserRoleConstants.ADMIN))); - } - user.setLogin(userDto.getLogin()); - user.setFirstName(userDto.getFirstName()); - user.setLastName(userDto.getLastName()); - user.setEmail(userDto.getEmail()); - if (userDto.isActivated() != user.getActivated()) { - if (userDto.isActivated()) { - user.setActivationKey(null); - user.setActivationDate(null); - } else { - user.setActivationKey(UserUtils.generateActivationKey()); - user.setActivationDate(new Date()); - } - } - user.setActivated(userDto.isActivated()); - final Set roles = userMapper.rolesFromDto(userDto.getRoles()); - user.setRoles(roles.isEmpty() - ? Collections.singleton(new UserRole(UserRoleConstants.USER)) - : roles); - if (!StringUtils.isEmpty(userDto.getOldPassword())) { - if (!userDto.isPasswordsValid() || !userDto.isOldPasswordValid()) { - throw new UserPasswordsNotValidOrNotMatchException(""); - } - if (!passwordEncoder.matches(userDto.getOldPassword(), user.getPassword())) { - throw new UserPasswordsNotValidOrNotMatchException(""); - } - user.setPassword(passwordEncoder.encode(userDto.getPassword())); - log.debug("Changed password for User: {}", user.getLogin()); - } - user = userRepository.save(user); - log.debug("Changed Information for User: {}", user.getLogin()); - return userMapper.userEntityToUserDto(user); - } - - public UserDto updateUserInformation(User user, UserDto updateUser) { - user.setFirstName(updateUser.getFirstName()); - user.setLastName(updateUser.getLastName()); - user.setEmail(updateUser.getEmail()); - user.setLogin(updateUser.getLogin()); - user = userRepository.save(user); - log.debug("Updated Information for User: {}", user.getLogin()); - return userMapper.userEntityToUserDto(user); - } - - public void changeUserPassword(User user, Map payload) { - if (!payload.get("password").equals(payload.get("confirmPassword"))) { - throw new UserPasswordsNotValidOrNotMatchException(""); - } - if (!passwordEncoder.matches(payload.get("oldPassword"), user.getPassword())) { - throw new UserPasswordsNotValidOrNotMatchException("Старый пароль введен неправильно"); - } - user.setPassword(passwordEncoder.encode(payload.get("password"))); - log.debug("Changed password for User: {}", user.getLogin()); - userRepository.save(user); - - mailService.sendChangePasswordMail(user); - } - - public boolean requestUserPasswordReset(String email) { - User user = userRepository.findOneByEmailIgnoreCase(email); - if (user == null) { - throw new UserNotFoundException(email); - } - if (!user.getActivated()) { - throw new UserNotActivatedException(); - } - user.setResetKey(UserUtils.generateResetKey()); - user.setResetDate(new Date()); - user = userRepository.save(user); - try { - mailService.sendPasswordResetMail(user); - } catch (MessagingException | MailException e) { - throw new UserSendingMailException(email); - } - log.debug("Created Reset Password Request for User: {}", user.getLogin()); - return true; - } - - public boolean completeUserPasswordReset(UserResetPasswordDto userResetPasswordDto) { - if (!userResetPasswordDto.isPasswordsValid()) { - throw new UserPasswordsNotValidOrNotMatchException("Пароли не совпадают"); - } - User user = userRepository.findOneByResetKey(userResetPasswordDto.getResetKey()); - if (user == null) { - throw new UserResetKeyError(userResetPasswordDto.getResetKey()); - } - user.setPassword(passwordEncoder.encode(userResetPasswordDto.getPassword())); - user.setResetKey(null); - user.setResetDate(null); - user = userRepository.save(user); - - mailService.sendChangePasswordMail(user); - - log.debug("Reset Password for User: {}", user.getLogin()); - return true; - } - - public UserDto deleteUser(Integer userId) { - final User user = userRepository.findOne(userId); - if (user == null) { - throw new UserNotFoundException(userId.toString()); - } - if (applicationProperties.getUndeadUserLogin().equalsIgnoreCase(user.getLogin())) { - throw new UserIsUndeadException(user.getLogin()); - } - userRepository.delete(user); - log.debug("Deleted User: {}", user.getLogin()); - return userMapper.userEntityToUserDto(user); - } - - @Override - public UserDetails loadUserByUsername(String username) { - final User user = userRepository.findOneByLoginIgnoreCase(username); - if (user == null) { - throw new UserNotFoundException(username); - } - if (!user.getActivated()) { - throw new UserNotActivatedException(); - } - return new org.springframework.security.core.userdetails.User(user.getLogin(), - user.getPassword(), - Optional.ofNullable(user.getRoles()).orElse(Collections.emptySet()).stream() - .map(role -> new SimpleGrantedAuthority(role.getName())) - .collect(Collectors.toList())); - } - - public List findByIds(List ids) { - return userRepository.findAll(ids); - } - - public User findById(Integer id) { - return userRepository.findOne(id); - } - - public User getCurrentUser() { - String login = UserUtils.getCurrentUserLogin(); - User user = userRepository.findOneByLoginIgnoreCase(login); - if (user == null) { - throw new UserNotFoundException(login); - } - return user; - } - - public List filterByAgeAndDegree(boolean hasDegree, boolean hasAge) { - return userRepository.filterByAgeAndDegree(hasDegree, hasAge); - } - - public void inviteUser(String email) throws UserSendingMailException { - if (userRepository.findOneByEmailIgnoreCase(email) != null) { - throw new UserEmailExistsException(email); - } - - String password = UserUtils.generatePassword(); - - User user = new User(); - user.setPassword(passwordEncoder.encode(password)); - user.setLogin(email); - user.setEmail(email); - user.setFirstName("user"); - user.setLastName("user"); - user.setActivated(true); - userRepository.save(user); - - Map variables = ImmutableMap.of("password", password, "email", email); - try { - mailService.sendInviteMail(variables, email); - } catch (MessagingException | MailException e) { - throw new UserSendingMailException(email); - } - } - - public User findOneByLoginIgnoreCase(String login) { - return userRepository.findOneByLoginIgnoreCase(login); - } -} +package ru.ulstu.user.service; + +import com.google.common.collect.ImmutableMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Lazy; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Sort; +import org.springframework.mail.MailException; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; +import ru.ulstu.conference.service.ConferenceService; +import ru.ulstu.configuration.ApplicationProperties; +import ru.ulstu.core.error.EntityIdIsNullException; +import ru.ulstu.core.jpa.OffsetablePageRequest; +import ru.ulstu.core.model.BaseEntity; +import ru.ulstu.core.model.UserActivity; +import ru.ulstu.core.model.response.PageableItems; +import ru.ulstu.ping.model.Ping; +import ru.ulstu.ping.service.PingService; +import ru.ulstu.user.error.UserActivationError; +import ru.ulstu.user.error.UserBlockedException; +import ru.ulstu.user.error.UserEmailExistsException; +import ru.ulstu.user.error.UserIdExistsException; +import ru.ulstu.user.error.UserIsUndeadException; +import ru.ulstu.user.error.UserLoginExistsException; +import ru.ulstu.user.error.UserNotActivatedException; +import ru.ulstu.user.error.UserNotFoundException; +import ru.ulstu.user.error.UserPasswordsNotValidOrNotMatchException; +import ru.ulstu.user.error.UserResetKeyError; +import ru.ulstu.user.error.UserSendingMailException; +import ru.ulstu.user.model.User; +import ru.ulstu.user.model.UserDto; +import ru.ulstu.user.model.UserInfoNow; +import ru.ulstu.user.model.UserListDto; +import ru.ulstu.user.model.UserResetPasswordDto; +import ru.ulstu.user.model.UserRole; +import ru.ulstu.user.model.UserRoleConstants; +import ru.ulstu.user.model.UserRoleDto; +import ru.ulstu.user.repository.UserRepository; +import ru.ulstu.user.repository.UserRoleRepository; +import ru.ulstu.user.util.UserUtils; +import ru.ulstu.utils.timetable.TimetableService; +import ru.ulstu.utils.timetable.errors.TimetableClientException; +import ru.ulstu.utils.timetable.model.Lesson; + +import javax.mail.MessagingException; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + +@Service +@Transactional +public class UserService implements UserDetailsService { + private static final String INVITE_USER_EXCEPTION = "Во время отправки приглашения произошла ошибка"; + + private final Logger log = LoggerFactory.getLogger(UserService.class); + private final UserRepository userRepository; + private final PasswordEncoder passwordEncoder; + private final UserRoleRepository userRoleRepository; + private final UserMapper userMapper; + private final MailService mailService; + private final ApplicationProperties applicationProperties; + private final TimetableService timetableService; + private final ConferenceService conferenceService; + private final UserSessionService userSessionService; + private final PingService pingService; + + public UserService(UserRepository userRepository, + PasswordEncoder passwordEncoder, + UserRoleRepository userRoleRepository, + UserMapper userMapper, + MailService mailService, + ApplicationProperties applicationProperties, + @Lazy PingService pingService, + @Lazy ConferenceService conferenceRepository, + @Lazy UserSessionService userSessionService) throws ParseException { + this.userRepository = userRepository; + this.passwordEncoder = passwordEncoder; + this.userRoleRepository = userRoleRepository; + this.userMapper = userMapper; + this.mailService = mailService; + this.applicationProperties = applicationProperties; + this.conferenceService = conferenceRepository; + this.timetableService = new TimetableService(); + this.userSessionService = userSessionService; + this.pingService = pingService; + } + + private User getUserByEmail(String email) { + return userRepository.findOneByEmailIgnoreCase(email); + } + + private User getUserByActivationKey(String activationKey) { + return userRepository.findOneByActivationKey(activationKey); + } + + public User getUserByLogin(String login) { + return userRepository.findOneByLoginIgnoreCase(login); + } + + @Transactional(readOnly = true) + public UserDto getUserWithRolesById(Integer userId) { + final User userEntity = userRepository.findOneWithRolesById(userId); + if (userEntity == null) { + throw new UserNotFoundException(userId.toString()); + } + return userMapper.userEntityToUserDto(userEntity); + } + + @Transactional(readOnly = true) + public PageableItems getAllUsers(int offset, int count) { + final Page page = userRepository.findAll(new OffsetablePageRequest(offset, count, Sort.by("id"))); + return new PageableItems<>(page.getTotalElements(), userMapper.userEntitiesToUserListDtos(page.getContent())); + } + + // TODO: read only active users + public List findAll() { + return userRepository.findAll(); + } + + @Transactional(readOnly = true) + public PageableItems getUserRoles() { + final List roles = userRoleRepository.findAll().stream() + .map(UserRoleDto::new) + .sorted(Comparator.comparing(UserRoleDto::getViewValue)) + .collect(Collectors.toList()); + return new PageableItems<>(roles.size(), roles); + } + + public UserDto createUser(UserDto userDto) { + if (userDto.getId() != null) { + throw new UserIdExistsException(); + } + if (getUserByLogin(userDto.getLogin()) != null) { + throw new UserLoginExistsException(userDto.getLogin()); + } + if (getUserByEmail(userDto.getEmail()) != null) { + throw new UserEmailExistsException(userDto.getEmail()); + } + if (userDto.isPasswordsValid()) { + throw new UserPasswordsNotValidOrNotMatchException(""); + } + User user = userMapper.userDtoToUserEntity(userDto); + user.setActivated(false); + user.setActivationKey(UserUtils.generateActivationKey()); + user.setRoles(Collections.singleton(new UserRole(UserRoleConstants.USER))); + user.setPassword(passwordEncoder.encode(userDto.getPassword())); + user = userRepository.save(user); + mailService.sendActivationEmail(user); + log.debug("Created Information for User: {}", user.getLogin()); + return userMapper.userEntityToUserDto(user); + } + + public UserDto activateUser(String activationKey) { + final User user = getUserByActivationKey(activationKey); + if (user == null) { + throw new UserActivationError(activationKey); + } + user.setActivated(true); + user.setActivationKey(null); + user.setActivationDate(null); + log.debug("Activated user: {}", user.getLogin()); + return userMapper.userEntityToUserDto(userRepository.save(user)); + } + + public UserDto updateUser(UserDto userDto) { + if (userDto.getId() == null) { + throw new EntityIdIsNullException(); + } + if (!Objects.equals( + Optional.ofNullable(getUserByEmail(userDto.getEmail())) + .map(BaseEntity::getId).orElse(userDto.getId()), + userDto.getId())) { + throw new UserEmailExistsException(userDto.getEmail()); + } + if (!Objects.equals( + Optional.ofNullable(getUserByLogin(userDto.getLogin())) + .map(BaseEntity::getId).orElse(userDto.getId()), + userDto.getId())) { + throw new UserLoginExistsException(userDto.getLogin()); + } + User user = userRepository.getOne(userDto.getId()); + if (user == null) { + throw new UserNotFoundException(userDto.getId().toString()); + } + if (applicationProperties.getUndeadUserLogin().equalsIgnoreCase(user.getLogin())) { + userDto.setLogin(applicationProperties.getUndeadUserLogin()); + userDto.setActivated(true); + userDto.setRoles(Collections.singletonList(new UserRoleDto(UserRoleConstants.ADMIN))); + } + user.setLogin(userDto.getLogin()); + user.setFirstName(userDto.getFirstName()); + user.setLastName(userDto.getLastName()); + user.setEmail(userDto.getEmail()); + if (userDto.isActivated() != user.getActivated()) { + if (userDto.isActivated()) { + user.setActivationKey(null); + user.setActivationDate(null); + } else { + user.setActivationKey(UserUtils.generateActivationKey()); + user.setActivationDate(new Date()); + } + } + user.setActivated(userDto.isActivated()); + final Set roles = userMapper.rolesFromDto(userDto.getRoles()); + user.setRoles(roles.isEmpty() + ? Collections.singleton(new UserRole(UserRoleConstants.USER)) + : roles); + if (!StringUtils.isEmpty(userDto.getOldPassword())) { + if (userDto.isPasswordsValid() || !userDto.isOldPasswordValid()) { + throw new UserPasswordsNotValidOrNotMatchException(""); + } + if (!passwordEncoder.matches(userDto.getOldPassword(), user.getPassword())) { + throw new UserPasswordsNotValidOrNotMatchException(""); + } + user.setPassword(passwordEncoder.encode(userDto.getPassword())); + log.debug("Changed password for User: {}", user.getLogin()); + } + user = userRepository.save(user); + log.debug("Changed Information for User: {}", user.getLogin()); + return userMapper.userEntityToUserDto(user); + } + + public UserDto updateUserInformation(User user, UserDto updateUser) { + user.setFirstName(updateUser.getFirstName()); + user.setLastName(updateUser.getLastName()); + user.setEmail(updateUser.getEmail()); + user.setLogin(updateUser.getLogin()); + user = userRepository.save(user); + log.debug("Updated Information for User: {}", user.getLogin()); + return userMapper.userEntityToUserDto(user); + } + + public void changeUserPassword(User user, Map payload) { + if (!payload.get("password").equals(payload.get("confirmPassword"))) { + throw new UserPasswordsNotValidOrNotMatchException(""); + } + if (!passwordEncoder.matches(payload.get("oldPassword"), user.getPassword())) { + throw new UserPasswordsNotValidOrNotMatchException("Старый пароль введен неправильно"); + } + user.setPassword(passwordEncoder.encode(payload.get("password"))); + log.debug("Changed password for User: {}", user.getLogin()); + userRepository.save(user); + + mailService.sendChangePasswordMail(user); + } + + public boolean requestUserPasswordReset(String email) { + User user = userRepository.findOneByEmailIgnoreCase(email); + if (user == null) { + throw new UserNotFoundException(email); + } + if (!user.getActivated()) { + throw new UserNotActivatedException(); + } + user.setResetKey(UserUtils.generateResetKey()); + user.setResetDate(new Date()); + user = userRepository.save(user); + try { + mailService.sendPasswordResetMail(user); + } catch (MessagingException | MailException e) { + throw new UserSendingMailException(email); + } + log.debug("Created Reset Password Request for User: {}", user.getLogin()); + return true; + } + + public boolean completeUserPasswordReset(UserResetPasswordDto userResetPasswordDto) { + if (!userResetPasswordDto.isPasswordsValid()) { + throw new UserPasswordsNotValidOrNotMatchException("Пароли не совпадают"); + } + User user = userRepository.findOneByResetKey(userResetPasswordDto.getResetKey()); + if (user == null) { + throw new UserResetKeyError(userResetPasswordDto.getResetKey()); + } + user.setPassword(passwordEncoder.encode(userResetPasswordDto.getPassword())); + user.setResetKey(null); + user.setResetDate(null); + user = userRepository.save(user); + + mailService.sendChangePasswordMail(user); + + log.debug("Reset Password for User: {}", user.getLogin()); + return true; + } + + public UserDto deleteUser(Integer userId) { + final User user = userRepository.getOne(userId); + if (user == null) { + throw new UserNotFoundException(userId.toString()); + } + if (applicationProperties.getUndeadUserLogin().equalsIgnoreCase(user.getLogin())) { + throw new UserIsUndeadException(user.getLogin()); + } + userRepository.delete(user); + log.debug("Deleted User: {}", user.getLogin()); + return userMapper.userEntityToUserDto(user); + } + + @Override + public UserDetails loadUserByUsername(String username) { + final User user = userRepository.findOneByLoginIgnoreCase(username); + if (user == null) { + throw new UserNotFoundException(username); + } + if (!user.getActivated()) { + throw new UserNotActivatedException(); + } + if (user.getBlocker() != null) { + throw new UserBlockedException(String.format("Вы заблокированы пользователем %s", user.getBlocker().getUserAbbreviate())); + } + return new org.springframework.security.core.userdetails.User(user.getLogin(), + user.getPassword(), + Optional.ofNullable(user.getRoles()).orElse(Collections.emptySet()).stream() + .map(role -> new SimpleGrantedAuthority(role.getName())) + .collect(Collectors.toList())); + } + + public List findByIds(List ids) { + return userRepository.findAllById(ids); + } + + public User findById(Integer id) { + return userRepository.getOne(id); + } + + public User getCurrentUser() { + String login = UserUtils.getCurrentUserLogin(SecurityContextHolder.getContext()); + User user = userRepository.findOneByLoginIgnoreCase(login); + if (user == null) { + throw new UserNotFoundException(login); + } + return user; + } + + public List filterByAgeAndDegree(boolean hasDegree, boolean hasAge) { + return userRepository.filterByAgeAndDegree(hasDegree, hasAge); + } + + public void inviteUser(String email) throws UserSendingMailException { + if (userRepository.findOneByEmailIgnoreCase(email) != null) { + throw new UserEmailExistsException(email); + } + + String password = UserUtils.generatePassword(); + + User user = new User(); + user.setPassword(passwordEncoder.encode(password)); + user.setLogin(email); + user.setEmail(email); + user.setFirstName("user"); + user.setLastName("user"); + user.setActivated(true); + userRepository.save(user); + + Map variables = ImmutableMap.of("password", password, "email", email); + try { + mailService.sendInviteMail(variables, email); + } catch (MessagingException | MailException e) { + throw new UserSendingMailException(email); + } + } + + public User findOneByLoginIgnoreCase(String login) { + return userRepository.findOneByLoginIgnoreCase(login); + } + + public Map getUsersInfo() { + List usersInfoNow = new ArrayList<>(); + String err = ""; + + for (User user : userRepository.findAll()) { + Lesson lesson = null; + try { + lesson = timetableService.getCurrentLesson(user.getUserAbbreviate()); + } catch (TimetableClientException e) { + err = "Не удалось загрузить расписание"; + } + usersInfoNow.add(new UserInfoNow( + lesson, + conferenceService.getActiveConferenceByUser(user), + user, + userSessionService.isOnline(user)) + ); + } + return ImmutableMap.of("users", usersInfoNow, "error", err); + } + + public Map getActivitiesPings(Integer userId, + String activityName) { + User user = null; + if (userId != null) { + user = findById(userId); + } + Map activitiesPings = new HashMap<>(); + + for (Ping ping : pingService.getPings(activityName)) { + UserActivity activity = ping.getActivity(); + + if (user != null && !activity.getActivityUsers().contains(user)) { + continue; + } + + if (activitiesPings.containsKey(activity.getTitle())) { + activitiesPings.put(activity.getTitle(), activitiesPings.get(activity.getTitle()) + 1); + } else { + activitiesPings.put(activity.getTitle(), 1); + } + + } + return activitiesPings; + } + + public void blockUser(int userId) { + User userToBlock = findById(userId); + userToBlock.setBlocker(getCurrentUser()); + userRepository.save(userToBlock); + } +} diff --git a/src/main/java/ru/ulstu/user/service/UserSessionService.java b/src/main/java/ru/ulstu/user/service/UserSessionService.java index ae289d0..17a7f5b 100644 --- a/src/main/java/ru/ulstu/user/service/UserSessionService.java +++ b/src/main/java/ru/ulstu/user/service/UserSessionService.java @@ -14,6 +14,8 @@ import ru.ulstu.user.model.UserSession; import ru.ulstu.user.model.UserSessionListDto; import ru.ulstu.user.repository.UserSessionRepository; +import java.util.Date; + import static ru.ulstu.core.util.StreamApiUtils.convert; @Service @@ -58,4 +60,8 @@ public class UserSessionService { public User getUserBySessionId(String sessionId) { return userSessionRepository.findOneBySessionId(sessionId).getUser(); } + + public boolean isOnline(User user) { + return !userSessionRepository.findAllByUserAndLogoutTimeIsNullAndLoginTimeBefore(user, new Date()).isEmpty(); + } } diff --git a/src/main/java/ru/ulstu/user/util/UserUtils.java b/src/main/java/ru/ulstu/user/util/UserUtils.java index ec58dd9..090240b 100644 --- a/src/main/java/ru/ulstu/user/util/UserUtils.java +++ b/src/main/java/ru/ulstu/user/util/UserUtils.java @@ -3,7 +3,6 @@ package ru.ulstu.user.util; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContext; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; import ru.ulstu.configuration.Constants; @@ -18,12 +17,12 @@ public class UserUtils { return RandomStringUtils.randomNumeric(DEF_COUNT); } - public static String getCurrentUserLogin() { - final SecurityContext securityContext = SecurityContextHolder.getContext(); + public static String getCurrentUserLogin(SecurityContext securityContext) { if (securityContext == null) { return null; } final Authentication authentication = securityContext.getAuthentication(); + if (authentication.getPrincipal() instanceof UserDetails) { final UserDetails springSecurityUser = (UserDetails) authentication.getPrincipal(); return springSecurityUser.getUsername(); diff --git a/src/main/java/ru/ulstu/utils/timetable/TimetableService.java b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java new file mode 100644 index 0000000..b2a7874 --- /dev/null +++ b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java @@ -0,0 +1,98 @@ +package ru.ulstu.utils.timetable; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.web.client.RestClientException; +import org.springframework.web.client.RestTemplate; +import ru.ulstu.core.util.DateUtils; +import ru.ulstu.utils.timetable.errors.TimetableClientException; +import ru.ulstu.utils.timetable.model.Lesson; +import ru.ulstu.utils.timetable.model.TimetableResponse; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +public class TimetableService { + private static final String TIMETABLE_URL = "http://timetable.athene.tech/api/1.0/timetable?filter=%s"; + private final SimpleDateFormat lessonTimeFormat = new SimpleDateFormat("hh:mm"); + + private final long[] lessonsStarts = new long[]{ + lessonTimeFormat.parse("8:00:00").getTime(), + lessonTimeFormat.parse("9:40:00").getTime(), + lessonTimeFormat.parse("11:30:00").getTime(), + lessonTimeFormat.parse("13:10:00").getTime(), + lessonTimeFormat.parse("14:50:00").getTime(), + lessonTimeFormat.parse("16:30:00").getTime(), + lessonTimeFormat.parse("18:10:00").getTime(), + }; + + public TimetableService() throws ParseException { + } + + private int getCurrentDay() { + Calendar calendar = Calendar.getInstance(); + int day = calendar.get(Calendar.DAY_OF_WEEK); + return (day + 5) % 7; + } + + private int getCurrentLessonNumber() { + long lessonDuration = 90 * 60000; + Date now = new Date(); + long timeNow = now.getTime() % (24 * 60 * 60 * 1000L); + + for (int i = 0; i < lessonsStarts.length; i++) { + if (timeNow > lessonsStarts[i] && timeNow < lessonsStarts[i] + lessonDuration) { + return i; + } + } + return -1; + } + + private int getCurrentWeek() { + Date currentDate = Calendar.getInstance().getTime(); + currentDate = DateUtils.clearTime(currentDate); + + Calendar firstJan = Calendar.getInstance(); + firstJan.set(Calendar.MONTH, 0); + firstJan.set(Calendar.DAY_OF_MONTH, 1); + + return (int) Math.round(Math.ceil((((currentDate.getTime() - firstJan.getTime().getTime()) / 86400000) + + DateUtils.addDays(firstJan.getTime(), 1).getTime() / 7) % 2)); + } + + private TimetableResponse getTimetableForUser(String userFIO) throws RestClientException { + RestTemplate restTemplate = new RestTemplate(); + return restTemplate.getForObject(String.format(TIMETABLE_URL, userFIO), TimetableResponse.class); + } + + public Lesson getCurrentLesson(String userFio) { + TimetableResponse response; + try { + response = getTimetableForUser(userFio); + } catch (RestClientException e) { + e.printStackTrace(); + throw new TimetableClientException(userFio); + } + + int lessonNumber = getCurrentLessonNumber(); + if (lessonNumber < 0) { + return null; + } + + List lessons = response + .getResponse() + .getWeeks() + .get(getCurrentWeek()) + .getDays() + .get(getCurrentDay()) + .getLessons() + .get(lessonNumber); + + if (lessons.size() == 0) { + return null; + } + return new ObjectMapper().convertValue(lessons.get(0), Lesson.class); + } +} diff --git a/src/main/java/ru/ulstu/utils/timetable/errors/TimetableClientException.java b/src/main/java/ru/ulstu/utils/timetable/errors/TimetableClientException.java new file mode 100644 index 0000000..4723bda --- /dev/null +++ b/src/main/java/ru/ulstu/utils/timetable/errors/TimetableClientException.java @@ -0,0 +1,7 @@ +package ru.ulstu.utils.timetable.errors; + +public class TimetableClientException extends RuntimeException { + public TimetableClientException(String message) { + super(message); + } +} diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Day.java b/src/main/java/ru/ulstu/utils/timetable/model/Day.java new file mode 100644 index 0000000..211165d --- /dev/null +++ b/src/main/java/ru/ulstu/utils/timetable/model/Day.java @@ -0,0 +1,28 @@ +package ru.ulstu.utils.timetable.model; + +import java.util.ArrayList; +import java.util.List; + + +public class Day { + + private Integer day; + private List> lessons = new ArrayList<>(); + + public Integer getDay() { + return day; + } + + public void setDay(Integer day) { + this.day = day; + } + + public List> getLessons() { + return lessons; + } + + public void setLessons(List> lessons) { + this.lessons = lessons; + } +} + diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java b/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java new file mode 100644 index 0000000..9c855bd --- /dev/null +++ b/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java @@ -0,0 +1,24 @@ +package ru.ulstu.utils.timetable.model; + +public class Lesson { + private String group; + private String nameOfLesson; + private String teacher; + private String room; + + public String getGroup() { + return group; + } + + public String getNameOfLesson() { + return nameOfLesson; + } + + public String getTeacher() { + return teacher; + } + + public String getRoom() { + return room; + } +} diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Response.java b/src/main/java/ru/ulstu/utils/timetable/model/Response.java new file mode 100644 index 0000000..dfd3a84 --- /dev/null +++ b/src/main/java/ru/ulstu/utils/timetable/model/Response.java @@ -0,0 +1,17 @@ +package ru.ulstu.utils.timetable.model; + +import java.util.ArrayList; +import java.util.List; + +public class Response { + + private List weeks = new ArrayList<>(); + + public List getWeeks() { + return weeks; + } + + public void setWeeks(List weeks) { + this.weeks = weeks; + } +} diff --git a/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java b/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java new file mode 100644 index 0000000..118c979 --- /dev/null +++ b/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java @@ -0,0 +1,22 @@ +package ru.ulstu.utils.timetable.model; + +public class TimetableResponse { + private Response response; + private String error; + + public Response getResponse() { + return response; + } + + public void setResponse(Response response) { + this.response = response; + } + + public String getError() { + return error; + } + + public void setError(String error) { + this.error = error; + } +} diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Week.java b/src/main/java/ru/ulstu/utils/timetable/model/Week.java new file mode 100644 index 0000000..8ea76ea --- /dev/null +++ b/src/main/java/ru/ulstu/utils/timetable/model/Week.java @@ -0,0 +1,18 @@ +package ru.ulstu.utils.timetable.model; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +public class Week implements Serializable { + + private List days = new ArrayList<>(); + + public List getDays() { + return days; + } + + public void setDays(List days) { + this.days = days; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f4be778..a74a19f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,17 +2,18 @@ spring.main.banner-mode=off server.port=8443 server.http.port=8080 -spring.http.multipart.maxFileSize=20MB -spring.http.multipart.maxRequestSize=20MB +multipart.maxFileSize=20MB +multipart.maxRequestSize=20MB # Thymeleaf Settings spring.thymeleaf.cache=false # SSL Settings -security.require-ssl=true server.ssl.key-store=classpath:sample.jks server.ssl.key-store-password=secret server.ssl.key-password=password # Log settings (TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF) logging.level.ru.ulstu=DEBUG +#HtmlUnit +logging.level.com.gargoylesoftware.htmlunit=ERROR # Mail Settings spring.mail.host=smtp.yandex.ru spring.mail.port=465 @@ -25,16 +26,17 @@ spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFact spring.datasource.url=jdbc:postgresql://localhost:5432/ng-tracker spring.datasource.username=postgres spring.datasource.password=postgres -spring.datasource.driverclassName=org.postgresql.Driver spring.jpa.hibernate.ddl-auto=validate +spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false # Liquibase Settings -liquibase.drop-first=false -liquibase.enabled=true -liquibase.change-log=classpath:db/changelog-master.xml +spring.liquibase.change-log=classpath:db/changelog-master.xml +spring.liquibase.drop-first=false +spring.liquibase.enabled=true # Application Settings ng-tracker.base-url=http://127.0.0.1:8080 ng-tracker.undead-user-login=admin ng-tracker.dev-mode=true ng-tracker.debug_email= ng-tracker.use-https=false -ng-tracker.check-run=false \ No newline at end of file +ng-tracker.check-run=false +ng-tracker.driver-path= diff --git a/src/main/resources/db/changelog-20190506_000000-schema.xml b/src/main/resources/db/changelog-20190506_000000-schema.xml new file mode 100644 index 0000000..cd5a59b --- /dev/null +++ b/src/main/resources/db/changelog-20190506_000000-schema.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/src/main/resources/db/changelog-20190506_000001-schema.xml b/src/main/resources/db/changelog-20190506_000001-schema.xml new file mode 100644 index 0000000..e28d009 --- /dev/null +++ b/src/main/resources/db/changelog-20190506_000001-schema.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + diff --git a/src/main/resources/db/changelog-20190507_000002-schema.xml b/src/main/resources/db/changelog-20190507_000002-schema.xml new file mode 100644 index 0000000..c756bf6 --- /dev/null +++ b/src/main/resources/db/changelog-20190507_000002-schema.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/src/main/resources/db/changelog-20190517_000001-schema.xml b/src/main/resources/db/changelog-20190517_000001-schema.xml new file mode 100644 index 0000000..73c6435 --- /dev/null +++ b/src/main/resources/db/changelog-20190517_000001-schema.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/src/main/resources/db/changelog-20190528_000000-schema.xml b/src/main/resources/db/changelog-20190528_000000-schema.xml new file mode 100644 index 0000000..02ba642 --- /dev/null +++ b/src/main/resources/db/changelog-20190528_000000-schema.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/main/resources/db/changelog-20190528_000002-schema.xml b/src/main/resources/db/changelog-20190528_000002-schema.xml new file mode 100644 index 0000000..a4e2032 --- /dev/null +++ b/src/main/resources/db/changelog-20190528_000002-schema.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + diff --git a/src/main/resources/db/changelog-20190529_000000-schema.xml b/src/main/resources/db/changelog-20190529_000000-schema.xml new file mode 100644 index 0000000..40079ff --- /dev/null +++ b/src/main/resources/db/changelog-20190529_000000-schema.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + diff --git a/src/main/resources/db/changelog-20190529_000001-schema.xml b/src/main/resources/db/changelog-20190529_000001-schema.xml new file mode 100644 index 0000000..0b6548b --- /dev/null +++ b/src/main/resources/db/changelog-20190529_000001-schema.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/src/main/resources/db/changelog-20190428_000000-schema.xml b/src/main/resources/db/changelog-20190601_000001-schema.xml similarity index 75% rename from src/main/resources/db/changelog-20190428_000000-schema.xml rename to src/main/resources/db/changelog-20190601_000001-schema.xml index b44691d..409bde4 100644 --- a/src/main/resources/db/changelog-20190428_000000-schema.xml +++ b/src/main/resources/db/changelog-20190601_000001-schema.xml @@ -2,9 +2,9 @@ - + - + - \ No newline at end of file + diff --git a/src/main/resources/db/changelog-20190605_000000-schema.xml b/src/main/resources/db/changelog-20190605_000000-schema.xml new file mode 100644 index 0000000..3863268 --- /dev/null +++ b/src/main/resources/db/changelog-20190605_000000-schema.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/db/changelog-20190607_000002-schema.xml b/src/main/resources/db/changelog-20190607_000002-schema.xml new file mode 100644 index 0000000..9531c87 --- /dev/null +++ b/src/main/resources/db/changelog-20190607_000002-schema.xml @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml index 6847cbc..39d79cb 100644 --- a/src/main/resources/db/changelog-master.xml +++ b/src/main/resources/db/changelog-master.xml @@ -33,15 +33,26 @@ + - + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db/common/changelog-20190423_100000-schema.xml b/src/main/resources/db/common/changelog-20190423_100000-schema.xml new file mode 100644 index 0000000..602014e --- /dev/null +++ b/src/main/resources/db/common/changelog-20190423_100000-schema.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mail_templates/pingsInfoWeekEmail.html b/src/main/resources/mail_templates/pingsInfoWeekEmail.html new file mode 100644 index 0000000..180ef3b --- /dev/null +++ b/src/main/resources/mail_templates/pingsInfoWeekEmail.html @@ -0,0 +1,23 @@ + + + + Уведомление о создании статьи + + + + +

+ Уважаемый(ая) Ivan Ivanov +

+

+ Вы были отмечены в следующих задачах: +

+

+

+

+ Regards, +
+ NG-tracker. +

+ + diff --git a/src/main/resources/mail_templates/userInviteEmail.html b/src/main/resources/mail_templates/userInviteEmail.html index 98fe85f..bb0ba38 100644 --- a/src/main/resources/mail_templates/userInviteEmail.html +++ b/src/main/resources/mail_templates/userInviteEmail.html @@ -7,9 +7,9 @@

- Аккаунт в системе NG-Tracker был создан.
- Данные для входа:
- Логин -
+ Аккаунт в системе NG-Tracker был создан.
+ Данные для входа:
+ Логин -
Пароль -

diff --git a/src/main/resources/public/css/agency.css b/src/main/resources/public/css/agency.css index fb3ec24..a846fa8 100644 --- a/src/main/resources/public/css/agency.css +++ b/src/main/resources/public/css/agency.css @@ -365,7 +365,7 @@ header.masthead .intro-text .intro-heading { } .portfolio-modal { - padding-right: 0px !important; + padding-right: 0 !important; } .portfolio-modal .modal-dialog { @@ -782,6 +782,10 @@ ul.social-buttons li a:active, ul.social-buttons li a:focus, ul.social-buttons l margin: 5px; } +.small-icon { + width: 16px; +} + /* --------------------------------------------------- FEEDBACK STYLE ----------------------------------------------------- */ diff --git a/src/main/resources/public/css/base.css b/src/main/resources/public/css/base.css index 0c69e7c..59da321 100644 --- a/src/main/resources/public/css/base.css +++ b/src/main/resources/public/css/base.css @@ -1,3 +1,3 @@ .loader { - padding-left:50% + padding-left: 50% } \ No newline at end of file diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css index 60a866d..3b23ba0 100644 --- a/src/main/resources/public/css/conference.css +++ b/src/main/resources/public/css/conference.css @@ -23,11 +23,12 @@ body { text-decoration: none; margin: 0; } + .conference-row .d-flex .text-decoration:nth-child(1) { margin-left: 5px; } -.conference-row .d-flex .text-decoration span.h6.float-left.m-2 { +.conference-row .d-flex .text-decoration span.h6.float-left.m-2 { max-width: 470px; white-space: nowrap; overflow: hidden; @@ -44,7 +45,6 @@ body { } - .conference-row .d-flex { margin: 0 15px; } @@ -57,7 +57,7 @@ body { .deadline-list { height: 200px; - padding: 0px; + padding: 0; overflow-y: scroll; } @@ -73,7 +73,7 @@ body { .member-list { height: 200px; - padding: 0px; + padding: 0; overflow-y: scroll; } @@ -82,6 +82,7 @@ body { height: 40px; max-height: 40px; } + .member select { appearance: none; -moz-appearance: none; @@ -134,7 +135,7 @@ body { .paper-list { height: 200px; - padding: 0px; + padding: 0; overflow-y: scroll; } @@ -159,7 +160,7 @@ body { } .paper-name span:nth-child(1) { - margin: 3px 0px 3px 10px; + margin: 3px 0 3px 10px; float: left; } @@ -234,7 +235,7 @@ body { background-color: #ff9973; } -@media (max-width: 1199px) and (min-width: 768px){ +@media (max-width: 1199px) and (min-width: 768px) { .paper-control { display: block!important; } diff --git a/src/main/resources/public/css/grant.css b/src/main/resources/public/css/grant.css index 2e6349d..d80377d 100644 --- a/src/main/resources/public/css/grant.css +++ b/src/main/resources/public/css/grant.css @@ -1,12 +1,12 @@ .div-deadline-date { - padding-right: 0px; + padding-right: 0; } -.form-deadline-date{ +.form-deadline-date { padding-right: 3px; } -.div-deadline-description{ +.div-deadline-description { padding-left: 5px; padding-right: 5px; } @@ -16,7 +16,7 @@ } .div-selected-papers { - border: 0px; + border: 0; padding-left: 12px; } @@ -30,7 +30,7 @@ color: black; } -.div-file-name{ +.div-file-name { padding-top: 6px; } diff --git a/src/main/resources/public/css/odin.css b/src/main/resources/public/css/odin.css index 2bfeb75..0c2b7c4 100644 --- a/src/main/resources/public/css/odin.css +++ b/src/main/resources/public/css/odin.css @@ -52,8 +52,7 @@ Odin Paginator */ .odin-paginator { - margin: 0; - margin-top: 5px; + margin: 5px 0 0; text-align: center; } diff --git a/src/main/resources/public/css/project.css b/src/main/resources/public/css/project.css new file mode 100644 index 0000000..24e12ea --- /dev/null +++ b/src/main/resources/public/css/project.css @@ -0,0 +1,5 @@ +.div-deadline-done { + width: 60%; + height: 100%; + float: right; +} \ No newline at end of file diff --git a/src/main/resources/public/css/tasks.css b/src/main/resources/public/css/tasks.css index 936dd84..6098550 100644 --- a/src/main/resources/public/css/tasks.css +++ b/src/main/resources/public/css/tasks.css @@ -13,18 +13,18 @@ cursor: text; } -.filter .bootstrap-select{ +.filter .bootstrap-select { margin-bottom: 10px; } -.filter-option-inner-inner{ +.filter-option-inner-inner { font-size: 12px; text-transform: uppercase; font-weight: normal; line-height: 25px; } -.sorting .bootstrap-select{ +.sorting .bootstrap-select { margin-bottom: 10px; } @@ -38,53 +38,54 @@ width: auto; max-width: inherit; } -.tag-info{ - font-size: 10px; - color: white; - padding: 5px 15px; - background-color: black; - display: none; - margin-left: 5px; - border-radius: 5px; - opacity: 0.8; - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + +.tag-info { + font-size: 10px; + color: white; + padding: 5px 15px; + background-color: black; + display: none; + margin-left: 5px; + border-radius: 5px; + opacity: 0.8; + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; } -.fa-question-circle{ +.fa-question-circle { font-size: 15px; color: #212529; - cursor:pointer; + cursor: pointer; } -.fa-question-circle:hover .tag-info{ - display:inline-block; +.fa-question-circle:hover .tag-info { + display: inline-block; } -.task-row{ +.task-row { position: relative; } -.task-row .col:hover{ +.task-row .col:hover { background-color: #f8f9fa; } -.task-row .col > a{ +.task-row .col > a { display: block; text-decoration: none; } -.task-row .col:hover .remove-task{ +.task-row .col:hover .remove-task { visibility: visible; } -.remove-task{ +.remove-task { visibility: hidden; position: absolute; right: -20px; @@ -93,7 +94,7 @@ padding: 0 20px; } -.remove-task:hover{ +.remove-task:hover { background-color: #ebebeb; } @@ -106,10 +107,10 @@ margin-right: 4px; margin-bottom: 4px; - font-size: 75%; - font-weight: 700; - line-height: 1.5; - color: #fff; + font-size: 75%; + font-weight: 700; + line-height: 1.5; + color: #fff; } .tag-name span[data-role="remove"] { @@ -119,7 +120,7 @@ .tag-name span[data-role="remove"]:after { content: "x"; - padding: 0px 2px; + padding: 0 2px; } .tag-name input[type="text"] { diff --git a/src/main/resources/public/js/conference.js b/src/main/resources/public/js/conference.js index 8273557..37c7403 100644 --- a/src/main/resources/public/js/conference.js +++ b/src/main/resources/public/js/conference.js @@ -1,5 +1,5 @@ $(document).ready(function () { - $('input[data-confirm]').click(function(ev) { + $('input[data-confirm]').click(function (ev) { var value = $(this).attr('value'); if (!$('#dataConfirmModal').length) { $('#modalDelete').append('

\n' + ' \n' + @@ -22,7 +22,7 @@ $(document).ready(function () { } $('#dataConfirmModal').find('#myModalLabel').text($(this).attr('data-confirm')); $('#deleteConference').attr('value', value); - $('#dataConfirmModal').modal({show:true}); + $('#dataConfirmModal').modal({show: true}); return false; }); diff --git a/src/main/resources/public/js/core.js b/src/main/resources/public/js/core.js index cc42258..7f54023 100644 --- a/src/main/resources/public/js/core.js +++ b/src/main/resources/public/js/core.js @@ -89,11 +89,6 @@ function getFromRest(url, callBack, errorCallBack) { }); } -/* exported getFromRestWithVersion */ -function getFromRest(url, callBack, errorCallBack) { - getFromRestWithParams(url, "", callBack, errorCallBack); -} - /* exported getFromRestWithVersionAndParams */ function getFromRestWithParams(url, params, callBack, errorCallBack) { $.ajax({ @@ -225,3 +220,19 @@ function getUrlVar(key) { var result = new RegExp(key + "=([^&]*)", "i").exec(window.location.search); return result && decodeURIComponent(result[1]) || ""; } + +function sendPing(field, url) { + id = document.getElementById(field).value + + $.ajax({ + url: url + `?${field}=` + id, + contentType: "application/json; charset=utf-8", + method: "POST", + success: function () { + showFeedbackMessage("Ping был отправлен", MessageTypesEnum.SUCCESS) + }, + error: function (errorData) { + showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING) + } + }) +} \ No newline at end of file diff --git a/src/main/resources/public/js/grants.js b/src/main/resources/public/js/grants.js index c33b4df..40c3e4f 100644 --- a/src/main/resources/public/js/grants.js +++ b/src/main/resources/public/js/grants.js @@ -3,7 +3,7 @@ $(document).ready(function () { $(".grant-row").mouseenter(function (event) { var grantRow = $(event.target).closest(".grant-row"); $(grantRow).css("background-color", "#f8f9fa"); - $(grantRow).find(".remove-paper").removeClass("d-none"); + $(grantRow).find(".remove-grant").removeClass("d-none"); }); $(".grant-row").mouseleave(function (event) { diff --git a/src/main/resources/public/js/projects.js b/src/main/resources/public/js/projects.js index 5867c50..114beb4 100644 --- a/src/main/resources/public/js/projects.js +++ b/src/main/resources/public/js/projects.js @@ -12,7 +12,7 @@ $(document).ready(function () { $(projectRow).find(".remove-paper").addClass("d-none"); }); - $('a[data-confirm]').click(function(ev) { + $('a[data-confirm]').click(function (ev) { var href = $(this).attr('href'); if (!$('#dataConfirmModal').length) { $('#modalDelete').append('\n' + ' \n' + @@ -35,7 +35,7 @@ $(document).ready(function () { } $('#dataConfirmModal').find('#myModalLabel').text($(this).attr('data-confirm')); $('#dataConfirmOK').attr('href', href); - $('#dataConfirmModal').modal({show:true}); + $('#dataConfirmModal').modal({show: true}); return false; }); }); diff --git a/src/main/resources/public/js/tasks.js b/src/main/resources/public/js/tasks.js index f1cf868..ebff7e2 100644 --- a/src/main/resources/public/js/tasks.js +++ b/src/main/resources/public/js/tasks.js @@ -1,45 +1,45 @@ /* 0) { + if (tagNumber > 0) { tagNumber = $("#tags .tag").last() - .children('input') - .attr("name") - .split(']')[0] - .split('[')[1]; + .children('input') + .attr("name") + .split(']')[0] + .split('[')[1]; tagNumber++; } var tagName = $.trim($(this).val()); var addTag = true; // проверка, добавлен ли этот тег - $("#tags .tag .tag-name input[type=text]").each(function() { - if(tagName === $(this).val()) { - addTag = false; - return; - } - }); + $("#tags .tag .tag-name input[type=text]").each(function () { + if (tagName === $(this).val()) { + addTag = false; + return; + } + }); // если тег не добавлен - if(addTag) { + if (addTag) { // контейнер тега var newTagRow = $("
") .attr("id", 'tags' + tagNumber) diff --git a/src/main/resources/public/js/users.js b/src/main/resources/public/js/users.js index e31d3ad..15380c3 100644 --- a/src/main/resources/public/js/users.js +++ b/src/main/resources/public/js/users.js @@ -14,7 +14,7 @@ function changePassword() { } $.ajax({ - url:"/api/1.0/users/changePassword", + url: "/api/1.0/users/changePassword", contentType: "application/json; charset=utf-8", data: JSON.stringify({ "oldPassword": oldPassword, @@ -22,12 +22,12 @@ function changePassword() { "confirmPassword": confirmPassword, }), method: "POST", - success: function() { + success: function () { $("#closeModalPassword").click(); - showFeedbackMessage("Пароль был обновлен", MessageTypesEnum.SUCCESS) + showFeedbackMessage("Пароль был обновлен", MessageTypesEnum.SUCCESS) }, - error: function(errorData) { + error: function (errorData) { showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING) } }) @@ -41,14 +41,14 @@ function inviteUser() { } $.ajax({ - url:"/api/1.0/users/invite?email=" + email, + url: "/api/1.0/users/invite?email=" + email, contentType: "application/json; charset=utf-8", method: "POST", - success: function() { + success: function () { $("#closeModalInvite").click(); showFeedbackMessage("Пользователь был успешно приглашен", MessageTypesEnum.SUCCESS) }, - error: function(errorData) { + error: function (errorData) { showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING) } }) @@ -64,10 +64,10 @@ function requestResetPassword() { $("#dvloader").show(); $.ajax({ - url:"/api/1.0/users/password-reset-request?email=" + email, + url: "/api/1.0/users/password-reset-request?email=" + email, contentType: "application/json; charset=utf-8", method: "POST", - success: function() { + success: function () { showFeedbackMessage("Проверочный код был отправлен на указанный почтовый ящик", MessageTypesEnum.SUCCESS) $("#passwordNew").show() $("#passwordConfirm").show() @@ -78,7 +78,7 @@ function requestResetPassword() { $("#dvloader").hide() }, - error: function(errorData) { + error: function (errorData) { showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING) $("#dvloader").hide() } @@ -102,7 +102,7 @@ function resetPassword() { } $.ajax({ - url:"/api/1.0/users/password-reset", + url: "/api/1.0/users/password-reset", contentType: "application/json; charset=utf-8", method: "POST", data: JSON.stringify({ @@ -110,18 +110,64 @@ function resetPassword() { "passwordConfirm": passwordConfirm, "resetKey": resetKey, }), - success: function() { + success: function () { showFeedbackMessage("Пользователь был успешно приглашен", MessageTypesEnum.SUCCESS) window.location.href = "/login" }, - error: function(errorData) { + error: function (errorData) { showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING) } }) } +function blockUser() { + userId = $('#userId').val(); + $.ajax({ + url: "/api/1.0/users/block?userId=" + userId, + contentType: "application/json; charset=utf-8", + method: "POST", + success: function () { + showFeedbackMessage("Пользователь заблокирован", MessageTypesEnum.SUCCESS) + }, + error: function (errorData) { + showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING) + } + }) +} function isEmailValid(email) { re = /\S+@\S+\.\S+/; return re.test(email) +} + +function drawChart() { + userId = $('#author :selected').val() + activity = $('#activity :selected').val() + $.ajax({ + url: `/api/1.0/users/activities/pings?userId=${userId}&activity=${activity}`, + contentType: "application/json; charset=utf-8", + method: "GET", + success: function (response) { + if (response.data.length == 0) { + return; + } + array = [['Активности', 'Количество']] + + Object.keys(response.data).forEach(function (key) { + console.table('Key : ' + key + ', Value : ' + response.data[key]) + array.push([key, response.data[key]]) + }) + var data = google.visualization.arrayToDataTable(array); + var options = { + title: 'Активности', + is3D: true, + pieResidueSliceLabel: 'Остальное' + }; + var chart = new google.visualization.PieChart(document.getElementById('air')); + chart.draw(data, options); + }, + error: function (errorData) { + showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING) + } + }) } \ No newline at end of file diff --git a/src/main/resources/public/templates/odin.html b/src/main/resources/public/templates/odin.html index 1f9f9d9..ec4e36e 100644 --- a/src/main/resources/public/templates/odin.html +++ b/src/main/resources/public/templates/odin.html @@ -126,7 +126,7 @@
- +
diff --git a/src/main/resources/templates/users/dashboard.html b/src/main/resources/templates/users/dashboard.html new file mode 100644 index 0000000..3e3f13c --- /dev/null +++ b/src/main/resources/templates/users/dashboard.html @@ -0,0 +1,36 @@ + + + + + + +
+
+
+
+

Пользователи

+
+
+

teste

+
+
+ +
+ +
+
+
+ +
+ + \ No newline at end of file diff --git a/src/main/resources/templates/users/fragments/userDashboardFragment.html b/src/main/resources/templates/users/fragments/userDashboardFragment.html new file mode 100644 index 0000000..795c6ff --- /dev/null +++ b/src/main/resources/templates/users/fragments/userDashboardFragment.html @@ -0,0 +1,24 @@ + + + + + + +
+
+
+ +

+ +

+ +

+ +

Онлайн

+ +
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/users/inviteModal.html b/src/main/resources/templates/users/inviteModal.html index c91b397..3b02eef 100644 --- a/src/main/resources/templates/users/inviteModal.html +++ b/src/main/resources/templates/users/inviteModal.html @@ -1,10 +1,5 @@ - - - - - - +
diff --git a/src/main/resources/templates/users/pings.html b/src/main/resources/templates/users/pings.html new file mode 100644 index 0000000..1e9f6c2 --- /dev/null +++ b/src/main/resources/templates/users/pings.html @@ -0,0 +1,53 @@ + + + + + + + + + + + + +
+
+
+
+
+

Ping активности

+
+
+
+
+
Фильтр:
+ +
+ +
+
+
+
+ +
+
+ + diff --git a/src/main/resources/templates/users/profile.html b/src/main/resources/templates/users/profile.html index 93adfc7..f59587d 100644 --- a/src/main/resources/templates/users/profile.html +++ b/src/main/resources/templates/users/profile.html @@ -1,7 +1,7 @@ + layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html"> diff --git a/src/test/java/GrantTest.java b/src/test/java/GrantTest.java new file mode 100644 index 0000000..b824852 --- /dev/null +++ b/src/test/java/GrantTest.java @@ -0,0 +1,225 @@ +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import core.PageObject; +import core.TestTemplate; +import grant.GrantPage; +import grant.GrantsDashboardPage; +import grant.GrantsPage; +import org.junit.Assert; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; +import org.openqa.selenium.WebElement; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import ru.ulstu.NgTrackerApplication; +import ru.ulstu.configuration.ApplicationProperties; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@RunWith(SpringRunner.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) +public class GrantTest extends TestTemplate { + private final Map> navigationHolder = ImmutableMap.of( + new GrantsPage(), Arrays.asList("ГРАНТЫ", "/grants/grants"), + new GrantPage(), Arrays.asList("РЕДАКТИРОВАНИЕ ГРАНТА", "/grants/grant?id=0"), + new GrantsDashboardPage(), Arrays.asList("Гранты", "/grants/dashboard") + ); + + @Autowired + private ApplicationProperties applicationProperties; + + @Test + public void aCreateNewGrant() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 1); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + GrantPage grantPage = (GrantPage) getContext().initPage(page.getKey()); + GrantsPage grantsPage = (GrantsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 0).getKey()); + + String newGrantName = "test grant" + (new Date()); + grantPage.setTitle(newGrantName); + String deadlineDate = new Date().toString(); + String deadlineDescription = "test deadline description"; + grantPage.setDeadline(deadlineDate, 0, deadlineDescription); + grantPage.setLeader(); + grantPage.saveGrant(); + + Assert.assertTrue(grantsPage.findGrantByTitle(newGrantName)); + } + + @Test + public void bCreateBlankGrant() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 1); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + GrantPage grantPage = (GrantPage) getContext().initPage(page.getKey()); + + grantPage.saveGrant(); + + Assert.assertTrue(grantPage.checkBlankFields()); + } + + @Test + public void cUpdateGrantTitle() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey()); + GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + + grantsPage.getFirstGrant(); + String newGrantTitle = "test " + (new Date()); + grantPage.setTitle(newGrantTitle); + grantPage.saveGrant(); + + Assert.assertTrue(grantsPage.findGrantByTitle(newGrantTitle)); + } + + @Test + public void dAttachPaper() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey()); + GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + + grantsPage.getFirstGrant(); + Integer countPapers = grantPage.getAttachedPapers().size(); + + Assert.assertEquals(countPapers + 1, grantPage.attachPaper().size()); + } + + @Test + public void eDeletePaper() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey()); + GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + + grantsPage.getFirstGrant(); + Integer oldCountPapers = grantPage.getAttachedPapers().size(); + if (oldCountPapers == 0) { + oldCountPapers = grantPage.attachPaper().size(); + } + + Assert.assertEquals(oldCountPapers - 1, grantPage.deletePaper().size()); + } + + @Test + public void fAddDeadline() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey()); + GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + + grantsPage.getFirstGrant(); + String grantId = grantPage.getId(); + Integer deadlineCount = grantPage.getDeadlineCount(); + + String description = "deadline test"; + String date = "08.08.2019"; + String dateValue = "2019-08-08"; + grantPage.addDeadline(); + grantPage.setDeadline(date, deadlineCount, description); + grantPage.saveGrant(); + + getContext().goTo(applicationProperties.getBaseUrl() + String.format("/grants/grant?id=%s", grantId)); + + Assert.assertTrue(grantPage.checkDeadline(description, dateValue)); + } + + @Test + public void gDeleteDeadline() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey()); + GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + + grantsPage.getFirstGrant(); + String grantId = grantPage.getId(); + Integer deadlineCount = grantPage.getDeadlineCount(); + + grantPage.deleteDeadline(); + grantPage.saveGrant(); + + getContext().goTo(applicationProperties.getBaseUrl() + String.format("/grants/grant?id=%s", grantId)); + Integer newDeadlineCount = grantPage.getDeadlineCount(); + Assert.assertEquals(deadlineCount - 1, (int) newDeadlineCount); + } + + @Test + public void hAddAuthor() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey()); + GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + + WebElement grant = grantsPage.getFirstGrantWithoutClick(); + String grantTitle = grantsPage.getGrantTitle(grant); + Integer authorsCount = grantsPage.getAuthorsCount(grant); + + grantsPage.getFirstGrant(); + grantPage.addAuthor(); + grantPage.saveGrant(); + + grant = grantsPage.getGrantByTitle(grantTitle); + Integer newAuthorsCount = grantsPage.getAuthorsCount(grant); + + Assert.assertEquals(authorsCount + 1, (int) newAuthorsCount); + } + + @Test + public void iDeleteAuthor() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey()); + GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + + WebElement grant = grantsPage.getFirstGrantWithoutClick(); + String grantTitle = grantsPage.getGrantTitle(grant); + Integer authorsCount = grantsPage.getAuthorsCount(grant); + + grantsPage.getFirstGrant(); + grantPage.deleteAuthor(); + grantPage.saveGrant(); + + grant = grantsPage.getGrantByTitle(grantTitle); + Integer newAuthorsCount = grantsPage.getAuthorsCount(grant); + + authorsCount = (authorsCount == 0) ? 0 : authorsCount - 1; + + Assert.assertEquals((int) authorsCount, (int) newAuthorsCount); + } + + @Test + public void jUpdateGrantDescription() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey()); + GrantPage grantPage = (GrantPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + + String description = "newDescriptionForGrant"; + grantsPage.getFirstGrant(); + String grantId = grantPage.getId(); + grantPage.setDescription(description); + grantPage.saveGrant(); + + getContext().goTo(applicationProperties.getBaseUrl() + String.format("/grants/grant?id=%s", grantId)); + + Assert.assertTrue(description.equals(grantPage.getDescription())); + } + + @Test + public void kDeleteGrant() throws InterruptedException { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + GrantsPage grantsPage = (GrantsPage) getContext().initPage(page.getKey()); + + Integer size = grantsPage.getGrantsList().size(); + grantsPage.deleteFirst(); + Assert.assertEquals(size - 1, grantsPage.getGrantsList().size()); + } +} diff --git a/src/test/java/PaperTest.java b/src/test/java/PaperTest.java new file mode 100644 index 0000000..081f01f --- /dev/null +++ b/src/test/java/PaperTest.java @@ -0,0 +1,247 @@ +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import core.PageObject; +import core.TestTemplate; +import org.junit.Assert; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import paper.PaperPage; +import paper.PapersDashboardPage; +import paper.PapersPage; +import ru.ulstu.NgTrackerApplication; +import ru.ulstu.configuration.ApplicationProperties; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +@RunWith(SpringRunner.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) +public class PaperTest extends TestTemplate { + private final Map> navigationHolder = ImmutableMap.of( + new PapersPage(), Arrays.asList("СТАТЬИ", "/papers/papers"), + new PaperPage(), Arrays.asList("РЕДАКТИРОВАНИЕ СТАТЬИ", "/papers/paper?id=0"), + new PapersDashboardPage(), Arrays.asList("СТАТЬИ", "/papers/dashboard") + ); + + @Autowired + private ApplicationProperties applicationProperties; + + private String getPaperPageUrl() { + return Iterables.get(navigationHolder.entrySet(), 1).getValue().get(1); + } + + private PaperPage getPaperPage() { + PaperPage paperPage = (PaperPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + paperPage.initElements(); + return paperPage; + } + + private String getPapersPageUrl() { + return Iterables.get(navigationHolder.entrySet(), 0).getValue().get(1); + } + + private PapersPage getPapersPage() { + PapersPage papersPage = (PapersPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 0).getKey()); + papersPage.initElements(); + return papersPage; + } + + private String getPapersDashboardPageUrl() { + return Iterables.get(navigationHolder.entrySet(), 2).getValue().get(1); + } + + private PapersDashboardPage getPapersDashboardPage() { + PapersDashboardPage papersDashboardPage = (PapersDashboardPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 2).getKey()); + papersDashboardPage.initElements(); + return papersDashboardPage; + } + + @Test + public void createNewPaperTest() { + getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl()); + PaperPage paperPage = getPaperPage(); + + String testTitle = "test " + System.currentTimeMillis(); + fillRequiredFields(paperPage, testTitle); + paperPage.clickSaveBtn(); + + PapersPage papersPage = getPapersPage(); + + Assert.assertTrue(papersPage.havePaperWithTitle(testTitle)); + } + + @Test + public void editPaperTest() { + createNewPaper(); + getContext().goTo(applicationProperties.getBaseUrl() + getPapersPageUrl()); + PapersPage papersPage = getPapersPage(); + papersPage.clickFirstPaper(); + + PaperPage paperPage = getPaperPage(); + String testTitle = "test " + System.currentTimeMillis(); + paperPage.setTitle(testTitle); + paperPage.clickSaveBtn(); + + Assert.assertTrue(papersPage.havePaperWithTitle(testTitle)); + } + + private void createNewPaper() { + getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl()); + PaperPage paperPage = getPaperPage(); + String testTitle = "test " + System.currentTimeMillis(); + fillRequiredFields(paperPage, testTitle); + paperPage.clickSaveBtn(); + } + + @Test + public void addDeadlineTest() { + createNewPaper(); + getContext().goTo(applicationProperties.getBaseUrl() + getPapersPageUrl()); + PapersPage papersPage = getPapersPage(); + papersPage.clickFirstPaper(); + + PaperPage paperPage = getPaperPage(); + papersPage.clickAddDeadline(); + String testDate = "01.01.2019"; + String testDateResult = "2019-01-01"; + String testDesc = "desc"; + Integer deadlineNumber = 2; + paperPage.setDeadlineDate(deadlineNumber, testDate); + paperPage.setDeadlineDescription(deadlineNumber, testDesc); + String paperId = paperPage.getId(); + paperPage.clickSaveBtn(); + + getContext().goTo(applicationProperties.getBaseUrl() + String.format("/papers/paper?id=%s", paperId)); + + Assert.assertTrue(paperPage.deadlineExist(testDesc, testDateResult)); + } + + @Test + public void noDeadlinesValidationTest() { + getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl()); + PaperPage paperPage = getPaperPage(); + + String testTitle = "test " + System.currentTimeMillis(); + paperPage.setTitle(testTitle); + paperPage.clickSaveBtn(); + + Assert.assertTrue(paperPage.hasAlert("Не может быть пустым")); + } + + private void fillRequiredFields(PaperPage paperPage, String title) { + paperPage.setTitle(title); + String testDate = "01.01.2019"; + String testDesc = "desc"; + Integer deadlineNumber = 1; + paperPage.setDeadlineDate(deadlineNumber, testDate); + paperPage.setDeadlineDescription(deadlineNumber, testDesc); + } + + @Test + public void addReferenceTest() { + createNewPaper(); + getContext().goTo(applicationProperties.getBaseUrl() + getPapersPageUrl()); + PapersPage papersPage = getPapersPage(); + papersPage.clickFirstPaper(); + + PaperPage paperPage = getPaperPage(); + fillRequiredFields(paperPage, "test " + System.currentTimeMillis()); + paperPage.clickReferenceTab(); + paperPage.clickAddReferenceButton(); + + paperPage.clickReferenceTab(); + paperPage.showFirstReference(); + String authors = "testAuthors"; + paperPage.setFirstReferenceAuthors(authors); + + String paperId = paperPage.getId(); + paperPage.clickSaveBtn(); + + getContext().goTo(applicationProperties.getBaseUrl() + String.format("/papers/paper?id=%s", paperId)); + + Assert.assertTrue(paperPage.authorsExists(authors)); + } + + @Test + public void referencesFormatTest() { + getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl()); + + PaperPage paperPage = getPaperPage(); + paperPage.setTitle("test"); + paperPage.clickReferenceTab(); + paperPage.clickAddReferenceButton(); + + paperPage.clickReferenceTab(); + paperPage.showFirstReference(); + paperPage.setFirstReferenceAuthors("authors"); + paperPage.setFirstReferencePublicationTitle("title"); + paperPage.setFirstReferencePublicationYear("2010"); + paperPage.setFirstReferencePublisher("publisher"); + paperPage.setFirstReferencePages("200"); + paperPage.setFirstReferenceJournalOrCollectionTitle("journal"); + paperPage.setFormatStandardSpringer(); + paperPage.clickFormatButton(); + + Assert.assertEquals("authors (2010) title. journal, publisher, pp 200", paperPage.getFormatString()); + } + + @Test + public void dashboardLinkTest() { + getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl()); + PaperPage paperPage = getPaperPage(); + + fillRequiredFields(paperPage, "test " + System.currentTimeMillis()); + String testLink = "http://test.com/"; + paperPage.setUrl(testLink); + paperPage.clickSaveBtn(); + + getContext().goTo(applicationProperties.getBaseUrl() + getPapersDashboardPageUrl()); + PapersDashboardPage papersDashboardPage = getPapersDashboardPage(); + + Assert.assertTrue(papersDashboardPage.externalLinkExists(testLink)); + } + + @Test + public void deletePaperTest() { + createNewPaper(); + getContext().goTo(applicationProperties.getBaseUrl() + getPapersPageUrl()); + PapersPage papersPage = getPapersPage(); + + int size = papersPage.getPapersCount(); + papersPage.clickRemoveFirstPaperButton(); + papersPage.clickConfirmDeleteButton(); + + Assert.assertEquals(size - 1, papersPage.getPapersCount()); + } + + @Test + public void latexValidationTest() { + getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl()); + + PaperPage paperPage = getPaperPage(); + paperPage.setTitle("test"); + paperPage.clickLatexTab(); + paperPage.setLatexText("test"); + paperPage.clickPdfButton(); + + Assert.assertTrue(paperPage.dangerMessageExist("Ошибка при создании PDF")); + } + + @Test + public void titleValidationTest() { + getContext().goTo(applicationProperties.getBaseUrl() + getPaperPageUrl()); + PaperPage paperPage = getPaperPage(); + + paperPage.clickSaveBtn(); + + Assert.assertTrue(paperPage.hasAlert("не может быть пусто")); + } + +} diff --git a/src/test/java/ProjectTest.java b/src/test/java/ProjectTest.java new file mode 100644 index 0000000..f2c6367 --- /dev/null +++ b/src/test/java/ProjectTest.java @@ -0,0 +1,174 @@ +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import core.PageObject; +import core.TestTemplate; +import org.junit.Assert; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import project.ProjectDashboard; +import project.ProjectPage; +import project.ProjectsPage; +import ru.ulstu.NgTrackerApplication; +import ru.ulstu.configuration.ApplicationProperties; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@RunWith(SpringRunner.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) +public class ProjectTest extends TestTemplate { + private final Map> navigationHolder = ImmutableMap.of( + new ProjectPage(), Arrays.asList("ПРОЕКТЫ", "/projects/projects"), + new ProjectsPage(), Arrays.asList("РЕДАКТИРОВАНИЕ ПРОЕКТА", "/projects/project?id=0"), + new ProjectDashboard(), Arrays.asList("ПРОЕКТЫ", "/projects/dashboard") + ); + + @Autowired + private ApplicationProperties applicationProperties; + + @Test + public void testACreateNewProject() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 1); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(page.getKey()); + ProjectPage projectPage = (ProjectPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 0).getKey()); + String name = "Project " + (new Date()).getTime(); + String date = "01.01.2019"; + Integer deadNum = projectPage.getDeadlineCount(); + projectPage.setName(name); + projectPage.clickAddDeadline(); + projectPage.addDeadlineDate(date, deadNum); + projectPage.clickSave(); + Assert.assertTrue(projectsPage.checkNameInList(name)); + } + + @Test + public void testBChangeNameAndSave() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey()); + ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + projectsPage.getFirstProject(); + String name = "Project " + (new Date()).getTime(); + projectPage.clearName(); + projectPage.setName(name); + projectPage.clickSave(); + Assert.assertTrue(projectsPage.checkNameInList(name)); + } + + @Test + public void testCChangeDeadlineAndSave() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey()); + ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + projectsPage.getFirstProject(); + String name = projectPage.getName(); + String date = "01.01.2019"; + Integer deadNum = projectPage.getDeadlineCount(); + projectPage.addDeadlineDate(date, deadNum); + projectPage.clickSave(); + Assert.assertTrue(projectsPage.checkNameInList(name)); + } + + @Test + public void testDSetStatusAndSave() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey()); + ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + projectsPage.getFirstProject(); + String name = projectPage.getName(); + projectPage.setStatus(); + projectPage.clickSave(); + Assert.assertTrue(projectsPage.checkNameInList(name)); + } + + @Test + public void testEAddDescriptionAndSave() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey()); + ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + projectsPage.getFirstProject(); + String name = projectPage.getName(); + String description = "Description " + (new Date()).getTime(); + projectPage.addDescription(description); + projectPage.clickSave(); + Assert.assertTrue(projectsPage.checkNameInList(name)); + } + + @Test + public void testFAddLinkAndSave() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey()); + ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + projectsPage.getFirstProject(); + String name = projectPage.getName(); + String link = "Link " + (new Date()).getTime(); + projectPage.addLink(link); + projectPage.clickSave(); + Assert.assertTrue(projectsPage.checkNameInList(name)); + } + + @Test + public void testGAddDeadlineDescriptionAndSave() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey()); + ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + projectsPage.getFirstProject(); + String name = projectPage.getName(); + String deadDesc = "Description " + (new Date()).getTime(); + projectPage.addDeadlineDescription(deadDesc); + projectPage.clickSave(); + Assert.assertTrue(projectsPage.checkNameInList(name)); + } + + @Test + public void testHSetDeadlineCompletionAndSave() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey()); + ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + projectsPage.getFirstProject(); + String name = projectPage.getName(); + projectPage.setDeadlineCompletion(); + projectPage.clickSave(); + Assert.assertTrue(projectsPage.checkNameInList(name)); + } + + @Test + public void testIDeleteDeadline() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey()); + ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + projectsPage.getFirstProject(); + projectPage.clickDeleteDeadline(); + Assert.assertTrue(projectPage.getDeadlineCount() == 0); + } + + @Test + public void testJDeleteProject() { + Map.Entry> page = Iterables.get(navigationHolder.entrySet(), 0); + getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1)); + ProjectPage projectPage = (ProjectPage) getContext().initPage(page.getKey()); + ProjectsPage projectsPage = (ProjectsPage) getContext().initPage(Iterables.get(navigationHolder.entrySet(), 1).getKey()); + projectsPage.getFirstProject(); + String name = projectPage.getName(); + projectPage.clickSave(); + projectsPage.deleteFirst(); + projectsPage.clickConfirm(); + Assert.assertFalse(projectsPage.checkNameInList(name)); + } +} diff --git a/src/test/java/conference/ConferencePage.java b/src/test/java/conference/ConferencePage.java index ef0d941..4717217 100644 --- a/src/test/java/conference/ConferencePage.java +++ b/src/test/java/conference/ConferencePage.java @@ -36,7 +36,7 @@ public class ConferencePage extends PageObject { driver.findElement(By.id("addDeadline")).click(); } - public List getDeadlineList() { + private List getDeadlineList() { return driver.findElements(By.className("deadline")); } diff --git a/src/test/java/context/Context.java b/src/test/java/context/Context.java index b32c08e..a1c5d1c 100644 --- a/src/test/java/context/Context.java +++ b/src/test/java/context/Context.java @@ -6,14 +6,12 @@ import org.openqa.selenium.WebDriver; import java.util.concurrent.TimeUnit; -//import org.openqa.selenium.support.PageFactory; - public abstract class Context { private final static String DRIVER_LOCATION = "drivers/%s"; - protected WebDriver driver; + WebDriver driver; - protected WebDriver getDriver() { + private WebDriver getDriver() { if (driver != null) { return driver; } @@ -42,8 +40,8 @@ public abstract class Context { return getDriver().getTitle(); } - public T initPage(T pageObject) { - return (T) pageObject.setDriver(getDriver()); + public PageObject initPage(T pageObject) { + return pageObject.setDriver(getDriver()); } protected abstract void createDriver(); diff --git a/src/test/java/core/PageObject.java b/src/test/java/core/PageObject.java index f3e5cb8..e8eae6e 100644 --- a/src/test/java/core/PageObject.java +++ b/src/test/java/core/PageObject.java @@ -2,16 +2,24 @@ package core; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; +import org.openqa.selenium.support.PageFactory; +import org.openqa.selenium.support.ui.WebDriverWait; public abstract class PageObject { protected WebDriver driver; protected JavascriptExecutor js; + protected WebDriverWait waiter; public abstract String getSubTitle(); public PageObject setDriver(WebDriver driver) { this.driver = driver; js = (JavascriptExecutor) driver; + waiter = new WebDriverWait(driver, 10); return this; } + + public void initElements() { + PageFactory.initElements(driver, this); + } } diff --git a/src/test/java/core/TestTemplate.java b/src/test/java/core/TestTemplate.java index a72a8c9..44a61fb 100644 --- a/src/test/java/core/TestTemplate.java +++ b/src/test/java/core/TestTemplate.java @@ -9,7 +9,7 @@ import org.openqa.selenium.Dimension; public abstract class TestTemplate { private static Context context; - public static Context getContext() { + protected static Context getContext() { return context; } diff --git a/src/test/java/grant/GrantPage.java b/src/test/java/grant/GrantPage.java new file mode 100644 index 0000000..363a195 --- /dev/null +++ b/src/test/java/grant/GrantPage.java @@ -0,0 +1,149 @@ +package grant; + +import core.PageObject; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.Select; + +import java.util.List; + +public class GrantPage extends PageObject { + @Override + public String getSubTitle() { + return driver.findElement(By.tagName("h2")).getText(); + } + + public String getId() { + return driver.findElement(By.id("grantId")).getAttribute("value"); + } + + public void setTitle(String name) { + driver.findElement(By.id("title")).clear(); + driver.findElement(By.id("title")).sendKeys(name); + } + + public String getTitle() { + return driver.findElement(By.id("title")).getAttribute("value"); + } + + public void setDeadline(String date, Integer i, String description) { + driver.findElement(By.id(String.format("deadlines%d.date", i))).sendKeys(date); + driver.findElement(By.id(String.format("deadlines%d.description", i))).sendKeys(description); + } + + public void setLeader() { + WebElement webElement = driver.findElement(By.id("leaderId")); + Select selectLeader = new Select(webElement); + selectLeader.selectByVisibleText("Романов"); + } + + public void saveGrant() { + driver.findElement(By.id("sendMessageButton")).click(); + } + + public boolean checkBlankFields() { + return driver.findElements(By.className("alert-danger")).size() > 0; + } + + public List getAttachedPapers() { + try { + return driver.findElement(By.className("div-selected-papers")).findElements(By.tagName("div")); + } catch (Exception ex) { + return null; + } + } + + public List attachPaper() { + WebElement selectPapers = driver.findElement(By.id("allPapers")); + Select select = new Select(selectPapers); + List selectedOptions = select.getAllSelectedOptions(); + List allOptions = select.getOptions(); + if (selectedOptions.size() >= allOptions.size()) { + for (int i = 0; i < allOptions.size(); i++) { + if (!allOptions.get(i).equals(selectedOptions.get(i))) { + select.selectByVisibleText(allOptions.get(i).getText()); + selectedOptions.add(allOptions.get(i)); + return selectedOptions; + } + } + } else { + select.selectByVisibleText(allOptions.get(0).getText()); + selectedOptions.add(allOptions.get(0)); + return selectedOptions; + } + return null; + } + + public List deletePaper() { + WebElement selectPapers = driver.findElement(By.id("allPapers")); + Select select = new Select(selectPapers); + select.deselectByVisibleText(select.getFirstSelectedOption().getText()); + return select.getAllSelectedOptions(); + } + + private List getDeadlineList() { + return driver.findElements(By.id("deadlines")); + } + + public Integer getDeadlineCount() { + return getDeadlineList().size(); + } + + public void addDeadline() { + driver.findElement(By.id("addDeadline")).click(); + } + + public boolean checkDeadline(String description, String dateValue) { + return getDeadlineList() + .stream() + .anyMatch(webElement -> { + return webElement.findElement(By.className("div-deadline-description")).findElement( + By.tagName("input")).getAttribute("value").equals(description) + && webElement.findElement(By.className("form-deadline-date")).getAttribute("value").equals(dateValue); + }); + } + + public void deleteDeadline() { + driver.findElements(By.className("btn-delete-deadline")).get(0).click(); + } + + public List addAuthor() { + WebElement selectAuthors = driver.findElement(By.id("authors")); + Select select = new Select(selectAuthors); + List selectedOptions = select.getAllSelectedOptions(); + List allOptions = select.getOptions(); + int i = 0; + while (i < selectedOptions.size()) { + if (!allOptions.get(i).equals(selectedOptions.get(i))) { + select.selectByVisibleText(allOptions.get(i).getText()); + selectedOptions.add(allOptions.get(i)); + return selectedOptions; + } else { + i++; + } + } + if (selectedOptions.size() != allOptions.size()) { + select.selectByVisibleText(allOptions.get(i).getText()); + selectedOptions.add(allOptions.get(i)); + } + return selectedOptions; + } + + public void deleteAuthor() { + WebElement selectAuthors = driver.findElement(By.id("authors")); + Select select = new Select(selectAuthors); + List selectedOptions = select.getAllSelectedOptions(); + if (selectedOptions.size() != 0) { + select.deselectByVisibleText(selectedOptions.get(0).getText()); + } + } + + public void setDescription(String description) { + driver.findElement(By.id("comment")).clear(); + driver.findElement(By.id("comment")).sendKeys(description); + } + + public String getDescription() { + return driver.findElement(By.id("comment")).getText(); + } +} diff --git a/src/test/java/grant/GrantsDashboardPage.java b/src/test/java/grant/GrantsDashboardPage.java new file mode 100644 index 0000000..036e785 --- /dev/null +++ b/src/test/java/grant/GrantsDashboardPage.java @@ -0,0 +1,11 @@ +package grant; + +import core.PageObject; +import org.openqa.selenium.By; + +public class GrantsDashboardPage extends PageObject { + @Override + public String getSubTitle() { + return driver.findElement(By.tagName("h2")).getText(); + } +} diff --git a/src/test/java/grant/GrantsPage.java b/src/test/java/grant/GrantsPage.java new file mode 100644 index 0000000..33c388d --- /dev/null +++ b/src/test/java/grant/GrantsPage.java @@ -0,0 +1,66 @@ +package grant; + +import core.PageObject; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; + +import java.util.List; + +public class GrantsPage extends PageObject { + @Override + public String getSubTitle() { + return driver.findElement(By.tagName("h2")).getText(); + } + + public List getGrantsList() { + return driver.findElements(By.className("grant-row")); + } + + public boolean findGrantByTitle(String grantTitle) { + return getGrantsList() + .stream() + .map(el -> el.findElement(By.cssSelector("span.h6"))) + .anyMatch(webElement -> webElement.getText().equals(grantTitle)); + } + + public void deleteFirst() throws InterruptedException { + WebElement findDeleteButton = driver.findElement(By.xpath("//*[@id=\"grants\"]/div/div[2]/div[1]/div[1]/div")); + findDeleteButton.click(); + Thread.sleep(3000); + WebElement grant = driver.findElement(By.xpath("//*[@id=\"grants\"]/div/div[2]/div[1]/div[1]/div/a[2]")); + grant.click(); + WebElement ok = driver.findElement(By.id("dataConfirmOK")); + ok.click(); + } + + public void getFirstGrant() { + driver.findElement(By.xpath("//*[@id=\"grants\"]/div/div[2]/div[1]/div[1]/div/a[1]")).click(); + } + + public WebElement getFirstGrantWithoutClick() { + return driver.findElement(By.xpath("//*[@id=\"grants\"]/div/div[2]/div[1]/div[1]")); + } + + public String getGrantTitle(WebElement webElement) { + return webElement.findElement(By.cssSelector("span.h6")).getText(); + } + + public WebElement getGrantByTitle(String title) { + List list = getGrantsList(); + for (int i = 0; i < list.size(); i++) { + if (getGrantTitle(list.get(i)).equals(title)) { + return list.get(i); + } + } + return null; + } + + public Integer getAuthorsCount(WebElement webElement) { + String authors = webElement.findElement(By.className("text-muted")).getText(); + if (!authors.equals("")) { + String[] mas = authors.split(","); + return mas.length; + } + return 0; + } +} diff --git a/src/test/java/paper/PaperPage.java b/src/test/java/paper/PaperPage.java index 9c3c357..908f8a1 100644 --- a/src/test/java/paper/PaperPage.java +++ b/src/test/java/paper/PaperPage.java @@ -2,10 +2,216 @@ package paper; import core.PageObject; import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.Select; + +import java.util.List; public class PaperPage extends PageObject { + @FindBy(id = "title") + private WebElement titleInput; + + @FindBy(id = "sendMessageButton") + private WebElement sendMessageButton; + + @FindBy(id = "id") + private WebElement idInput; + + @FindBy(css = "#messages .alert-danger span") + private WebElement dangerMessage; + + @FindBy(className = "deadline") + private List deadlines; + + @FindBy(className = "deadline-date") + private List deadlineDates; + + @FindBy(className = "deadline-desc") + private List deadlineDescs; + + @FindBy(css = ".alert.alert-danger") + private List dangerAlerts; + + @FindBy(className = "collapse-heading") + private WebElement firstCollapsedLink; + + @FindBy(id = "nav-references-tab") + private WebElement referenceTab; + + @FindBy(id = "nav-latex-tab") + private WebElement latexTab; + + @FindBy(id = "latex-text") + private WebElement latexTextarea; + + @FindBy(id = "addReference") + private WebElement addReferenceButton; + + @FindBy(css = "input.author ") + private WebElement firstAuthorInput; + + @FindBy(css = "input.publicationTitle") + private WebElement firstPublicationTitleInput; + + @FindBy(css = "input.publicationYear") + private WebElement firstPublicationYearInput; + + @FindBy(css = "input.publisher") + private WebElement firstPublisherInput; + + @FindBy(css = "input.pages") + private WebElement firstPagesInput; + + @FindBy(css = "input.journalOrCollectionTitle") + private WebElement firstJournalOrCollectionTitleInput; + + @FindBy(id = "formatBtn") + private WebElement formatButton; + + @FindBy(id = "formattedReferencesArea") + private WebElement formatArea; + + @FindBy(id = "url") + private WebElement urlInput; + + @FindBy(id = "pdfBtn") + private WebElement pdfButton; + + @FindBy(css = "input.author ") + private List authorInputs; + public String getSubTitle() { return driver.findElement(By.tagName("h2")).getText(); } + + public void clickReferenceTab() { + js.executeScript("document.getElementById('nav-references-tab').scrollIntoView(false);"); + referenceTab.click(); + } + + public void clickLatexTab() { + latexTab.click(); + } + + public void showFirstReference() { + waiter.until(ExpectedConditions.elementToBeClickable(firstCollapsedLink)); + firstCollapsedLink.click(); + } + + public void clickAddReferenceButton() { + js.executeScript("arguments[0].click()", addReferenceButton); + } + + public void clickFormatButton() { + formatButton.click(); + } + + public void clickPdfButton() { + pdfButton.click(); + } + + public void setTitle(String title) { + titleInput.clear(); + titleInput.sendKeys(title); + } + + public void setLatexText(String text) { + waiter.until(ExpectedConditions.visibilityOf(latexTextarea)); + latexTextarea.clear(); + latexTextarea.sendKeys(text); + } + + public void setFirstReferenceAuthors(String authors) { + waiter.until(ExpectedConditions.visibilityOf(firstAuthorInput)); + + firstAuthorInput.clear(); + firstAuthorInput.sendKeys(authors); + } + + public void setFirstReferencePublicationTitle(String title) { + firstPublicationTitleInput.clear(); + firstPublicationTitleInput.sendKeys(title); + } + + public void setFirstReferencePublicationYear(String year) { + firstPublicationYearInput.clear(); + firstPublicationYearInput.sendKeys(year); + } + + public void setFirstReferencePublisher(String publisher) { + firstPublisherInput.clear(); + firstPublisherInput.sendKeys(publisher); + } + + public void setFirstReferencePages(String pages) { + firstPagesInput.clear(); + firstPagesInput.sendKeys(pages); + } + + public void setFirstReferenceJournalOrCollectionTitle(String journal) { + firstJournalOrCollectionTitleInput.clear(); + firstJournalOrCollectionTitleInput.sendKeys(journal); + } + + public void setUrl(String url) { + urlInput.clear(); + urlInput.sendKeys(url); + } + + public void setFormatStandardSpringer() { + Select standards = new Select(driver.findElement(By.id("formatStandard"))); + standards.selectByValue("SPRINGER"); + } + + public void setDeadlineDate(Integer deadlineNumber, String date) { + deadlineDates.get(deadlineNumber - 1).sendKeys(date); + } + + public void setDeadlineDescription(Integer deadlineNumber, String desc) { + deadlineDescs.get(deadlineNumber - 1).clear(); + deadlineDescs.get(deadlineNumber - 1).sendKeys(desc); + } + + public boolean hasAlert(String alertMessage) { + return dangerAlerts + .stream() + .anyMatch( + webElement -> webElement.getText().contains(alertMessage)); + } + + public void clickSaveBtn() { + sendMessageButton.click(); + } + + public String getId() { + return idInput.getAttribute("value"); + } + + public String getFormatString() { + waiter.until(ExpectedConditions.attributeToBeNotEmpty(formatArea, "value")); + return formatArea.getAttribute("value"); + } + + public boolean deadlineExist(String desc, String date) { + return deadlines + .stream() + .anyMatch( + webElement -> webElement.findElement(By.className("deadline-desc")).getAttribute("value").equals(desc) + && webElement.findElement(By.className("deadline-date")).getAttribute("value").equals(date)); + } + + public boolean authorsExists(String authors) { + return authorInputs + .stream() + .anyMatch( + webElement -> webElement.getAttribute("value").equals(authors)); + } + + public boolean dangerMessageExist(String message) { + waiter.until(ExpectedConditions.visibilityOf(dangerMessage)); + return dangerMessage.getText().equals(message); + } } diff --git a/src/test/java/paper/PapersDashboardPage.java b/src/test/java/paper/PapersDashboardPage.java index 51d7cb8..4567490 100644 --- a/src/test/java/paper/PapersDashboardPage.java +++ b/src/test/java/paper/PapersDashboardPage.java @@ -2,10 +2,23 @@ package paper; import core.PageObject; import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; + +import java.util.List; public class PapersDashboardPage extends PageObject { + @FindBy(className = "externalLink") + private List externalLinks; public String getSubTitle() { return driver.findElement(By.tagName("h2")).getText(); } + + public boolean externalLinkExists(String link) { + return externalLinks + .stream() + .anyMatch( + webElement -> webElement.getAttribute("href").equals(link)); + } } diff --git a/src/test/java/paper/PapersPage.java b/src/test/java/paper/PapersPage.java index f191d9b..620d0c0 100644 --- a/src/test/java/paper/PapersPage.java +++ b/src/test/java/paper/PapersPage.java @@ -2,10 +2,60 @@ package paper; import core.PageObject; import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.ui.ExpectedConditions; + +import java.util.List; public class PapersPage extends PageObject { + @FindBy(css = ".paper-row .h6") + private List paperTitles; + + @FindBy(className = "paper-row") + private List paperItems; + + @FindBy(className = "remove-paper") + private WebElement removeFirstPaperButton; + + @FindBy(id = "dataConfirmOK") + private WebElement confirmDeleteButton; + + @FindBy(id = "addDeadline") + private WebElement addDeadlineButton; + + @FindBy(css = ".paper-row a:nth-child(2)") + private WebElement firstPaper; public String getSubTitle() { return driver.findElement(By.tagName("h2")).getText(); } + + public void clickFirstPaper() { + firstPaper.click(); + } + + public void clickAddDeadline() { + addDeadlineButton.click(); + } + + public void clickRemoveFirstPaperButton() { + js.executeScript("arguments[0].click()", removeFirstPaperButton); + } + + public void clickConfirmDeleteButton() { + waiter.until(ExpectedConditions.visibilityOf(confirmDeleteButton)); + confirmDeleteButton.click(); + } + + public boolean havePaperWithTitle(String title) { + return paperTitles + .stream() + .anyMatch(webElement -> webElement.getText().equals(title)); + } + + public int getPapersCount() { + return paperItems.size(); + } + } diff --git a/src/test/java/project/ProjectDashboard.java b/src/test/java/project/ProjectDashboard.java new file mode 100644 index 0000000..0b36204 --- /dev/null +++ b/src/test/java/project/ProjectDashboard.java @@ -0,0 +1,11 @@ +package project; + +import core.PageObject; +import org.openqa.selenium.By; + +public class ProjectDashboard extends PageObject { + + public String getSubTitle() { + return driver.findElement(By.tagName("h2")).getText(); + } +} diff --git a/src/test/java/project/ProjectPage.java b/src/test/java/project/ProjectPage.java new file mode 100644 index 0000000..9953177 --- /dev/null +++ b/src/test/java/project/ProjectPage.java @@ -0,0 +1,141 @@ +package project; + +import core.PageObject; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; + +import java.util.List; + +public class ProjectPage extends PageObject { + + public String getSubTitle() { + return driver.findElement(By.tagName("h3")).getText(); + } + + public String getId() { + return driver.findElement(By.id("id")).getAttribute("value"); + } + + public void setName(String name) { + driver.findElement(By.id("title")).sendKeys(name); + } + + public String getName() { + return driver.findElement(By.id("title")).getAttribute("value"); + } + + public void clearName() { + driver.findElement(By.id("title")).clear(); + } + + public void clickSave() { + driver.findElement(By.id("sendMessageButton")).click(); + } + + public void clickAddDeadline() { + driver.findElement(By.id("addDeadline")).click(); + } + + public void addDeadlineDate(String deadDate, Integer deadNum) { + driver.findElement(By.id(String.format("deadlines%d.date", deadNum))).sendKeys(deadDate); + } + + public void addDeadlineDescription(String description) { + driver.findElement(By.id("deadlines0.description")).sendKeys(description); + } + + public void setDeadlineCompletion() { + driver.findElement(By.id("deadlines0.done1")).click(); + } + + public void setStatus() { + driver.findElement(By.id("status")).click(); + getFirstStatus(); + } + + private void getFirstStatus() { + driver.findElement(By.xpath("//*[@id=\"status\"]/option[1]")).click(); + } + + public void addDescription(String description) { + driver.findElement(By.id("description")).sendKeys(description); + } + + public void addLink(String link) { + driver.findElement(By.id("repository")).sendKeys(link); + } + + private List getDeadlineList() { + return driver.findElements(By.className("deadline")); + } + + public Integer getDeadlineCount() { + return driver.findElements(By.className("deadline")).size(); + } + + public void setExecutors() { + driver.findElement(By.id("status")).click(); + getFirstExecutor(); + } + + private void getFirstExecutor() { + driver.findElement(By.xpath("//*[@id=\"status\"]/option[1]")).click(); + } + + public void setDeadlineDescription(String description, Integer i) { + driver.findElement(By.id(String.format("deadlines%d.description", i))).sendKeys(description); + } + + public void setDeadlineDate(String date, Integer i) { + driver.findElement(By.id(String.format("deadlines%d.date", i))).sendKeys(date); + } + + public Boolean isTakePartButDisabledValueTrue() { + return driver.findElement(By.id("take-part")).getAttribute("disabled").equals("true"); + } + + public Integer getMemberCount() { + return driver.findElements(By.className("member")).size(); + } + + public void clickDeleteDeadline() { + driver.findElement(By.className("btn-danger")).click(); + } + + public void showAllowToAttachArticles() { + driver.findElement(By.cssSelector("button[data-id=\"paperIds\"]")).click(); + } + + public void clickAddPaperBut() { + driver.findElement(By.id("add-paper")).click(); + } + + + public List getArticles() { + return driver.findElements(By.className("paper")); + } + + public Integer getArticlesCount() { + return driver.findElements(By.className("paper")).size(); + } + + public WebElement selectArticle() { + WebElement webElement = driver.findElement(By.xpath("//*[@id=\"project-form\"]/div/div[2]/div[5]/div/div/div[2]/ul/li[1]/a")); + webElement.click(); + return webElement; + } + + public void clickUndockArticleBut() { + driver.findElement(By.name("removePaper")).click(); + } + + public boolean checkDeadline(String description, String dateValue) { + return getDeadlineList() + .stream() + .anyMatch(webElement -> { + return webElement.findElement(By.className("deadline-text")).getAttribute("value").equals(description) + && webElement.findElement(By.cssSelector("input[type=\"date\"]")).getAttribute("value").equals(dateValue); + }); + } + +} \ No newline at end of file diff --git a/src/test/java/project/ProjectsPage.java b/src/test/java/project/ProjectsPage.java new file mode 100644 index 0000000..123bc50 --- /dev/null +++ b/src/test/java/project/ProjectsPage.java @@ -0,0 +1,41 @@ +package project; + +import core.PageObject; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; + +import java.util.List; + +public class ProjectsPage extends PageObject { + + public String getSubTitle() { + return driver.findElement(By.tagName("h2")).getText(); + } + + private List getProjectsList() { + return driver.findElements(By.cssSelector("span.h6")); + } + + public void getFirstProject() { + driver.findElement(By.xpath("//*[@id=\"projects\"]/div/div[2]/div[1]/div[1]/div/a")).click(); + } + + public void selectMember() { + driver.findElements(By.className("bootstrap-select")).get(0).findElement(By.className("btn")).click(); + driver.findElements(By.className("bootstrap-select")).get(0).findElements(By.className("dropdown-item")).get(1).click(); + } + + public void deleteFirst() { + js.executeScript("$('a[data-confirm]').click();"); + } + + public void clickConfirm() { + driver.findElement(By.id("dataConfirmOK")).click(); + } + + public boolean checkNameInList(String newProjectName) { + return getProjectsList() + .stream() + .anyMatch(webElement -> webElement.getText().equals(newProjectName)); + } +} \ No newline at end of file diff --git a/src/test/java/ru/ulstu/conference/service/ConferenceServiceTest.java b/src/test/java/ru/ulstu/conference/service/ConferenceServiceTest.java index 95f4820..56756a3 100644 --- a/src/test/java/ru/ulstu/conference/service/ConferenceServiceTest.java +++ b/src/test/java/ru/ulstu/conference/service/ConferenceServiceTest.java @@ -5,8 +5,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; import org.springframework.data.domain.Sort; +import org.springframework.test.context.junit4.SpringRunner; import ru.ulstu.conference.model.Conference; import ru.ulstu.conference.model.ConferenceDto; import ru.ulstu.conference.model.ConferenceFilterDto; @@ -16,7 +16,6 @@ import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.service.DeadlineService; import ru.ulstu.paper.model.Paper; import ru.ulstu.paper.service.PaperService; -import ru.ulstu.ping.model.Ping; import ru.ulstu.ping.service.PingService; import ru.ulstu.timeline.service.EventService; import ru.ulstu.user.model.User; @@ -32,7 +31,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@RunWith(SpringRunner.class) public class ConferenceServiceTest { @Mock @@ -125,7 +124,7 @@ public class ConferenceServiceTest { @Test public void getExistConferenceById() { - when(conferenceRepository.findOne(ID)).thenReturn(conferenceWithId); + when(conferenceRepository.getOne(ID)).thenReturn(conferenceWithId); when(paperService.findAllNotSelect(new ArrayList<>())).thenReturn(papers); when(userService.getCurrentUser()).thenReturn(user); @@ -186,8 +185,8 @@ public class ConferenceServiceTest { @Test public void delete() { - when(conferenceRepository.exists(ID)).thenReturn(true); - when(conferenceRepository.findOne(ID)).thenReturn(conferenceWithId); + when(conferenceRepository.existsById(ID)).thenReturn(true); + when(conferenceRepository.getOne(ID)).thenReturn(conferenceWithId); assertTrue(conferenceService.delete(ID)); } @@ -276,14 +275,4 @@ public class ConferenceServiceTest { assertTrue(conferenceService.isAttachedToConference(ID)); } - - @Test - public void ping() throws IOException { - Ping ping = new Ping(); - when(conferenceRepository.findOne(ID)).thenReturn(conferenceWithId); - when(pingService.addPing(conferenceWithId)).thenReturn(ping); - when(conferenceRepository.updatePingConference(ID)).thenReturn(INDEX); - - assertEquals(ping, conferenceService.ping(conferenceDto)); - } } \ No newline at end of file diff --git a/src/test/java/ru/ulstu/grant/service/GrantServiceTest.java b/src/test/java/ru/ulstu/grant/service/GrantServiceTest.java new file mode 100644 index 0000000..c8df288 --- /dev/null +++ b/src/test/java/ru/ulstu/grant/service/GrantServiceTest.java @@ -0,0 +1,223 @@ +package ru.ulstu.grant.service; + +import org.apache.commons.lang3.StringUtils; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.test.context.junit4.SpringRunner; +import ru.ulstu.deadline.model.Deadline; +import ru.ulstu.deadline.service.DeadlineService; +import ru.ulstu.grant.model.Grant; +import ru.ulstu.grant.model.GrantDto; +import ru.ulstu.grant.repository.GrantRepository; +import ru.ulstu.paper.model.Paper; +import ru.ulstu.paper.model.PaperDto; +import ru.ulstu.paper.service.PaperService; +import ru.ulstu.timeline.service.EventService; +import ru.ulstu.user.model.User; +import ru.ulstu.user.service.UserService; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.when; + +@RunWith(SpringRunner.class) +public class GrantServiceTest { + + @Mock + GrantRepository grantRepository; + + @Mock + DeadlineService deadlineService; + + @Mock + PaperService paperService; + + @Mock + UserService userService; + + @Mock + EventService eventService; + + @Mock + GrantNotificationService grantNotificationService; + + @InjectMocks + GrantService grantService; + + private final static Integer ID = 1; + private final static Integer INDEX = 0; + private final static String TITLE = "Title"; + private final static String COMMENT = "Comment"; + private final static boolean TRUE = true; + private final static Integer YEAR = 2019; + private final static Integer MAX_DISPLAY_SIZE = 50; + + private List grants; + private List deadlines; + private List paperDtos; + private GrantDto grantDto; + private Deadline deadline; + private User leader; + + private Grant grantWithId; + + + @Before + public void setUp() throws Exception { + grants = new ArrayList<>(); + paperDtos = new ArrayList<>(); + grantWithId = new Grant(); + + deadlines = new ArrayList<>(); + deadline = new Deadline(new Date(), COMMENT); + deadline.setId(ID); + deadlines.add(deadline); + + leader = Mockito.mock(User.class); + + List papers = new ArrayList<>(); + Paper paperWithId = new Paper(); + paperWithId.setId(ID); + paperWithId.setTitle(TITLE); + papers.add(paperWithId); + PaperDto paperDto = new PaperDto(paperWithId); + paperDtos.add(paperDto); + + Set authors = new HashSet<>(); + User author = leader; + authors.add(author); + + grantWithId.setId(ID); + grantWithId.setTitle(TITLE); + grantWithId.setComment(COMMENT); + grantWithId.setDeadlines(deadlines); + grantWithId.setLeader(leader); + grantWithId.setPapers(papers); + grantWithId.setAuthors(authors); + + grants.add(grantWithId); + grantDto = new GrantDto(grantWithId); + } + + @Test + public void getExistGrantById() { + when(grantRepository.getOne(ID)).thenReturn(grantWithId); + + GrantDto newGrantDto = new GrantDto(grantWithId); + GrantDto result = grantService.getExistGrantById(ID); + + assertEquals(newGrantDto.getId(), result.getId()); + } + + @Test + public void findAll() { + when(grantRepository.findAll()).thenReturn(grants); + + assertEquals(Collections.singletonList(grantWithId), grantService.findAll()); + } + + @Test + public void create() throws IOException { + when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines); + when(userService.getUserByLogin("admin")).thenReturn(leader); + when(grantRepository.save(new Grant())).thenReturn(grantWithId); + + Grant newGrant = new Grant(); + newGrant.setId(ID); + newGrant.setTitle(TITLE); + newGrant.setComment(COMMENT); + newGrant.setDeadlines(deadlines); + newGrant.setLeader(leader); + + assertEquals(newGrant, grantService.create(grantDto)); + } + + @Test + public void getGrantStatuses() { + assertEquals(Arrays.asList(Grant.GrantStatus.values()), grantService.getGrantStatuses()); + } + + @Test + public void getGrantPapers() { + when(paperService.findAllSelect(Collections.singletonList(ID))).thenReturn(paperDtos); + + assertEquals(paperDtos, grantService.getGrantPapers(Collections.singletonList(ID))); + } + + @Test + public void getAllUncompletedPapers() { + when(paperService.findAllNotCompleted()).thenReturn(paperDtos); + paperDtos.stream() + .forEach(paperDto -> { + paperDto.setTitle(StringUtils.abbreviate(paperDto.getTitle(), MAX_DISPLAY_SIZE)); + }); + + assertEquals(paperDtos, grantService.getAllUncompletedPapers()); + } + + @Test + public void delete() throws IOException { + when(grantRepository.getOne(ID)).thenReturn(grantWithId); + assertTrue(grantService.delete(grantWithId.getId())); + } + + @Test + public void removeDeadline() { + GrantDto newGrantDto = new GrantDto(); + newGrantDto.getRemovedDeadlineIds().add(ID); + grantDto.getDeadlines().add(deadline); + GrantDto result = grantService.removeDeadline(grantDto, INDEX); + + assertEquals(newGrantDto.getRemovedDeadlineIds(), result.getRemovedDeadlineIds()); + } + + @Test + public void findById() { + when(grantRepository.getOne(ID)).thenReturn(grantWithId); + Grant findGrant = grantService.findById(ID); + + assertEquals(grantWithId.getId(), findGrant.getId()); + } + + @Test + public void attachPaper() { + when(grantRepository.getOne(ID)).thenReturn(grantWithId); + when(paperService.findAllSelect(Collections.singletonList(ID))).thenReturn(paperDtos); + GrantDto newGrantDto = new GrantDto(grantWithId); + + if (!newGrantDto.getPaperIds().isEmpty()) { + newGrantDto.getPapers().clear(); + newGrantDto.setPapers(paperDtos); + } else { + newGrantDto.getPapers().clear(); + } + + assertEquals(newGrantDto.getPapers(), grantService.attachPaper(grantDto)); + } + + @Test + public void filterEmptyDeadlines() { + when(grantRepository.getOne(ID)).thenReturn(grantWithId); + GrantDto newGrantDto = new GrantDto(grantWithId); + + newGrantDto.setDeadlines(newGrantDto.getDeadlines().stream() + .filter(dto -> dto.getDate() != null || !StringUtils.isEmpty(dto.getDescription())) + .collect(Collectors.toList())); + + assertEquals(newGrantDto.getDeadlines(), grantService.filterEmptyDeadlines(grantDto)); + } +} \ No newline at end of file diff --git a/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java b/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java new file mode 100644 index 0000000..f46971c --- /dev/null +++ b/src/test/java/ru/ulstu/project/service/ProjectServiceTest.java @@ -0,0 +1,149 @@ +package ru.ulstu.project.service; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.springframework.test.context.junit4.SpringRunner; +import ru.ulstu.deadline.model.Deadline; +import ru.ulstu.deadline.service.DeadlineService; +import ru.ulstu.file.model.FileData; +import ru.ulstu.file.service.FileService; +import ru.ulstu.grant.model.GrantDto; +import ru.ulstu.grant.service.GrantService; +import ru.ulstu.project.model.Project; +import ru.ulstu.project.model.ProjectDto; +import ru.ulstu.project.repository.ProjectRepository; +import ru.ulstu.timeline.service.EventService; +import ru.ulstu.user.model.User; +import ru.ulstu.user.service.UserService; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +import static junit.framework.TestCase.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.when; + +@RunWith(SpringRunner.class) +public class ProjectServiceTest { + + @Mock + ProjectRepository projectRepository; + + @Mock + DeadlineService deadlineService; + + @Mock + EventService eventService; + + @Mock + FileService fileService; + + @Mock + UserService userService; + + @Mock + GrantService grantService; + + @InjectMocks + ProjectService projectService; + + private final static String TITLE = "title"; + private final static String DESCR = "descr"; + private final static Integer ID = 1; + private final static Integer INDEX = 0; + private final static String NAME = "name"; + + private List projects; + private Project project; + private ProjectDto projectDto; + private Deadline deadline; + private List deadlines; + private FileData file; + private List files; + private User user; + + @Before + public void setUp() throws Exception { + projects = new ArrayList<>(); + project = new Project(); + + projects.add(project); + projectDto = new ProjectDto(project); + + deadlines = new ArrayList<>(); + deadline = new Deadline(new Date(), DESCR); + deadline.setId(ID); + deadlines.add(deadline); + + user = new User(); + user.setFirstName(NAME); + + List grants = new ArrayList<>(); + GrantDto grant = new GrantDto(); + grant.setId(ID); + grants.add(grant); + } + + @Test + public void findAll() { + when(projectRepository.findAll()).thenReturn(projects); + assertEquals(projects, projectService.findAll()); + } + + @Test + public void create() throws IOException { + when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines); + when(projectRepository.save(new Project())).thenReturn(project); + eventService.createFromObject(new Project(), Collections.emptyList(), false, "проекта"); + + projectDto.setTitle(TITLE); + projectDto.setDeadlines(deadlines); + + project.setId(ID); + project.setTitle(TITLE); + project.setDescription(DESCR); + project.setDeadlines(deadlines); + project.setFiles(files); + + assertEquals(project.getId(), (projectService.create(projectDto)).getId()); + } + + @Test + public void delete() throws IOException { + when(projectRepository.existsById(ID)).thenReturn(true); + when(projectRepository.getOne(ID)).thenReturn(project); + + assertTrue(projectService.delete(ID)); + } + + @Test + public void getProjectExecutors() { + List executors = Collections.singletonList(user); + when(userService.findAll()).thenReturn(executors); + + assertEquals(executors, projectService.getProjectExecutors(projectDto)); + } + + @Test + public void findById() { + when(projectRepository.getOne(ID)).thenReturn(project); + assertEquals(project, projectService.findById(ID)); + } + + @Test + public void removeDeadline() throws IOException { + ProjectDto newProjectDto = new ProjectDto(); + newProjectDto.getRemovedDeadlineIds().add(INDEX); + projectDto.getDeadlines().add(deadline); + ProjectDto result = projectService.removeDeadline(projectDto, INDEX); + + assertEquals(newProjectDto.getDeadlines(), result.getDeadlines()); + assertEquals(newProjectDto.getRemovedDeadlineIds(), result.getRemovedDeadlineIds()); + } +} \ No newline at end of file diff --git a/src/test/java/ru/ulstu/students/service/TaskServiceTest.java b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java index 8edfc77..97b9990 100644 --- a/src/test/java/ru/ulstu/students/service/TaskServiceTest.java +++ b/src/test/java/ru/ulstu/students/service/TaskServiceTest.java @@ -5,8 +5,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; import org.springframework.data.domain.Sort; +import org.springframework.test.context.junit4.SpringRunner; import ru.ulstu.core.util.DateUtils; import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.service.DeadlineService; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@RunWith(SpringRunner.class) public class TaskServiceTest { @Mock @@ -113,7 +113,6 @@ public class TaskServiceTest { @Test public void findAll() { - when(taskRepository.findAll(SORT)).thenReturn(tasks); assertEquals(Collections.singletonList(task), taskService.findAll()); } @@ -136,7 +135,7 @@ public class TaskServiceTest { when(tagService.saveOrCreate(new ArrayList<>())).thenReturn(tags); when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines); when(taskRepository.save(new Task())).thenReturn(task); - eventService.createFromTask(new Task()); + eventService.createFromObject(new Task(), Collections.emptyList(), true, "задачи"); taskDto.setTags(tags); taskDto.setDeadlines(deadlines); @@ -153,8 +152,8 @@ public class TaskServiceTest { @Test public void delete() throws IOException { - when(taskRepository.exists(ID)).thenReturn(true); - when(taskRepository.findOne(ID)).thenReturn(task); + when(taskRepository.existsById(ID)).thenReturn(true); + when(taskRepository.getOne(ID)).thenReturn(task); when(schedulerRepository.findOneByTask(task)).thenReturn(null); assertTrue(taskService.delete(ID)); diff --git a/src/test/java/students/TaskPage.java b/src/test/java/students/TaskPage.java index c0105b2..e6a1e0d 100644 --- a/src/test/java/students/TaskPage.java +++ b/src/test/java/students/TaskPage.java @@ -46,7 +46,7 @@ public class TaskPage extends PageObject { driver.findElement(By.cssSelector("#addDeadline")).click(); } - public List getDeadlines() { + private List getDeadlines() { return driver.findElements(By.cssSelector(".form-group:nth-of-type(5) .row")); } diff --git a/src/test/java/students/TasksPage.java b/src/test/java/students/TasksPage.java index 5c5d42c..9769cca 100644 --- a/src/test/java/students/TasksPage.java +++ b/src/test/java/students/TasksPage.java @@ -17,7 +17,7 @@ public class TasksPage extends PageObject { return driver.findElements(By.cssSelector("span.h6")); } - public List getTaskRows() { + private List getTaskRows() { return driver.findElements(By.className("task-row")); }