From c517a87b85063a7e4e68656c9e121f2d948a5a70 Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 17 Aug 2020 22:30:24 +0200 Subject: [PATCH] Don't add a subtask to the top level of tasks to not add it twice in the list --- pkg/modules/migration/todoist/todoist.go | 12 ++++++++++++ pkg/modules/migration/todoist/todoist_test.go | 7 ------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkg/modules/migration/todoist/todoist.go b/pkg/modules/migration/todoist/todoist.go index 7f2e8f8427..111ac54384 100644 --- a/pkg/modules/migration/todoist/todoist.go +++ b/pkg/modules/migration/todoist/todoist.go @@ -313,6 +313,18 @@ func convertTodoistToVikunja(sync *sync) (fullVikunjaHierachie []*models.Namespa } tasks[i.ParentID].RelatedTasks[models.RelationKindSubtask] = append(tasks[i.ParentID].RelatedTasks[models.RelationKindSubtask], tasks[i.ID]) + + // Remove the task from the top level structure, otherwise it is added twice + outer: + for _, list := range lists { + for in, t := range list.Tasks { + if t == tasks[i.ID] { + list.Tasks = append(list.Tasks[:in], list.Tasks[in+1:]...) + break outer + } + } + } + delete(tasks, i.ID) } // Task Notes -> Task Descriptions diff --git a/pkg/modules/migration/todoist/todoist_test.go b/pkg/modules/migration/todoist/todoist_test.go index 0d2c7cbc7b..a242b7b0f8 100644 --- a/pkg/modules/migration/todoist/todoist_test.go +++ b/pkg/modules/migration/todoist/todoist_test.go @@ -413,13 +413,6 @@ func TestConvertTodoistToVikunja(t *testing.T) { }, }, }, - { - Title: "Task with parent", - Done: false, - Priority: 2, - Created: time1, - DoneAt: nilTime, - }, { Title: "Task400000106", Done: true,