vikunja
/
vikunja
6
43
Fork 72
Code Issues 150 Pull Requests 19 Packages Releases 32 Activity

Fix timezone setting for wunderlist parsing
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
kolaente 2020-06-27 16:05:18 +02:00
parent eae5fcfabf
commit 9f670194f2
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/modules/migration/wunderlist/wunderlist.go
View File

@ -158,7 +158,7 @@ func convertListForFolder(listID int, list *list, content *wunderlistContents) (
// Set Done At // Set Done At
if newTask.Done { if newTask.Done {
newTask.DoneAt = t.CompletedAt newTask.DoneAt = t.CompletedAt.In(config.GetTimeZone())
} }
// Parse the due date // Parse the due date
@ -167,7 +167,7 @@ func convertListForFolder(listID int, list *list, content *wunderlistContents) (
if err != nil { if err != nil {
return nil, err return nil, err
} }
newTask.DueDate = dueDate newTask.DueDate = dueDate.In(config.GetTimeZone())
} }
// Find related notes // Find related notes
@ -223,7 +223,7 @@ func convertListForFolder(listID int, list *list, content *wunderlistContents) (
// Reminders // Reminders
for _, r := range content.reminders { for _, r := range content.reminders {
if r.TaskID == t.ID { if r.TaskID == t.ID {
newTask.Reminders = append(newTask.Reminders, r.Date) newTask.Reminders = append(newTask.Reminders, r.Date.In(config.GetTimeZone()))
} }
} }

25
pkg/modules/migration/wunderlist/wunderlist_test.go
View File

@ -34,12 +34,16 @@ func TestWunderlistParsing(t *testing.T) {
time1, err := time.Parse(time.RFC3339Nano, "2013-08-30T08:29:46.203Z") time1, err := time.Parse(time.RFC3339Nano, "2013-08-30T08:29:46.203Z")
assert.NoError(t, err) assert.NoError(t, err)
time1 = time1.In(config.GetTimeZone())
time2, err := time.Parse(time.RFC3339Nano, "2013-08-30T08:36:13.273Z") time2, err := time.Parse(time.RFC3339Nano, "2013-08-30T08:36:13.273Z")
assert.NoError(t, err) assert.NoError(t, err)
time2 = time2.In(config.GetTimeZone())
time3, err := time.Parse(time.RFC3339Nano, "2013-09-05T08:36:13.273Z") time3, err := time.Parse(time.RFC3339Nano, "2013-09-05T08:36:13.273Z")
assert.NoError(t, err) assert.NoError(t, err)
time3 = time3.In(config.GetTimeZone())
time4, err := time.Parse(time.RFC3339Nano, "2013-08-02T11:58:55Z") time4, err := time.Parse(time.RFC3339Nano, "2013-08-02T11:58:55Z")
assert.NoError(t, err) assert.NoError(t, err)
time4 = time4.In(config.GetTimeZone())
exampleFile, err := ioutil.ReadFile(config.ServiceRootpath.GetString() + "/pkg/modules/migration/wunderlist/testimage.jpg") exampleFile, err := ioutil.ReadFile(config.ServiceRootpath.GetString() + "/pkg/modules/migration/wunderlist/testimage.jpg")
assert.NoError(t, err) assert.NoError(t, err)
@ -50,6 +54,7 @@ func TestWunderlistParsing(t *testing.T) {
if done { if done {
completedAt = time1 completedAt = time1
} }
completedAt = completedAt.In(config.GetTimeZone())
return &task{ return &task{
ID: id, ID: id,
AssigneeID: 123, AssigneeID: 123,
@ -202,7 +207,7 @@ func TestWunderlistParsing(t *testing.T) {
Tasks: []*models.Task{ Tasks: []*models.Task{
{ {
Title: "Ipsum1", Title: "Ipsum1",
DueDate: time.Unix(1378339200, 0), DueDate: time.Unix(1378339200, 0).In(config.GetTimeZone()),
Created: time1, Created: time1,
Description: "Lorem Ipsum dolor sit amet", Description: "Lorem Ipsum dolor sit amet",
Attachments: []*models.TaskAttachment{ Attachments: []*models.TaskAttachment{
@ -221,7 +226,7 @@ func TestWunderlistParsing(t *testing.T) {
}, },
{ {
Title: "Ipsum2", Title: "Ipsum2",
DueDate: time.Unix(1378339200, 0), DueDate: time.Unix(1378339200, 0).In(config.GetTimeZone()),
Created: time1, Created: time1,
Description: "Lorem Ipsum dolor sit amet", Description: "Lorem Ipsum dolor sit amet",
RelatedTasks: map[models.RelationKind][]*models.Task{ RelatedTasks: map[models.RelationKind][]*models.Task{
@ -245,7 +250,7 @@ func TestWunderlistParsing(t *testing.T) {
Title: "Ipsum3", Title: "Ipsum3",
Done: true, Done: true,
DoneAt: time1, DoneAt: time1,
DueDate: time.Unix(1378339200, 0), DueDate: time.Unix(1378339200, 0).In(config.GetTimeZone()),
Created: time1, Created: time1,
Description: "Lorem Ipsum dolor sit amet", Description: "Lorem Ipsum dolor sit amet",
Attachments: []*models.TaskAttachment{ Attachments: []*models.TaskAttachment{
@ -263,7 +268,7 @@ func TestWunderlistParsing(t *testing.T) {
}, },
{ {
Title: "Ipsum4", Title: "Ipsum4",
DueDate: time.Unix(1378339200, 0), DueDate: time.Unix(1378339200, 0).In(config.GetTimeZone()),
Created: time1, Created: time1,
Reminders: []time.Time{time3}, Reminders: []time.Time{time3},
RelatedTasks: map[models.RelationKind][]*models.Task{ RelatedTasks: map[models.RelationKind][]*models.Task{
@ -282,26 +287,26 @@ func TestWunderlistParsing(t *testing.T) {
Tasks: []*models.Task{ Tasks: []*models.Task{
{ {
Title: "Ipsum5", Title: "Ipsum5",
DueDate: time.Unix(1378339200, 0), DueDate: time.Unix(1378339200, 0).In(config.GetTimeZone()),
Created: time1, Created: time1,
}, },
{ {
Title: "Ipsum6", Title: "Ipsum6",
DueDate: time.Unix(1378339200, 0), DueDate: time.Unix(1378339200, 0).In(config.GetTimeZone()),
Created: time1, Created: time1,
Done: true, Done: true,
DoneAt: time1, DoneAt: time1,
}, },
{ {
Title: "Ipsum7", Title: "Ipsum7",
DueDate: time.Unix(1378339200, 0), DueDate: time.Unix(1378339200, 0).In(config.GetTimeZone()),
Created: time1, Created: time1,
Done: true, Done: true,
DoneAt: time1, DoneAt: time1,
}, },
{ {
Title: "Ipsum8", Title: "Ipsum8",
DueDate: time.Unix(1378339200, 0), DueDate: time.Unix(1378339200, 0).In(config.GetTimeZone()),
Created: time1, Created: time1,
}, },
}, },
@ -312,14 +317,14 @@ func TestWunderlistParsing(t *testing.T) {
Tasks: []*models.Task{ Tasks: []*models.Task{
{ {
Title: "Ipsum9", Title: "Ipsum9",
DueDate: time.Unix(1378339200, 0), DueDate: time.Unix(1378339200, 0).In(config.GetTimeZone()),
Created: time1, Created: time1,
Done: true, Done: true,
DoneAt: time1, DoneAt: time1,
}, },
{ {
Title: "Ipsum10", Title: "Ipsum10",
DueDate: time.Unix(1378339200, 0), DueDate: time.Unix(1378339200, 0).In(config.GetTimeZone()),
Created: time1, Created: time1,
Done: true, Done: true,
DoneAt: time1, DoneAt: time1,