|
|
|
@ -20,8 +20,8 @@ import java.util.Date;
|
|
|
|
|
import java.util.HashSet;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Set;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
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.paper.model.Paper.PaperStatus.ATTENTION;
|
|
|
|
@ -67,7 +67,7 @@ public class PaperService {
|
|
|
|
|
return findAllDto()
|
|
|
|
|
.stream()
|
|
|
|
|
.filter(paper -> paper.getStatus() != COMPLETED && paper.getStatus() != FAILED)
|
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
.collect(toList());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public PaperDto findOneDto(Integer id) {
|
|
|
|
@ -90,7 +90,9 @@ public class PaperService {
|
|
|
|
|
paper.setTitle(paperDto.getTitle());
|
|
|
|
|
paper.setUpdateDate(new Date());
|
|
|
|
|
paper.setDeadlines(deadlineService.saveOrCreate(paperDto.getDeadlines()));
|
|
|
|
|
paper.setFiles(fileService.saveOrCreate(paperDto.getFiles().stream().filter(f -> !f.isDeleted()).collect(Collectors.toList())));
|
|
|
|
|
paper.setFiles(fileService.saveOrCreate(paperDto.getFiles().stream()
|
|
|
|
|
.filter(f -> !f.isDeleted())
|
|
|
|
|
.collect(toList())));
|
|
|
|
|
paper.getAuthors().clear();
|
|
|
|
|
if (paperDto.getAuthorIds() != null && !paperDto.getAuthorIds().isEmpty()) {
|
|
|
|
|
paperDto.getAuthorIds().forEach(authorIds -> paper.getAuthors().add(userService.findById(authorIds)));
|
|
|
|
@ -104,7 +106,9 @@ public class PaperService {
|
|
|
|
|
Paper.PaperStatus oldStatus = paper.getStatus();
|
|
|
|
|
Set<User> oldAuthors = new HashSet<>(paper.getAuthors());
|
|
|
|
|
|
|
|
|
|
for (FileDataDto file : paperDto.getFiles().stream().filter(f -> f.isDeleted() && f.getId() != null).collect(Collectors.toList())) {
|
|
|
|
|
for (FileDataDto file : paperDto.getFiles().stream()
|
|
|
|
|
.filter(f -> f.isDeleted() && f.getId() != null)
|
|
|
|
|
.collect(toList())) {
|
|
|
|
|
fileService.delete(file.getId());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -164,7 +168,7 @@ public class PaperService {
|
|
|
|
|
return statusCompareResult;
|
|
|
|
|
}
|
|
|
|
|
return paper1.getTitle().compareTo(paper2.getTitle());
|
|
|
|
|
}).collect(Collectors.toList());
|
|
|
|
|
}).collect(toList());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public PaperDto findPaper(int id) {
|
|
|
|
@ -178,7 +182,7 @@ public class PaperService {
|
|
|
|
|
&& (paper.getStatus() == ON_PREPARATION
|
|
|
|
|
|| paper.getStatus() == DRAFT
|
|
|
|
|
|| paper.getStatus() == ATTENTION))
|
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
.collect(toList());
|
|
|
|
|
papers.forEach(paper -> {
|
|
|
|
|
Paper.PaperStatus oldStatus = paper.getStatus();
|
|
|
|
|
paper.setStatus(Paper.PaperStatus.FAILED);
|
|
|
|
|