create api for activities
parent
7c0a8be51b
commit
119f5a52ab
@ -1,7 +1,7 @@
|
||||
package ru.ulstu.name;
|
||||
package ru.ulstu.activity.api;
|
||||
|
||||
import org.springframework.data.repository.query.Param;
|
||||
|
||||
public interface BaseRepository {
|
||||
public interface ActivityRepository {
|
||||
String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
|
||||
}
|
@ -0,0 +1,4 @@
|
||||
package ru.ulstu.activity.api.model;
|
||||
|
||||
public interface ActivityDashboardDto {
|
||||
}
|
@ -0,0 +1,4 @@
|
||||
package ru.ulstu.activity.api.model;
|
||||
|
||||
public interface ActivityDto {
|
||||
}
|
@ -0,0 +1,19 @@
|
||||
package ru.ulstu.activity.api.model;
|
||||
|
||||
public abstract class ActivityListDto {
|
||||
private final Integer id;
|
||||
private final String title;
|
||||
|
||||
protected ActivityListDto(Integer id, String title) {
|
||||
this.id = id;
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
}
|
@ -1,12 +1,12 @@
|
||||
package ru.ulstu.utils.timetable;
|
||||
package ru.ulstu.activity.boundary.timetable;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.springframework.web.client.RestClientException;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
import ru.ulstu.activity.boundary.timetable.errors.TimetableClientException;
|
||||
import ru.ulstu.activity.boundary.timetable.model.Lesson;
|
||||
import ru.ulstu.activity.boundary.timetable.model.TimetableResponse;
|
||||
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;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.utils.timetable.errors;
|
||||
package ru.ulstu.activity.boundary.timetable.errors;
|
||||
|
||||
public class TimetableClientException extends RuntimeException {
|
||||
public TimetableClientException(String message) {
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.utils.timetable.model;
|
||||
package ru.ulstu.activity.boundary.timetable.model;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.utils.timetable.model;
|
||||
package ru.ulstu.activity.boundary.timetable.model;
|
||||
|
||||
public class Lesson {
|
||||
private String group;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.utils.timetable.model;
|
||||
package ru.ulstu.activity.boundary.timetable.model;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.utils.timetable.model;
|
||||
package ru.ulstu.activity.boundary.timetable.model;
|
||||
|
||||
public class TimetableResponse {
|
||||
private Response response;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.utils.timetable.model;
|
||||
package ru.ulstu.activity.boundary.timetable.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
@ -1,7 +1,7 @@
|
||||
package ru.ulstu.core.model;
|
||||
package ru.ulstu.activity.common.model;
|
||||
|
||||
import ru.ulstu.deadline.model.Deadline;
|
||||
import ru.ulstu.timeline.model.Event;
|
||||
import ru.ulstu.activity.deadline.model.Deadline;
|
||||
import ru.ulstu.activity.timeline.model.Event;
|
||||
import ru.ulstu.user.model.User;
|
||||
|
||||
import java.util.List;
|
@ -1,21 +1,21 @@
|
||||
package ru.ulstu.strategy.api;
|
||||
package ru.ulstu.activity.common.strategy.api;
|
||||
|
||||
import ru.ulstu.core.model.UserActivity;
|
||||
import ru.ulstu.activity.common.model.AbstractActivity;
|
||||
import ru.ulstu.user.model.User;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public abstract class EntityCreateStrategy<T extends UserActivity> {
|
||||
public abstract class EntityCreateStrategy<T extends AbstractActivity> {
|
||||
protected abstract List<T> getActiveEntities();
|
||||
|
||||
protected abstract void createEntity(User user);
|
||||
|
||||
private void createDefaultEntityIfNeed(List<User> allUsers, List<? extends UserActivity> entities) {
|
||||
private void createDefaultEntityIfNeed(List<User> allUsers, List<? extends AbstractActivity> entities) {
|
||||
allUsers.forEach(user -> {
|
||||
if (entities
|
||||
.stream()
|
||||
.filter(entity -> entity.getActivityUsers().contains(user))
|
||||
.filter(entity -> entity.getActivityMembers().contains(user))
|
||||
.collect(Collectors.toSet()).isEmpty()) {
|
||||
createEntity(user);
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.strategy.api;
|
||||
package ru.ulstu.activity.common.strategy.api;
|
||||
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Service;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.conference.model;
|
||||
package ru.ulstu.activity.conference.model;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -0,0 +1,21 @@
|
||||
package ru.ulstu.activity.conference.model;
|
||||
|
||||
import ru.ulstu.activity.api.model.ActivityListDto;
|
||||
import ru.ulstu.activity.common.model.ScienceGroupMemberDto;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
import static ru.ulstu.core.util.StreamApiUtils.convert;
|
||||
|
||||
public class ConferenceListDto extends ActivityListDto {
|
||||
private final Set<ScienceGroupMemberDto> members;
|
||||
|
||||
public ConferenceListDto(Conference conference) {
|
||||
super(conference.getId(), conference.getTitle());
|
||||
this.members = convert(conference.getActivityMembers(), ScienceGroupMemberDto::new);
|
||||
}
|
||||
|
||||
public Set<ScienceGroupMemberDto> getAuthors() {
|
||||
return members;
|
||||
}
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.conference.model;
|
||||
package ru.ulstu.activity.conference.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
@ -1,17 +1,17 @@
|
||||
package ru.ulstu.conference.repository;
|
||||
package ru.ulstu.activity.conference.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Modifying;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import ru.ulstu.conference.model.Conference;
|
||||
import ru.ulstu.name.BaseRepository;
|
||||
import ru.ulstu.activity.api.ActivityRepository;
|
||||
import ru.ulstu.activity.conference.model.Conference;
|
||||
import ru.ulstu.user.model.User;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
public interface ConferenceRepository extends JpaRepository<Conference, Integer>, BaseRepository {
|
||||
public interface ConferenceRepository extends JpaRepository<Conference, Integer>, ActivityRepository {
|
||||
@Query("SELECT c FROM Conference c LEFT JOIN c.users u WHERE (:user IS NULL OR u.user = :user) " +
|
||||
"AND (YEAR(c.beginDate) = :year OR :year IS NULL) ORDER BY begin_date DESC")
|
||||
List<Conference> findByUserAndYear(@Param("user") User user, @Param("year") Integer year);
|
@ -1,7 +1,7 @@
|
||||
package ru.ulstu.conference.repository;
|
||||
package ru.ulstu.activity.conference.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import ru.ulstu.conference.model.ConferenceUser;
|
||||
import ru.ulstu.activity.conference.model.ConferenceUser;
|
||||
|
||||
public interface ConferenceUserRepository extends JpaRepository<ConferenceUser, Integer> {
|
||||
}
|
@ -1,10 +1,10 @@
|
||||
package ru.ulstu.conference.service;
|
||||
package ru.ulstu.activity.conference.service;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.ulstu.conference.model.Conference;
|
||||
import ru.ulstu.activity.conference.model.Conference;
|
||||
import ru.ulstu.activity.ping.service.PingService;
|
||||
import ru.ulstu.core.util.DateUtils;
|
||||
import ru.ulstu.ping.service.PingService;
|
||||
import ru.ulstu.user.service.MailService;
|
||||
import ru.ulstu.user.service.UserService;
|
||||
|
@ -1,9 +1,9 @@
|
||||
package ru.ulstu.conference.service;
|
||||
package ru.ulstu.activity.conference.service;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import ru.ulstu.conference.model.ConferenceUser;
|
||||
import ru.ulstu.conference.repository.ConferenceUserRepository;
|
||||
import ru.ulstu.activity.conference.model.ConferenceUser;
|
||||
import ru.ulstu.activity.conference.repository.ConferenceUserRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.deadline.model;
|
||||
package ru.ulstu.activity.deadline.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
@ -1,10 +1,10 @@
|
||||
package ru.ulstu.deadline.repository;
|
||||
package ru.ulstu.activity.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 ru.ulstu.activity.deadline.model.Deadline;
|
||||
|
||||
import java.util.Date;
|
||||
|
@ -1,9 +1,9 @@
|
||||
package ru.ulstu.deadline.service;
|
||||
package ru.ulstu.activity.deadline.service;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import ru.ulstu.deadline.model.Deadline;
|
||||
import ru.ulstu.deadline.repository.DeadlineRepository;
|
||||
import ru.ulstu.activity.deadline.model.Deadline;
|
||||
import ru.ulstu.activity.deadline.repository.DeadlineRepository;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.file.model;
|
||||
package ru.ulstu.activity.file.model;
|
||||
|
||||
import ru.ulstu.core.model.BaseEntity;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.file.model;
|
||||
package ru.ulstu.activity.file.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
@ -1,7 +1,7 @@
|
||||
package ru.ulstu.file.repostory;
|
||||
package ru.ulstu.activity.file.repostory;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import ru.ulstu.file.model.FileData;
|
||||
import ru.ulstu.activity.file.model.FileData;
|
||||
|
||||
public interface FileRepository extends JpaRepository<FileData, Integer> {
|
||||
}
|
@ -1,12 +1,12 @@
|
||||
package ru.ulstu.file.service;
|
||||
package ru.ulstu.activity.file.service;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import ru.ulstu.file.model.FileData;
|
||||
import ru.ulstu.file.model.FileDataDto;
|
||||
import ru.ulstu.file.repostory.FileRepository;
|
||||
import ru.ulstu.paper.model.PaperDto;
|
||||
import ru.ulstu.activity.file.model.FileData;
|
||||
import ru.ulstu.activity.file.model.FileDataDto;
|
||||
import ru.ulstu.activity.file.repostory.FileRepository;
|
||||
import ru.ulstu.activity.paper.model.PaperDto;
|
||||
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.File;
|
@ -1,10 +1,10 @@
|
||||
package ru.ulstu.grant.controller;
|
||||
package ru.ulstu.activity.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.activity.grant.service.GrantService;
|
||||
import ru.ulstu.configuration.Constants;
|
||||
import ru.ulstu.grant.service.GrantService;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.text.ParseException;
|
@ -0,0 +1,28 @@
|
||||
package ru.ulstu.activity.grant.model;
|
||||
|
||||
import ru.ulstu.activity.api.model.ActivityListDto;
|
||||
import ru.ulstu.activity.common.model.ScienceGroupMemberDto;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
import static ru.ulstu.core.util.StreamApiUtils.convert;
|
||||
|
||||
public class GrantListDto extends ActivityListDto {
|
||||
|
||||
private final Grant.GrantStatus status;
|
||||
private final Set<ScienceGroupMemberDto> members;
|
||||
|
||||
public GrantListDto(Grant grant) {
|
||||
super(grant.getId(), grant.getTitle());
|
||||
this.status = grant.getStatus();
|
||||
this.members = convert(grant.getActivityMembers(), ScienceGroupMemberDto::new);
|
||||
}
|
||||
|
||||
public Grant.GrantStatus getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public Set<ScienceGroupMemberDto> getAuthors() {
|
||||
return members;
|
||||
}
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.grant.page;
|
||||
package ru.ulstu.activity.grant.page;
|
||||
|
||||
import com.gargoylesoftware.htmlunit.html.DomNode;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlElement;
|
@ -1,14 +1,14 @@
|
||||
package ru.ulstu.grant.repository;
|
||||
package ru.ulstu.activity.grant.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import ru.ulstu.grant.model.Grant;
|
||||
import ru.ulstu.name.BaseRepository;
|
||||
import ru.ulstu.activity.api.ActivityRepository;
|
||||
import ru.ulstu.activity.grant.model.Grant;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface GrantRepository extends JpaRepository<Grant, Integer>, BaseRepository {
|
||||
public interface GrantRepository extends JpaRepository<Grant, Integer>, ActivityRepository {
|
||||
|
||||
List<Grant> findByStatus(Grant.GrantStatus status);
|
||||
|
@ -1,9 +1,9 @@
|
||||
package ru.ulstu.grant.service;
|
||||
package ru.ulstu.activity.grant.service;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.ulstu.activity.grant.model.Grant;
|
||||
import ru.ulstu.core.util.DateUtils;
|
||||
import ru.ulstu.grant.model.Grant;
|
||||
import ru.ulstu.user.model.User;
|
||||
import ru.ulstu.user.service.MailService;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.grant.service;
|
||||
package ru.ulstu.activity.grant.service;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
@ -1,12 +1,12 @@
|
||||
package ru.ulstu.grant.service;
|
||||
package ru.ulstu.activity.grant.service;
|
||||
|
||||
import com.gargoylesoftware.htmlunit.WebClient;
|
||||
import com.gargoylesoftware.htmlunit.html.DomNode;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.ulstu.activity.grant.model.GrantDto;
|
||||
import ru.ulstu.activity.grant.page.KiasPage;
|
||||
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;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.paper.model;
|
||||
package ru.ulstu.activity.paper.model;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,13 @@
|
||||
package ru.ulstu.paper.model;
|
||||
package ru.ulstu.activity.paper.model;
|
||||
|
||||
import ru.ulstu.boundary.model.ScienceGroupMemberDto;
|
||||
import ru.ulstu.activity.api.model.ActivityDashboardDto;
|
||||
import ru.ulstu.activity.common.model.ScienceGroupMemberDto;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
import static ru.ulstu.core.util.StreamApiUtils.convert;
|
||||
|
||||
public class PaperDashboardDto {
|
||||
public class PaperDashboardDto implements ActivityDashboardDto {
|
||||
|
||||
private Integer id;
|
||||
private String title;
|
@ -1,11 +1,11 @@
|
||||
package ru.ulstu.paper.model;
|
||||
package ru.ulstu.activity.paper.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import ru.ulstu.boundary.model.ActivityDto;
|
||||
import ru.ulstu.boundary.model.ScienceGroupMemberDto;
|
||||
import ru.ulstu.deadline.model.Deadline;
|
||||
import ru.ulstu.file.model.FileDataDto;
|
||||
import ru.ulstu.activity.api.model.ActivityDto;
|
||||
import ru.ulstu.activity.common.model.ScienceGroupMemberDto;
|
||||
import ru.ulstu.activity.deadline.model.Deadline;
|
||||
import ru.ulstu.activity.file.model.FileDataDto;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.Size;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.paper.model;
|
||||
package ru.ulstu.activity.paper.model;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -0,0 +1,27 @@
|
||||
package ru.ulstu.activity.paper.model;
|
||||
|
||||
import ru.ulstu.activity.api.model.ActivityListDto;
|
||||
import ru.ulstu.activity.common.model.ScienceGroupMemberDto;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
import static ru.ulstu.core.util.StreamApiUtils.convert;
|
||||
|
||||
public class PaperListDto extends ActivityListDto {
|
||||
private final Paper.PaperStatus status;
|
||||
private final Set<ScienceGroupMemberDto> authors;
|
||||
|
||||
public PaperListDto(Paper paper) {
|
||||
super(paper.getId(), paper.getTitle());
|
||||
this.status = paper.getStatus();
|
||||
this.authors = convert(paper.getAuthors(), ScienceGroupMemberDto::new);
|
||||
}
|
||||
|
||||
public Paper.PaperStatus getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public Set<ScienceGroupMemberDto> getAuthors() {
|
||||
return authors;
|
||||
}
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.paper.model;
|
||||
package ru.ulstu.activity.paper.model;
|
||||
|
||||
public class PaperStatusDto {
|
||||
private final String id;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.paper.model;
|
||||
package ru.ulstu.activity.paper.model;
|
||||
|
||||
public class PaperTypeDto {
|
||||
private final String id;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.paper.model;
|
||||
package ru.ulstu.activity.paper.model;
|
||||
|
||||
import ru.ulstu.core.model.BaseEntity;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.paper.model;
|
||||
package ru.ulstu.activity.paper.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
@ -1,11 +1,11 @@
|
||||
package ru.ulstu.paper.repository;
|
||||
package ru.ulstu.activity.paper.repository;
|
||||
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import ru.ulstu.activity.paper.model.Paper;
|
||||
import ru.ulstu.core.repository.JpaDetachableRepository;
|
||||
import ru.ulstu.paper.model.Paper;
|
||||
import ru.ulstu.user.model.User;
|
||||
|
||||
import java.util.List;
|
@ -1,8 +1,8 @@
|
||||
package ru.ulstu.paper.repository;
|
||||
package ru.ulstu.activity.paper.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import ru.ulstu.paper.model.Reference;
|
||||
import ru.ulstu.activity.paper.model.Reference;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -1,8 +1,8 @@
|
||||
package ru.ulstu.paper.service;
|
||||
package ru.ulstu.activity.paper.service;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.ulstu.file.service.FileService;
|
||||
import ru.ulstu.paper.model.PaperDto;
|
||||
import ru.ulstu.activity.file.service.FileService;
|
||||
import ru.ulstu.activity.paper.model.PaperDto;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
@ -1,9 +1,9 @@
|
||||
package ru.ulstu.paper.service;
|
||||
package ru.ulstu.activity.paper.service;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.ulstu.activity.common.strategy.api.EntityCreateStrategy;
|
||||
import ru.ulstu.activity.paper.model.Paper;
|
||||
import ru.ulstu.core.util.DateUtils;
|
||||
import ru.ulstu.paper.model.Paper;
|
||||
import ru.ulstu.strategy.api.EntityCreateStrategy;
|
||||
import ru.ulstu.user.model.User;
|
||||
|
||||
import java.util.Date;
|
@ -1,10 +1,10 @@
|
||||
package ru.ulstu.paper.service;
|
||||
package ru.ulstu.activity.paper.service;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.ulstu.activity.paper.model.Paper;
|
||||
import ru.ulstu.core.model.response.PageableItems;
|
||||
import ru.ulstu.core.util.DateUtils;
|
||||
import ru.ulstu.paper.model.Paper;
|
||||
import ru.ulstu.user.model.User;
|
||||
import ru.ulstu.user.service.MailService;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.paper.service;
|
||||
package ru.ulstu.activity.paper.service;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.ping.model;
|
||||
package ru.ulstu.activity.ping.model;
|
||||
|
||||
import ru.ulstu.user.model.User;
|
||||
|
@ -1,10 +1,10 @@
|
||||
package ru.ulstu.ping.repository;
|
||||
package ru.ulstu.activity.ping.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import ru.ulstu.conference.model.Conference;
|
||||
import ru.ulstu.ping.model.Ping;
|
||||
import ru.ulstu.activity.conference.model.Conference;
|
||||
import ru.ulstu.activity.ping.model.Ping;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
@ -1,11 +1,11 @@
|
||||
package ru.ulstu.project.model;
|
||||
package ru.ulstu.activity.project.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
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.activity.deadline.model.Deadline;
|
||||
import ru.ulstu.activity.file.model.FileDataDto;
|
||||
import ru.ulstu.activity.grant.model.GrantDto;
|
||||
import ru.ulstu.user.model.User;
|
||||
import ru.ulstu.user.model.UserDto;
|
||||
|
@ -1,7 +1,7 @@
|
||||
package ru.ulstu.project.repository;
|
||||
package ru.ulstu.activity.project.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import ru.ulstu.project.model.Project;
|
||||
import ru.ulstu.activity.project.model.Project;
|
||||
|
||||
public interface ProjectRepository extends JpaRepository<Project, Integer> {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.students.controller;
|
||||
package ru.ulstu.activity.students.controller;
|
||||
|
||||
import org.springframework.validation.Errors;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.students.model;
|
||||
package ru.ulstu.activity.students.model;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import ru.ulstu.core.model.BaseEntity;
|
@ -1,12 +1,12 @@
|
||||
package ru.ulstu.students.model;
|
||||
package ru.ulstu.activity.students.model;
|
||||
|
||||
import org.hibernate.annotations.Fetch;
|
||||
import org.hibernate.annotations.FetchMode;
|
||||
import ru.ulstu.activity.common.model.EventSource;
|
||||
import ru.ulstu.activity.deadline.model.Deadline;
|
||||
import ru.ulstu.activity.tags.model.Tag;
|
||||
import ru.ulstu.activity.timeline.model.Event;
|
||||
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;
|
@ -1,10 +1,10 @@
|
||||
package ru.ulstu.students.model;
|
||||
package ru.ulstu.activity.students.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import ru.ulstu.deadline.model.Deadline;
|
||||
import ru.ulstu.tags.model.Tag;
|
||||
import ru.ulstu.activity.deadline.model.Deadline;
|
||||
import ru.ulstu.activity.tags.model.Tag;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import java.util.ArrayList;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.students.model;
|
||||
package ru.ulstu.activity.students.model;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -1,8 +1,8 @@
|
||||
package ru.ulstu.students.repository;
|
||||
package ru.ulstu.activity.students.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import ru.ulstu.students.model.Scheduler;
|
||||
import ru.ulstu.students.model.Task;
|
||||
import ru.ulstu.activity.students.model.Scheduler;
|
||||
import ru.ulstu.activity.students.model.Task;
|
||||
|
||||
public interface SchedulerRepository extends JpaRepository<Scheduler, Integer> {
|
||||
|
@ -1,10 +1,10 @@
|
||||
package ru.ulstu.students.repository;
|
||||
package ru.ulstu.activity.students.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.students.model.Task;
|
||||
import ru.ulstu.tags.model.Tag;
|
||||
import ru.ulstu.activity.students.model.Task;
|
||||
import ru.ulstu.activity.tags.model.Tag;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
@ -1,11 +1,11 @@
|
||||
package ru.ulstu.students.service;
|
||||
package ru.ulstu.activity.students.service;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import ru.ulstu.students.model.Scheduler;
|
||||
import ru.ulstu.students.model.Task;
|
||||
import ru.ulstu.students.repository.SchedulerRepository;
|
||||
import ru.ulstu.tags.model.Tag;
|
||||
import ru.ulstu.activity.students.model.Scheduler;
|
||||
import ru.ulstu.activity.students.model.Task;
|
||||
import ru.ulstu.activity.students.repository.SchedulerRepository;
|
||||
import ru.ulstu.activity.tags.model.Tag;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.students.service;
|
||||
package ru.ulstu.activity.students.service;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.tags.model;
|
||||
package ru.ulstu.activity.tags.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
@ -1,9 +1,9 @@
|
||||
package ru.ulstu.tags.repository;
|
||||
package ru.ulstu.activity.tags.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.tags.model.Tag;
|
||||
import ru.ulstu.activity.tags.model.Tag;
|
||||
|
||||
public interface TagRepository extends JpaRepository<Tag, Integer> {
|
||||
|
@ -1,8 +1,8 @@
|
||||
package ru.ulstu.tags.service;
|
||||
package ru.ulstu.activity.tags.service;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.ulstu.tags.model.Tag;
|
||||
import ru.ulstu.tags.repository.TagRepository;
|
||||
import ru.ulstu.activity.tags.model.Tag;
|
||||
import ru.ulstu.activity.tags.repository.TagRepository;
|
||||
|
||||
import javax.transaction.Transactional;
|
||||
import java.util.List;
|
@ -1,11 +1,11 @@
|
||||
package ru.ulstu.timeline.model;
|
||||
package ru.ulstu.activity.timeline.model;
|
||||
|
||||
import ru.ulstu.conference.model.Conference;
|
||||
import ru.ulstu.activity.conference.model.Conference;
|
||||
import ru.ulstu.activity.grant.model.Grant;
|
||||
import ru.ulstu.activity.paper.model.Paper;
|
||||
import ru.ulstu.activity.project.model.Project;
|
||||
import ru.ulstu.activity.students.model.Task;
|
||||
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;
|
||||
|
||||
import javax.persistence.CascadeType;
|
@ -1,12 +1,12 @@
|
||||
package ru.ulstu.timeline.model;
|
||||
package ru.ulstu.activity.timeline.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
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.activity.conference.model.ConferenceDto;
|
||||
import ru.ulstu.activity.grant.model.GrantDto;
|
||||
import ru.ulstu.activity.paper.model.PaperDto;
|
||||
import ru.ulstu.activity.project.model.ProjectDto;
|
||||
import ru.ulstu.activity.students.model.TaskDto;
|
||||
import ru.ulstu.user.model.UserDto;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.timeline.model;
|
||||
package ru.ulstu.activity.timeline.model;
|
||||
|
||||
import java.time.Period;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.timeline.model;
|
||||
package ru.ulstu.activity.timeline.model;
|
||||
|
||||
import ru.ulstu.core.model.BaseEntity;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package ru.ulstu.timeline.model;
|
||||
package ru.ulstu.activity.timeline.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
@ -1,13 +1,13 @@
|
||||
package ru.ulstu.timeline.repository;
|
||||
package ru.ulstu.activity.timeline.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
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;
|
||||
import ru.ulstu.activity.conference.model.Conference;
|
||||
import ru.ulstu.activity.grant.model.Grant;
|
||||
import ru.ulstu.activity.paper.model.Paper;
|
||||
import ru.ulstu.activity.project.model.Project;
|
||||
import ru.ulstu.activity.students.model.Task;
|
||||
import ru.ulstu.activity.timeline.model.Event;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -1,7 +1,7 @@
|
||||
package ru.ulstu.timeline.repository;
|
||||
package ru.ulstu.activity.timeline.repository;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import ru.ulstu.timeline.model.Timeline;
|
||||
import ru.ulstu.activity.timeline.model.Timeline;
|
||||
|
||||
public interface TimelineRepository extends JpaRepository<Timeline, Integer> {
|
||||
}
|
@ -1,13 +1,13 @@
|
||||
package ru.ulstu.timeline.service;
|
||||
package ru.ulstu.activity.timeline.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.activity.timeline.model.Event;
|
||||
import ru.ulstu.activity.timeline.model.PeriodEvent;
|
||||
import ru.ulstu.core.util.DateUtils;
|
||||
import ru.ulstu.timeline.model.Event;
|
||||
import ru.ulstu.timeline.model.PeriodEvent;
|
||||
import ru.ulstu.user.service.MailService;
|
||||
|
||||
import java.util.Date;
|
@ -1,20 +1,20 @@
|
||||
package ru.ulstu.timeline.service;
|
||||
package ru.ulstu.activity.timeline.service;
|
||||
|
||||
import org.apache.commons.lang3.time.DateUtils;
|
||||
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;
|
||||
import ru.ulstu.timeline.model.Timeline;
|
||||
import ru.ulstu.timeline.repository.EventRepository;
|
||||
import ru.ulstu.activity.common.model.EventSource;
|
||||
import ru.ulstu.activity.conference.model.Conference;
|
||||
import ru.ulstu.activity.deadline.model.Deadline;
|
||||
import ru.ulstu.activity.grant.model.Grant;
|
||||
import ru.ulstu.activity.paper.model.Paper;
|
||||
import ru.ulstu.activity.project.model.Project;
|
||||
import ru.ulstu.activity.students.model.Task;
|
||||
import ru.ulstu.activity.timeline.model.Event;
|
||||
import ru.ulstu.activity.timeline.model.EventDto;
|
||||
import ru.ulstu.activity.timeline.model.Timeline;
|
||||
import ru.ulstu.activity.timeline.repository.EventRepository;
|
||||
import ru.ulstu.user.model.UserDto;
|
||||
import ru.ulstu.user.service.UserService;
|
||||
|
@ -1,11 +1,11 @@
|
||||
package ru.ulstu.timeline.service;
|
||||
package ru.ulstu.activity.timeline.service;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import ru.ulstu.timeline.model.EventDto;
|
||||
import ru.ulstu.timeline.model.Timeline;
|
||||
import ru.ulstu.timeline.model.TimelineDto;
|
||||
import ru.ulstu.timeline.repository.TimelineRepository;
|
||||
import ru.ulstu.activity.timeline.model.EventDto;
|
||||
import ru.ulstu.activity.timeline.model.Timeline;
|
||||
import ru.ulstu.activity.timeline.model.TimelineDto;
|
||||
import ru.ulstu.activity.timeline.repository.TimelineRepository;
|
||||
|
||||
import java.util.List;
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue