From 8674b6437e9475483bf5e2452c6172bec42d0ed1 Mon Sep 17 00:00:00 2001 From: ce72 Date: Tue, 7 Mar 2023 23:45:09 +0100 Subject: [PATCH] fix: store reminder_period and reminder_to --- pkg/models/tasks.go | 6 +++++- pkg/models/tasks_test.go | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/models/tasks.go b/pkg/models/tasks.go index 0713a5cf8fc..8e429c50caa 100644 --- a/pkg/models/tasks.go +++ b/pkg/models/tasks.go @@ -1548,7 +1548,11 @@ func (t *Task) updateReminders(s *xorm.Session, reminders []*TaskReminder, dueDa // Loop through all reminders and add them for _, r := range reminderMap { - taskReminder := &TaskReminder{TaskID: t.ID, Reminder: r.Reminder} + taskReminder := &TaskReminder{ + TaskID: t.ID, + Reminder: r.Reminder, + RelativePeriod: r.RelativePeriod, + RelativeTo: r.RelativeTo} _, err = s.Insert(taskReminder) t.Reminders = append(t.Reminders, taskReminder) t.ReminderDates = append(t.ReminderDates, taskReminder.Reminder) diff --git a/pkg/models/tasks_test.go b/pkg/models/tasks_test.go index 84f9df6a5db..84b7a79cb88 100644 --- a/pkg/models/tasks_test.go +++ b/pkg/models/tasks_test.go @@ -102,6 +102,8 @@ func TestTask_Create(t *testing.T) { err := task.Create(s, usr) assert.NoError(t, err) assert.Equal(t, time.Date(2023, time.March, 7, 22, 5, 1, 0, time.Local), task.Reminders[0].Reminder) + assert.Equal(t, int64(1), task.Reminders[0].RelativePeriod) + assert.Equal(t, ReminderDueDate, task.Reminders[0].RelativeTo) assert.Equal(t, time.Date(2023, time.March, 7, 22, 5, 8, 0, time.Local), task.Reminders[1].Reminder) assert.Equal(t, time.Date(2023, time.March, 7, 22, 5, 19, 0, time.Local), task.Reminders[2].Reminder) assert.Equal(t, time.Date(2023, time.March, 7, 23, 0, 0, 0, time.Local), task.Reminders[3].Reminder) @@ -439,6 +441,8 @@ func TestTask_Update(t *testing.T) { err := task.Update(s, u) assert.NoError(t, err) assert.Equal(t, time.Date(2023, time.March, 7, 22, 5, 1, 0, time.Local), task.Reminders[0].Reminder) + assert.Equal(t, int64(1), task.Reminders[0].RelativePeriod) + assert.Equal(t, ReminderDueDate, task.Reminders[0].RelativeTo) assert.Equal(t, time.Date(2023, time.March, 7, 22, 5, 8, 0, time.Local), task.Reminders[1].Reminder) assert.Equal(t, time.Date(2023, time.March, 7, 22, 5, 19, 0, time.Local), task.Reminders[2].Reminder) assert.Equal(t, time.Date(2023, time.March, 7, 23, 0, 0, 0, time.Local), task.Reminders[3].Reminder)