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

Resolve "Список периодических событий" #129

Merged
romanov73 merged 57 commits from 4-show-time-line into master 2018-10-30 23:32:01 +04:00
Conversation 18 Commits 57 Files Changed 121 +10 -11
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 450cb92d01 - Show all commits

21
src/main/java/ru/ulstu/paper/service/DeadlineScheduler.java
View File

@ -25,33 +25,32 @@ public class DeadlineScheduler {
this.paperRepository = paperRepository; this.paperRepository = paperRepository;
this.mailService = mailService; this.mailService = mailService;
} }
private final static boolean IS_DEADLINE_NOTIFICATION_BEFORE_WEEK = true;
@Scheduled(cron = "0 0 8 * 1 ?") @Scheduled(cron = "0 0 8 * 1 ?")
public void checkDeadlineBeforeWeek() { public void checkDeadlineBeforeWeek() {
log.debug("DeadlineScheduler.checkDeadlineBeforeWeek started"); log.debug("DeadlineScheduler.checkDeadlineBeforeWeek started");
List<Paper> allPapers = paperRepository.findAll(); sendNotifications(IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
for (Paper paper : allPapers) {
Calendar c = Calendar.getInstance();
c.add(Calendar.DAY_OF_YEAR, 7);
if (c.getTime().compareTo(paper.getDeadlineDate()) < 0) {
sendMessageDeadline(paper);
}
}
log.debug("DeadlineScheduler.checkDeadlineBeforeWeek finished"); log.debug("DeadlineScheduler.checkDeadlineBeforeWeek finished");
} }
@Scheduled(cron = "0 0 8 * * ?") @Scheduled(cron = "0 0 8 * * ?")
public void checkDeadlineAfterWeek() { public void checkDeadlineAfterWeek() {
log.debug("DeadlineScheduler.checkDeadlineAfterWeek started"); log.debug("DeadlineScheduler.checkDeadlineAfterWeek started");
sendNotifications(!IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
log.debug("DeadlineScheduler.checkDeadlineAfterWeek finished");
}
private void sendNotifications(boolean isDeadlineBeforeWeek) {
List<Paper> allPapers = paperRepository.findAll(); List<Paper> allPapers = paperRepository.findAll();
for (Paper paper : allPapers) { for (Paper paper : allPapers) {
Calendar c = Calendar.getInstance(); Calendar c = Calendar.getInstance();
c.add(Calendar.DAY_OF_YEAR, 7); c.add(Calendar.DAY_OF_YEAR, 7);
if (c.getTime().compareTo(paper.getDeadlineDate()) >= 0) { if (((c.getTime().compareTo(paper.getDeadlineDate()) < 0) && isDeadlineBeforeWeek) ||
sendMessageDeadline(paper); (c.getTime().compareTo(paper.getDeadlineDate()) >= 0) && !isDeadlineBeforeWeek) {
sendMessageDeadline(paper);
} }
} }
log.debug("DeadlineScheduler.checkDeadlineAfterWeek finished");
} }
private void sendMessageDeadline(Paper paper){ private void sendMessageDeadline(Paper paper){