romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

WIP: Try vue #244

Closed
romanov73 wants to merge 49 commits from try-vue into dev
pull from: try-vue
merge into: romanov73:dev
Conversation 17 Commits 49 Files Changed 227 +5 -2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c966a100da - Show all commits

7
src/main/java/ru/ulstu/paper/service/PaperService.java
View File

@ -54,6 +54,9 @@ public class PaperService extends AbstractActivityService<Paper, PaperDto, Paper
private final EventService eventService; private final EventService eventService;
private final PingService pingService; private final PingService pingService;
private Paper.PaperStatus oldStatus;
private Set<User> oldAuthors;
public PaperService(PaperRepository paperRepository, public PaperService(PaperRepository paperRepository,
FileService fileService, FileService fileService,
PaperNotificationService paperNotificationService, PaperNotificationService paperNotificationService,
@ -99,8 +102,6 @@ public class PaperService extends AbstractActivityService<Paper, PaperDto, Paper
@Transactional @Transactional
public Paper update(Paper paper) { public Paper update(Paper paper) {
Paper.PaperStatus oldStatus = paper.getStatus();
Set<User> oldAuthors = new HashSet<>(paper.getAuthors());
paperRepository.save(paper); paperRepository.save(paper);
paperNotificationService.sendCreateNotification(paper, oldAuthors); paperNotificationService.sendCreateNotification(paper, oldAuthors);
paperNotificationService.statusChangeNotification(paper, oldStatus); paperNotificationService.statusChangeNotification(paper, oldStatus);
@ -116,6 +117,8 @@ public class PaperService extends AbstractActivityService<Paper, PaperDto, Paper
public PaperDto update(PaperDto paperDto) { public PaperDto update(PaperDto paperDto) {
Paper paper = paperRepository.findById(paperDto.getId()) Paper paper = paperRepository.findById(paperDto.getId())
.orElseThrow(() -> new EntityNotFoundException("Paper with id=" + paperDto.getId() + " not found")); .orElseThrow(() -> new EntityNotFoundException("Paper with id=" + paperDto.getId() + " not found"));
oldStatus = paper.getStatus();
oldAuthors = new HashSet<>(paper.getAuthors());
//TODO: move to service //TODO: move to service
if (paperDto.getFiles() != null) { if (paperDto.getFiles() != null) {