Add better logging
continuous-integration/drone/pr Build was killed Details

This commit is contained in:
kolaente 2020-02-18 22:24:10 +01:00
parent 3f99189c65
commit 2d137e3b7d
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 28 additions and 1 deletions

View File

@ -18,6 +18,7 @@ package migration
import (
"bytes"
"code.vikunja.io/api/pkg/log"
"code.vikunja.io/api/pkg/models"
"code.vikunja.io/api/pkg/user"
"io/ioutil"
@ -27,6 +28,8 @@ import (
// (Namespaces, tasks, etc. Even attachments and relations.)
func InsertFromStructure(str []*models.NamespaceWithLists, user *user.User) (err error) {
log.Debugf("[creating structure] Creating %d namespaces", len(str))
// Create all namespaces
for _, n := range str {
err = n.Create(user)
@ -34,6 +37,9 @@ func InsertFromStructure(str []*models.NamespaceWithLists, user *user.User) (err
return
}
log.Debugf("[creating structure] Created namespace %d", n.ID)
log.Debugf("[creating structure] Creating %d lists", len(n.Lists))
// Create all lists
for _, l := range n.Lists {
// The tasks slice is going to be reset during the creation of the list so we rescue it here to be able
@ -46,6 +52,9 @@ func InsertFromStructure(str []*models.NamespaceWithLists, user *user.User) (err
return
}
log.Debugf("[creating structure] Created list %d", l.ID)
log.Debugf("[creating structure] Creating %d tasks", len(tasks))
// Create all tasks
for _, t := range tasks {
t.ListID = l.ID
@ -54,6 +63,11 @@ func InsertFromStructure(str []*models.NamespaceWithLists, user *user.User) (err
return
}
log.Debugf("[creating structure] Created task %d", t.ID)
if len(t.RelatedTasks) > 0 {
log.Debugf("[creating structure] Creating %d related tasks", len(t.RelatedTasks))
}
// Create all relation for each task
for kind, tasks := range t.RelatedTasks {
// First create the related tasks if they does not exist
@ -64,6 +78,7 @@ func InsertFromStructure(str []*models.NamespaceWithLists, user *user.User) (err
if err != nil {
return
}
log.Debugf("[creating structure] Created related task %d", rt.ID)
}
// Then create the relation
@ -76,10 +91,16 @@ func InsertFromStructure(str []*models.NamespaceWithLists, user *user.User) (err
if err != nil {
return
}
log.Debugf("[creating structure] Created task relation between task %d and %d with new ID %d", t.ID, rt.ID, taskRel.ID)
}
}
// Create all attachments for each task
if len(t.Attachments) > 0 {
log.Debugf("[creating structure] Creating %d attachments", len(t.Attachments))
}
for _, a := range t.Attachments {
// Check if we have a file to create
if len(a.File.FileContent) > 0 {
@ -89,11 +110,14 @@ func InsertFromStructure(str []*models.NamespaceWithLists, user *user.User) (err
if err != nil {
return
}
log.Debugf("[creating structure] Created new attachment %d", a.ID)
}
}
}
}
}
log.Debugf("[creating structure] Done inserting new task structure")
return nil
}

View File

@ -459,11 +459,14 @@ func (w *Migration) Migrate(user *user.User) (err error) {
log.Debugf("[Wunderlist migration] Insert data into db for user %d", user.ID)
err = migration.InsertFromStructure(fullVikunjaHierachie, user)
if err != nil {
return err
}
log.Debugf("[Wunderlist migration] Done inserting data into db for user %d", user.ID)
log.Debugf("[Wunderlist migration] Wunderlist migration for user %d done", user.ID)
return err
return nil
}
// AuthURL returns the url users need to authenticate against