From 960258a8c22a1ee03bbd0d939486aefbf14ae776 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 5 Jul 2020 20:49:29 +0200
Subject: [PATCH] Fix parsing todoist reminder dates

(cherry picked from commit 78791f31a41990b9b391b93a57b609c455969265)
---
 pkg/modules/migration/todoist/todoist.go      | 12 +++++++++--
 pkg/modules/migration/todoist/todoist_test.go | 20 +++++++++----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkg/modules/migration/todoist/todoist.go b/pkg/modules/migration/todoist/todoist.go
index a506d71b..c1d53ec7 100644
--- a/pkg/modules/migration/todoist/todoist.go
+++ b/pkg/modules/migration/todoist/todoist.go
@@ -283,7 +283,7 @@ func convertTodoistToVikunja(sync *sync) (fullVikunjaHierachie []*models.Namespa
 
 		// Put the due date together
 		if i.Due != nil {
-			dueDate, err := time.Parse("2006-01-02T15:04:05Z", i.Due.Date)
+			dueDate, err := time.Parse("2006-01-02", i.Due.Date)
 			if err != nil {
 				return nil, err
 			}
@@ -368,7 +368,15 @@ func convertTodoistToVikunja(sync *sync) (fullVikunjaHierachie []*models.Namespa
 			continue
 		}
 
-		date, err := time.Parse("2006-01-02", r.Due.Date)
+		var err error
+		var date time.Time
+		date, err = time.Parse("2006-01-02T15:04:05Z", r.Due.Date)
+		if err != nil {
+			date, err = time.Parse("2006-01-02T15:04:05", r.Due.Date)
+		}
+		if err != nil {
+			date, err = time.Parse("2006-01-02", r.Due.Date)
+		}
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/modules/migration/todoist/todoist_test.go b/pkg/modules/migration/todoist/todoist_test.go
index 84ac36f2..0d2c7cbc 100644
--- a/pkg/modules/migration/todoist/todoist_test.go
+++ b/pkg/modules/migration/todoist/todoist_test.go
@@ -274,7 +274,7 @@ func TestConvertTodoistToVikunja(t *testing.T) {
 				ID:     103001,
 				ItemID: 400000000,
 				Due: &dueDate{
-					Date:        "2020-06-16",
+					Date:        "2020-06-16T07:00:00",
 					IsRecurring: false,
 				},
 			},
@@ -282,7 +282,7 @@ func TestConvertTodoistToVikunja(t *testing.T) {
 				ID:     103002,
 				ItemID: 400000002,
 				Due: &dueDate{
-					Date:        "2020-07-15",
+					Date:        "2020-07-15T07:00:00Z",
 					IsRecurring: true,
 				},
 			},
@@ -290,7 +290,7 @@ func TestConvertTodoistToVikunja(t *testing.T) {
 				ID:     103003,
 				ItemID: 400000003,
 				Due: &dueDate{
-					Date:        "2020-06-15",
+					Date:        "2020-06-15T07:00:00",
 					IsRecurring: false,
 				},
 			},
@@ -298,7 +298,7 @@ func TestConvertTodoistToVikunja(t *testing.T) {
 				ID:     103004,
 				ItemID: 400000005,
 				Due: &dueDate{
-					Date:        "2020-06-15",
+					Date:        "2020-06-15T07:00:00",
 					IsRecurring: false,
 				},
 			},
@@ -306,7 +306,7 @@ func TestConvertTodoistToVikunja(t *testing.T) {
 				ID:     103006,
 				ItemID: 400000009,
 				Due: &dueDate{
-					Date:        "2020-06-15",
+					Date:        "2020-06-15T07:00:00",
 					IsRecurring: false,
 				},
 			},
@@ -350,7 +350,7 @@ func TestConvertTodoistToVikunja(t *testing.T) {
 							Created:     time1,
 							Reminders: []time.Time{
 								time.Date(2020, time.June, 15, 0, 0, 0, 0, time.UTC).In(config.GetTimeZone()),
-								time.Date(2020, time.June, 16, 0, 0, 0, 0, time.UTC).In(config.GetTimeZone()),
+								time.Date(2020, time.June, 16, 7, 0, 0, 0, time.UTC).In(config.GetTimeZone()),
 							},
 						},
 						{
@@ -364,7 +364,7 @@ func TestConvertTodoistToVikunja(t *testing.T) {
 							Done:    false,
 							Created: time1,
 							Reminders: []time.Time{
-								time.Date(2020, time.July, 15, 0, 0, 0, 0, time.UTC).In(config.GetTimeZone()),
+								time.Date(2020, time.July, 15, 7, 0, 0, 0, time.UTC).In(config.GetTimeZone()),
 							},
 						},
 						{
@@ -376,7 +376,7 @@ func TestConvertTodoistToVikunja(t *testing.T) {
 							DoneAt:      time3,
 							Labels:      vikunjaLabels,
 							Reminders: []time.Time{
-								time.Date(2020, time.June, 15, 0, 0, 0, 0, time.UTC).In(config.GetTimeZone()),
+								time.Date(2020, time.June, 15, 7, 0, 0, 0, time.UTC).In(config.GetTimeZone()),
 							},
 						},
 						{
@@ -392,7 +392,7 @@ func TestConvertTodoistToVikunja(t *testing.T) {
 							Created: time1,
 							DoneAt:  time3,
 							Reminders: []time.Time{
-								time.Date(2020, time.June, 15, 0, 0, 0, 0, time.UTC).In(config.GetTimeZone()),
+								time.Date(2020, time.June, 15, 7, 0, 0, 0, time.UTC).In(config.GetTimeZone()),
 							},
 						},
 						{
@@ -470,7 +470,7 @@ func TestConvertTodoistToVikunja(t *testing.T) {
 							Done:    false,
 							Created: time1,
 							Reminders: []time.Time{
-								time.Date(2020, time.June, 15, 0, 0, 0, 0, time.UTC).In(config.GetTimeZone()),
+								time.Date(2020, time.June, 15, 7, 0, 0, 0, time.UTC).In(config.GetTimeZone()),
 							},
 						},
 						{