|
|
@ -5,10 +5,13 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.thymeleaf.util.StringUtils;
|
|
|
|
import org.thymeleaf.util.StringUtils;
|
|
|
|
import ru.ulstu.deadline.service.DeadlineService;
|
|
|
|
import ru.ulstu.deadline.service.DeadlineService;
|
|
|
|
import ru.ulstu.file.service.FileService;
|
|
|
|
import ru.ulstu.file.service.FileService;
|
|
|
|
|
|
|
|
import ru.ulstu.grant.model.GrantDto;
|
|
|
|
import ru.ulstu.grant.repository.GrantRepository;
|
|
|
|
import ru.ulstu.grant.repository.GrantRepository;
|
|
|
|
import ru.ulstu.project.model.Project;
|
|
|
|
import ru.ulstu.project.model.Project;
|
|
|
|
import ru.ulstu.project.model.ProjectDto;
|
|
|
|
import ru.ulstu.project.model.ProjectDto;
|
|
|
|
import ru.ulstu.project.repository.ProjectRepository;
|
|
|
|
import ru.ulstu.project.repository.ProjectRepository;
|
|
|
|
|
|
|
|
import ru.ulstu.user.model.User;
|
|
|
|
|
|
|
|
import ru.ulstu.user.service.UserService;
|
|
|
|
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.util.Arrays;
|
|
|
|
import java.util.Arrays;
|
|
|
@ -26,15 +29,18 @@ public class ProjectService {
|
|
|
|
private final DeadlineService deadlineService;
|
|
|
|
private final DeadlineService deadlineService;
|
|
|
|
private final GrantRepository grantRepository;
|
|
|
|
private final GrantRepository grantRepository;
|
|
|
|
private final FileService fileService;
|
|
|
|
private final FileService fileService;
|
|
|
|
|
|
|
|
private final UserService userService;
|
|
|
|
|
|
|
|
|
|
|
|
public ProjectService(ProjectRepository projectRepository,
|
|
|
|
public ProjectService(ProjectRepository projectRepository,
|
|
|
|
DeadlineService deadlineService,
|
|
|
|
DeadlineService deadlineService,
|
|
|
|
GrantRepository grantRepository,
|
|
|
|
GrantRepository grantRepository,
|
|
|
|
FileService fileService) {
|
|
|
|
FileService fileService,
|
|
|
|
|
|
|
|
UserService userService) {
|
|
|
|
this.projectRepository = projectRepository;
|
|
|
|
this.projectRepository = projectRepository;
|
|
|
|
this.deadlineService = deadlineService;
|
|
|
|
this.deadlineService = deadlineService;
|
|
|
|
this.grantRepository = grantRepository;
|
|
|
|
this.grantRepository = grantRepository;
|
|
|
|
this.fileService = fileService;
|
|
|
|
this.fileService = fileService;
|
|
|
|
|
|
|
|
this.userService = userService;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public List<Project> findAll() {
|
|
|
|
public List<Project> findAll() {
|
|
|
@ -115,4 +121,9 @@ public class ProjectService {
|
|
|
|
return projectRepository.findOne(id);
|
|
|
|
return projectRepository.findOne(id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public List<User> getProjectExecutors(ProjectDto projectDto) {
|
|
|
|
|
|
|
|
List<User> filteredUsers = userService.filterByAgeAndDegree(projectDto.isHasAge(), projectDto.isHasDegree());
|
|
|
|
|
|
|
|
return filteredUsers;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|