notify if paper deadline in future

6 years ago · 6314ca6ec5
parent 6adc96761b
commit 6314ca6ec5
1 changed files with 2 additions and 1 deletions
--- a/src/main/java/ru/ulstu/paper/service/PaperNotificationService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperNotificationService.java
@ -31,7 +31,8 @@ public class PaperNotificationService {
    private boolean needToSendDeadlineNotification(Paper paper, Date compareDate, boolean isDeadlineBeforeWeek) {
        return (paper.getDeadlineDate() != null)
                && (compareDate.after(paper.getDeadlineDate()) && isDeadlineBeforeWeek
-                || compareDate.before(paper.getDeadlineDate()) && !isDeadlineBeforeWeek);
+                || compareDate.before(paper.getDeadlineDate()) && !isDeadlineBeforeWeek)
+                && paper.getDeadlineDate().after(new Date());
    }

    private void sendMessageDeadline(Paper paper) {