|
|
@ -9,6 +9,7 @@ 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.timeline.service.EventService;
|
|
|
|
import ru.ulstu.user.model.User;
|
|
|
|
import ru.ulstu.user.model.User;
|
|
|
|
import ru.ulstu.user.service.UserService;
|
|
|
|
import ru.ulstu.user.service.UserService;
|
|
|
|
|
|
|
|
|
|
|
@ -28,17 +29,20 @@ 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 EventService eventService;
|
|
|
|
private final UserService userService;
|
|
|
|
private final UserService userService;
|
|
|
|
|
|
|
|
|
|
|
|
public ProjectService(ProjectRepository projectRepository,
|
|
|
|
public ProjectService(ProjectRepository projectRepository,
|
|
|
|
DeadlineService deadlineService,
|
|
|
|
DeadlineService deadlineService,
|
|
|
|
GrantRepository grantRepository,
|
|
|
|
GrantRepository grantRepository,
|
|
|
|
FileService fileService,
|
|
|
|
FileService fileService,
|
|
|
|
|
|
|
|
EventService eventService,
|
|
|
|
UserService userService) {
|
|
|
|
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.eventService = eventService;
|
|
|
|
this.userService = userService;
|
|
|
|
this.userService = userService;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -64,6 +68,7 @@ public class ProjectService {
|
|
|
|
public Project create(ProjectDto projectDto) throws IOException {
|
|
|
|
public Project create(ProjectDto projectDto) throws IOException {
|
|
|
|
Project newProject = copyFromDto(new Project(), projectDto);
|
|
|
|
Project newProject = copyFromDto(new Project(), projectDto);
|
|
|
|
newProject = projectRepository.save(newProject);
|
|
|
|
newProject = projectRepository.save(newProject);
|
|
|
|
|
|
|
|
eventService.createFromProject(newProject);
|
|
|
|
return newProject;
|
|
|
|
return newProject;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -74,6 +79,7 @@ public class ProjectService {
|
|
|
|
fileService.deleteFile(project.getApplication());
|
|
|
|
fileService.deleteFile(project.getApplication());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
projectRepository.save(copyFromDto(project, projectDto));
|
|
|
|
projectRepository.save(copyFromDto(project, projectDto));
|
|
|
|
|
|
|
|
eventService.updateProjectDeadlines(project);
|
|
|
|
return project;
|
|
|
|
return project;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|