From 6bdc1fdb0d6e0d798e200653be942269e58fe4b9 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 31 Jan 2021 12:54:15 +0100 Subject: [PATCH] Only send reminders for undone tasks --- pkg/db/fixtures/task_reminders.yml | 4 ++++ pkg/models/task_reminder.go | 2 ++ 2 files changed, 6 insertions(+) diff --git a/pkg/db/fixtures/task_reminders.yml b/pkg/db/fixtures/task_reminders.yml index b04e355b3e..b3c158fbcc 100644 --- a/pkg/db/fixtures/task_reminders.yml +++ b/pkg/db/fixtures/task_reminders.yml @@ -6,3 +6,7 @@ task_id: 27 reminder: 2018-12-01 01:13:44 created: 2018-12-01 01:12:04 +- id: 3 + task_id: 2 + reminder: 2018-12-01 01:13:44 + created: 2018-12-01 01:12:04 diff --git a/pkg/models/task_reminder.go b/pkg/models/task_reminder.go index c1a43086e0..cf31065525 100644 --- a/pkg/models/task_reminder.go +++ b/pkg/models/task_reminder.go @@ -106,7 +106,9 @@ func getTasksWithRemindersInTheNextMinute(s *xorm.Session, now time.Time) (taskI reminders := []*TaskReminder{} err = s. + Join("INNER", "tasks", "tasks.id = task_reminders.task_id"). Where("reminder >= ? and reminder < ?", now.Format(dbFormat), nextMinute.Format(dbFormat)). + And("tasks.done = false"). Find(&reminders) if err != nil { return