|
|
@ -5,6 +5,8 @@ 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.Grant;
|
|
|
|
|
|
|
|
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;
|
|
|
@ -62,6 +64,16 @@ public class ProjectService {
|
|
|
|
return newProject;
|
|
|
|
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());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
projectRepository.save(copyFromDto(project, projectDto));
|
|
|
|
|
|
|
|
return project;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private Project copyFromDto(Project project, ProjectDto projectDto) throws IOException {
|
|
|
|
private Project copyFromDto(Project project, ProjectDto projectDto) throws IOException {
|
|
|
|
project.setDescription(projectDto.getDescription());
|
|
|
|
project.setDescription(projectDto.getDescription());
|
|
|
|
project.setStatus(projectDto.getStatus() == null ? APPLICATION : projectDto.getStatus());
|
|
|
|
project.setStatus(projectDto.getStatus() == null ? APPLICATION : projectDto.getStatus());
|
|
|
@ -85,10 +97,6 @@ public class ProjectService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private Project update(ProjectDto projectDto) {
|
|
|
|
|
|
|
|
throw new RuntimeException("not implemented yet");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Project findById(Integer id) {
|
|
|
|
public Project findById(Integer id) {
|
|
|
|
return projectRepository.findOne(id);
|
|
|
|
return projectRepository.findOne(id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|