Repeat tasks after completion (#587)

Fix integration tests Add updating start and end date from current date Add updating reminders from current date Add updating reminders from current date Add updating due date from current date Add updating flag Add tests Add field to repeat a task after current date Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/587
2020-06-14 11:04:38 +00:00
parent 3ba26ce67e
commit 47d7e713af
4 changed files with 213 additions and 42 deletions
--- a/pkg/models/tasks_test.go
+++ b/pkg/models/tasks_test.go
@ -248,6 +248,89 @@ func TestUpdateDone(t *testing.T) {
 			expected := int64(oldTask.DueDate) + oldTask.RepeatAfter
 			assert.Equal(t, timeutil.TimeStamp(expected), newTask.DueDate)
 		})
+		t.Run("repeat from current date", func(t *testing.T) {
+			t.Run("due date", func(t *testing.T) {
+				oldTask := &Task{
+					Done:                  false,
+					RepeatAfter:           8600,
+					RepeatFromCurrentDate: true,
+					DueDate:               timeutil.TimeStamp(1550000000),
+				}
+				newTask := &Task{
+					Done: true,
+				}
+				updateDone(oldTask, newTask)
+
+				assert.Equal(t, timeutil.FromTime(time.Now().Add(time.Duration(oldTask.RepeatAfter)*time.Second)), newTask.DueDate)
+			})
+			t.Run("reminders", func(t *testing.T) {
+				oldTask := &Task{
+					Done:                  false,
+					RepeatAfter:           8600,
+					RepeatFromCurrentDate: true,
+					Reminders: []timeutil.TimeStamp{
+						1550000000,
+						1555000000,
+					},
+				}
+				newTask := &Task{
+					Done: true,
+				}
+				updateDone(oldTask, newTask)
+
+				diff := time.Duration(oldTask.Reminders[1]-oldTask.Reminders[0]) * time.Second
+
+				assert.Len(t, newTask.Reminders, 2)
+				assert.Equal(t, timeutil.FromTime(time.Now().Add(time.Duration(oldTask.RepeatAfter)*time.Second)), newTask.Reminders[0])
+				assert.Equal(t, timeutil.FromTime(time.Now().Add(diff+time.Duration(oldTask.RepeatAfter)*time.Second)), newTask.Reminders[1])
+			})
+			t.Run("start date", func(t *testing.T) {
+				oldTask := &Task{
+					Done:                  false,
+					RepeatAfter:           8600,
+					RepeatFromCurrentDate: true,
+					StartDate:             timeutil.TimeStamp(1550000000),
+				}
+				newTask := &Task{
+					Done: true,
+				}
+				updateDone(oldTask, newTask)
+
+				assert.Equal(t, timeutil.FromTime(time.Now().Add(time.Duration(oldTask.RepeatAfter)*time.Second)), newTask.StartDate)
+			})
+			t.Run("end date", func(t *testing.T) {
+				oldTask := &Task{
+					Done:                  false,
+					RepeatAfter:           8600,
+					RepeatFromCurrentDate: true,
+					EndDate:               timeutil.TimeStamp(1560000000),
+				}
+				newTask := &Task{
+					Done: true,
+				}
+				updateDone(oldTask, newTask)
+
+				assert.Equal(t, timeutil.FromTime(time.Now().Add(time.Duration(oldTask.RepeatAfter)*time.Second)), newTask.EndDate)
+			})
+			t.Run("start and end date", func(t *testing.T) {
+				oldTask := &Task{
+					Done:                  false,
+					RepeatAfter:           8600,
+					RepeatFromCurrentDate: true,
+					StartDate:             timeutil.TimeStamp(1550000000),
+					EndDate:               timeutil.TimeStamp(1560000000),
+				}
+				newTask := &Task{
+					Done: true,
+				}
+				updateDone(oldTask, newTask)
+
+				diff := time.Duration(oldTask.EndDate-oldTask.StartDate) * time.Second
+
+				assert.Equal(t, timeutil.FromTime(time.Now().Add(time.Duration(oldTask.RepeatAfter)*time.Second)), newTask.StartDate)
+				assert.Equal(t, timeutil.FromTime(time.Now().Add(diff+time.Duration(oldTask.RepeatAfter)*time.Second)), newTask.EndDate)
+			})
+		})
 	})
 }