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

Return migration errors for Trello #2209

Closed
Elscrux wants to merge 2 commits from Elscrux/vikunja:fix/trello-migration-errors into main
pull from: Elscrux/vikunja:fix/trello-migration-errors
merge into: vikunja:main
Conversation 3 Commits 2 Files Changed 2 +9 -6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/modules/migration/handler/listeners.go
View File

@ -68,19 +68,22 @@ func (s *MigrationListener) Handle(msg *message.Message) (err error) {
err = ms.Migrate(event.User)
if err != nil {
return
log.Errorf("[Migration] Failed to migrate %d from %s for user %d: %s", m.ID, event.MigratorKind, event.User.ID, err)
return err
}
err = migration.FinishMigration(m)
if err != nil {
return
log.Errorf("[Migration] Failed to finish migration %d from %s for user %d: %s", m.ID, event.MigratorKind, event.User.ID, err)
return err
}
err = notifications.Notify(event.User, &MigrationDoneNotification{
MigratorName: ms.Name(),
})
if err != nil {
return
log.Errorf("[Migration] Failed to notify migration %d from %s for user %d: %s", m.ID, event.MigratorKind, event.User.ID, err)
return err
}
log.Debugf("[Migration] Successfully done migration %d from %s for user %d", m.ID, event.MigratorKind, event.User.ID)

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

@ -395,7 +395,7 @@ func (m *Migration) Migrate(u *user.User) (err error) {
trelloData, err := getTrelloData(m.Token)
if err != nil {
return
return err
}
log.Debugf("[Trello Migration] Got all trello data for user %d", u.ID)
@ -403,7 +403,7 @@ func (m *Migration) Migrate(u *user.User) (err error) {
fullVikunjaHierachie, err := convertTrelloDataToVikunja(trelloData, m.Token)
if err != nil {
return
return err
}
log.Debugf("[Trello Migration] Done migrating trello data for user %d", u.ID)
@ -411,7 +411,7 @@ func (m *Migration) Migrate(u *user.User) (err error) {
err = migration.InsertFromStructure(fullVikunjaHierachie, u)
if err != nil {
return
return err
}
log.Debugf("[Trello Migration] Done inserting trello data for user %d", u.ID)