ami/tl-vikunja
1
0
Fork 0
Code

fix(migration): use correct struct

Browse Source
This commit is contained in:
kolaente 2022-12-23 18:55:44 +01:00
parent 0a3fdc0344
commit 2940eae1aa
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/modules/migration/todoist/todoist.go
View File

@ -251,16 +251,16 @@ func parseDate(dateString string) (date time.Time, err error) {
return date, err return date, err
} }
func convertTodoistToVikunja(sync *sync, doneItems map[string]*doneItem) (fullVikunjaHierachie []*models.NamespaceWithListsAndTasks, err error) { func convertTodoistToVikunja(sync *sync, doneItems map[string]*doneItem) (fullVikunjaHierachie []*models.NamespaceWithProjectsAndTasks, err error) {
newNamespace := &models.NamespaceWithListsAndTasks{ newNamespace := &models.NamespaceWithProjectsAndTasks{
Namespace: models.Namespace{ Namespace: models.Namespace{
Title: "Migrated from todoist", Title: "Migrated from todoist",
}, },
} }
// A map for all vikunja lists with the project id they're coming from as key // A map for all vikunja lists with the project id they're coming from as key
lists := make(map[string]*models.ListWithTasksAndBuckets, len(sync.Projects)) lists := make(map[string]*models.ProjectWithTasksAndBuckets, len(sync.Projects))
// A map for all vikunja tasks with the todoist task id as key to find them easily and add more data // A map for all vikunja tasks with the todoist task id as key to find them easily and add more data
tasks := make(map[string]*models.TaskWithComments, len(sync.Items)) tasks := make(map[string]*models.TaskWithComments, len(sync.Items))
@ -271,17 +271,17 @@ func convertTodoistToVikunja(sync *sync, doneItems map[string]*doneItem) (fullVi
sections := make(map[string]int64) sections := make(map[string]int64)
for _, p := range sync.Projects { for _, p := range sync.Projects {
list := &models.ListWithTasksAndBuckets{ project := &models.ProjectWithTasksAndBuckets{
List: models.List{ Project: models.Project{
Title: p.Name, Title: p.Name,
HexColor: todoistColors[p.Color], HexColor: todoistColors[p.Color],
IsArchived: p.IsArchived, IsArchived: p.IsArchived,
}, },
} }
lists[p.ID] = list lists[p.ID] = project
newNamespace.Lists = append(newNamespace.Lists, list) newNamespace.Projects = append(newNamespace.Projects, project)
} }
sort.Slice(sync.Sections, func(i, j int) bool { sort.Slice(sync.Sections, func(i, j int) bool {
@ -446,7 +446,7 @@ func convertTodoistToVikunja(sync *sync, doneItems map[string]*doneItem) (fullVi
} }
} }
// Project Notes -> List Descriptions // Project Notes -> Project Descriptions
for _, pn := range sync.ProjectNotes { for _, pn := range sync.ProjectNotes {
if lists[pn.ProjectID].Description != "" { if lists[pn.ProjectID].Description != "" {
lists[pn.ProjectID].Description += "\n" lists[pn.ProjectID].Description += "\n"
@ -474,7 +474,7 @@ func convertTodoistToVikunja(sync *sync, doneItems map[string]*doneItem) (fullVi
tasks[r.ItemID].Reminders = append(tasks[r.ItemID].Reminders, date.In(config.GetTimeZone())) tasks[r.ItemID].Reminders = append(tasks[r.ItemID].Reminders, date.In(config.GetTimeZone()))
} }
return []*models.NamespaceWithListsAndTasks{ return []*models.NamespaceWithProjectsAndTasks{
newNamespace, newNamespace,
}, err }, err
} }