|
|
@ -103,17 +103,13 @@ public class PaperService {
|
|
|
|
@Transactional
|
|
|
|
@Transactional
|
|
|
|
public Integer create(PaperDto paperDto) throws IOException {
|
|
|
|
public Integer create(PaperDto paperDto) throws IOException {
|
|
|
|
Paper newPaper = copyFromDto(new Paper(), paperDto);
|
|
|
|
Paper newPaper = copyFromDto(new Paper(), paperDto);
|
|
|
|
newPaper = paperRepository.save(newPaper);
|
|
|
|
return create(newPaper).getId();
|
|
|
|
paperNotificationService.sendCreateNotification(newPaper);
|
|
|
|
|
|
|
|
eventService.createFromPaper(newPaper);
|
|
|
|
|
|
|
|
return newPaper.getId();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Transactional
|
|
|
|
@Transactional
|
|
|
|
public Paper create(Paper paper) {
|
|
|
|
public Paper create(Paper paper) {
|
|
|
|
Paper newPaper = paperRepository.save(paper);
|
|
|
|
Paper newPaper = paperRepository.save(paper);
|
|
|
|
paperNotificationService.sendCreateNotification(newPaper);
|
|
|
|
paperNotificationService.sendCreateNotification(newPaper);
|
|
|
|
eventService.createFromPaper(newPaper);
|
|
|
|
|
|
|
|
return newPaper;
|
|
|
|
return newPaper;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -206,6 +202,26 @@ public class PaperService {
|
|
|
|
return paper.getId();
|
|
|
|
return paper.getId();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Transactional
|
|
|
|
|
|
|
|
public Integer update(Paper newPaper) {
|
|
|
|
|
|
|
|
Paper oldPaper = paperRepository.getOne(newPaper.getId());
|
|
|
|
|
|
|
|
Paper.PaperStatus oldStatus = oldPaper.getStatus();
|
|
|
|
|
|
|
|
Set<User> oldAuthors = new HashSet<>(oldPaper.getAuthors());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
newPaper = paperRepository.save(newPaper);
|
|
|
|
|
|
|
|
for (User author : newPaper.getAuthors()) {
|
|
|
|
|
|
|
|
if (!oldAuthors.contains(author)) {
|
|
|
|
|
|
|
|
paperNotificationService.sendCreateNotification(newPaper);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (newPaper.getStatus() != oldStatus) {
|
|
|
|
|
|
|
|
paperNotificationService.statusChangeNotification(newPaper, oldStatus);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return newPaper.getId();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Transactional
|
|
|
|
@Transactional
|
|
|
|
public void delete(Integer paperId) {
|
|
|
|
public void delete(Integer paperId) {
|
|
|
|
Paper paper = paperRepository.getOne(paperId);
|
|
|
|
Paper paper = paperRepository.getOne(paperId);
|
|
|
@ -292,6 +308,14 @@ public class PaperService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void save(Paper paper) {
|
|
|
|
|
|
|
|
if (isEmpty(paper.getId())) {
|
|
|
|
|
|
|
|
create(paper);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
update(paper);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public PaperDto findById(Integer paperId) {
|
|
|
|
public PaperDto findById(Integer paperId) {
|
|
|
|
return new PaperDto(paperRepository.getOne(paperId));
|
|
|
|
return new PaperDto(paperRepository.getOne(paperId));
|
|
|
|
}
|
|
|
|
}
|
|
|
|