diff --git a/pkg/modules/migration/ticktick/ticktick.go b/pkg/modules/migration/ticktick/ticktick.go index 78b0be168..a465c6bba 100644 --- a/pkg/modules/migration/ticktick/ticktick.go +++ b/pkg/modules/migration/ticktick/ticktick.go @@ -115,11 +115,11 @@ func convertTickTickToVikunja(tasks []*tickTickTask) (result []*models.Namespace projects := make(map[string]*models.ProjectWithTasksAndBuckets) for _, t := range tasks { - _, has := projects[t.ProjectName] + _, has := projects[t.ListName] if !has { - projects[t.ProjectName] = &models.ProjectWithTasksAndBuckets{ + projects[t.ListName] = &models.ProjectWithTasksAndBuckets{ Project: models.Project{ - Title: t.ProjectName, + Title: t.ListName, }, } } @@ -158,7 +158,7 @@ func convertTickTickToVikunja(tasks []*tickTickTask) (result []*models.Namespace } } - projects[t.ProjectName].Tasks = append(projects[t.ProjectName].Tasks, task) + projects[t.ListName].Tasks = append(projects[t.ListName].Tasks, task) } for _, l := range projects { diff --git a/pkg/modules/migration/ticktick/ticktick_test.go b/pkg/modules/migration/ticktick/ticktick_test.go index 0eea6e20e..185374125 100644 --- a/pkg/modules/migration/ticktick/ticktick_test.go +++ b/pkg/modules/migration/ticktick/ticktick_test.go @@ -40,47 +40,47 @@ func TestConvertTicktickTasksToVikunja(t *testing.T) { tickTickTasks := []*tickTickTask{ { - TaskID: 1, - ParentID: 0, - ProjectName: "Project 1", - Title: "Test task 1", - Tags: []string{"label1", "label2"}, - Content: "Lorem Ipsum Dolor sit amet", - StartDate: time1, - DueDate: time2, - Reminder: duration, - Repeat: "FREQ=WEEKLY;INTERVAL=1;UNTIL=20190117T210000Z", - Status: "0", - Order: -1099511627776, + TaskID: 1, + ParentID: 0, + ListName: "Project 1", + Title: "Test task 1", + Tags: []string{"label1", "label2"}, + Content: "Lorem Ipsum Dolor sit amet", + StartDate: time1, + DueDate: time2, + Reminder: duration, + Repeat: "FREQ=WEEKLY;INTERVAL=1;UNTIL=20190117T210000Z", + Status: "0", + Order: -1099511627776, }, { TaskID: 2, ParentID: 1, - ProjectName: "Project 1", + ListName: "Project 1", Title: "Test task 2", Status: "1", CompletedTime: time3, Order: -1099511626, }, { - TaskID: 3, - ParentID: 0, - ProjectName: "Project 1", - Title: "Test task 3", - Tags: []string{"label1", "label2", "other label"}, - StartDate: time1, - DueDate: time2, - Reminder: duration, - Status: "0", - Order: -109951627776, + TaskID: 3, + ParentID: 0, + ListName: "Project 1", + Title: "Test task 3", + Tags: []string{"label1", "label2", "other label"}, + StartDate: time1, + DueDate: time2, + Reminder: duration, + Status: "0", + Order: -109951627776, }, { - TaskID: 4, - ParentID: 0, - ProjectName: "Project 2", - Title: "Test task 4", - Status: "0", - Order: -109951627777, + TaskID: 4, + ParentID: 0, + ListName: "Project 2", + Title: "Test task 4", + Status: "0", + Order: -109951627777, }, } @@ -90,13 +90,13 @@ func TestConvertTicktickTasksToVikunja(t *testing.T) { assert.Len(t, vikunjaTasks[0].Projects, 2) assert.Len(t, vikunjaTasks[0].Projects[0].Tasks, 3) - assert.Equal(t, vikunjaTasks[0].Projects[0].Title, tickTickTasks[0].ProjectName) + assert.Equal(t, vikunjaTasks[0].Projects[0].Title, tickTickTasks[0].ListName) assert.Equal(t, vikunjaTasks[0].Projects[0].Tasks[0].Title, tickTickTasks[0].Title) assert.Equal(t, vikunjaTasks[0].Projects[0].Tasks[0].Description, tickTickTasks[0].Content) - assert.Equal(t, vikunjaTasks[0].Projects[0].Tasks[0].StartDate, tickTickTasks[0].StartDate) - assert.Equal(t, vikunjaTasks[0].Projects[0].Tasks[0].EndDate, tickTickTasks[0].DueDate) - assert.Equal(t, vikunjaTasks[0].Projects[0].Tasks[0].DueDate, tickTickTasks[0].DueDate) + assert.Equal(t, vikunjaTasks[0].Projects[0].Tasks[0].StartDate, tickTickTasks[0].StartDate.Time) + assert.Equal(t, vikunjaTasks[0].Projects[0].Tasks[0].EndDate, tickTickTasks[0].DueDate.Time) + assert.Equal(t, vikunjaTasks[0].Projects[0].Tasks[0].DueDate, tickTickTasks[0].DueDate.Time) assert.Equal(t, vikunjaTasks[0].Projects[0].Tasks[0].Labels, []*models.Label{ {Title: "label1"}, {Title: "label2"}, @@ -132,7 +132,7 @@ func TestConvertTicktickTasksToVikunja(t *testing.T) { assert.Equal(t, vikunjaTasks[0].Projects[0].Tasks[2].Done, false) assert.Len(t, vikunjaTasks[0].Projects[1].Tasks, 1) - assert.Equal(t, vikunjaTasks[0].Projects[1].Title, tickTickTasks[3].ProjectName) + assert.Equal(t, vikunjaTasks[0].Projects[1].Title, tickTickTasks[3].ListName) assert.Equal(t, vikunjaTasks[0].Projects[1].Tasks[0].Title, tickTickTasks[3].Title) assert.Equal(t, vikunjaTasks[0].Projects[1].Tasks[0].Position, tickTickTasks[3].Order)