github-starred/vikunja
2
0
Fork 0
mirror of https://github.com/go-vikunja/vikunja.git synced 2026-04-28 18:38:24 -05:00
Code Issues 690 Packages Projects Releases 11 Wiki Activity

fix(migration): fetch members when they do not exist

Browse Source 
Resolves https://github.com/go-vikunja/vikunja/issues/378
This commit is contained in:
kolaente
2024-12-15 13:11:29 +01:00
parent dc379b7a7e
commit 47ff7d8ad3
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/models/task_assignees.go
View File

@@ -20,13 +20,11 @@ import (
"time"
"code.vikunja.io/api/pkg/db"
"xorm.io/builder"
"code.vikunja.io/api/pkg/events"
"code.vikunja.io/api/pkg/user"
"code.vikunja.io/api/pkg/web"
"xorm.io/builder"
"xorm.io/xorm"
)

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

@@ -225,7 +225,7 @@ func convertMarkdownToHTML(input string) (output string, err error) {
// Converts all previously obtained data from trello into the vikunja format.
// `trelloData` should contain all boards with their projects and cards respectively.
func convertTrelloDataToVikunja(organizationName string, trelloData []*trello.Board, token string, currentMember *trello.Member) (fullVikunjaHierachie []*models.ProjectWithTasksAndBuckets, err error) {
func convertTrelloDataToVikunja(organizationName string, trelloData []*trello.Board, client *trello.Client, currentMember *trello.Member) (fullVikunjaHierachie []*models.ProjectWithTasksAndBuckets, err error) {
log.Debugf("[Trello Migration] ")
@@ -243,6 +243,8 @@ func convertTrelloDataToVikunja(organizationName string, trelloData []*trello.Bo
log.Debugf("[Trello Migration] Converting %d boards to vikunja projects", len(trelloData))
actionMemberCache := make(map[string]*trello.Member)
for index, board := range trelloData {
project := &models.ProjectWithTasksAndBuckets{
Project: models.Project{
@@ -341,7 +343,7 @@ func convertTrelloDataToVikunja(organizationName string, trelloData []*trello.Bo
log.Debugf("[Trello Migration] Downloading card attachment %s", attachment.ID)
buf, err := migration.DownloadFileWithHeaders(attachment.URL, map[string][]string{
"Authorization": {`OAuth oauth_consumer_key="` + config.MigrationTrelloKey.GetString() + `", oauth_token="` + token + `"`},
"Authorization": {`OAuth oauth_consumer_key="` + config.MigrationTrelloKey.GetString() + `", oauth_token="` + client.Token + `"`},
})
if err != nil {
return nil, err
@@ -408,7 +410,26 @@ func convertTrelloDataToVikunja(organizationName string, trelloData []*trello.Bo
}
if currentMember == nil || action.IDMemberCreator != currentMember.ID {
comment.Comment = "*" + action.MemberCreator.FullName + "*:\n\n" + comment.Comment
if action.MemberCreator == nil {
if cached, ok := actionMemberCache[action.IDMemberCreator]; ok {
action.MemberCreator = cached
} else {
member, err := client.GetMember(action.IDMemberCreator)
if err != nil {
log.Errorf("[Trello Migration] Could not get member %s for card %s", action.IDMemberCreator, card.ID)
}
actionMemberCache[action.IDMemberCreator] = member
action.MemberCreator = member
}
}
fullName := action.IDMemberCreator
if action.MemberCreator != nil {
fullName = action.MemberCreator.FullName
}
//action.MemberCreator.FullName
comment.Comment = "*" + fullName + "*:\n\n" + comment.Comment
}
comment.Comment, err = convertMarkdownToHTML(comment.Comment)
@@ -489,7 +510,7 @@ func (m *Migration) Migrate(u *user.User) (err error) {
if err != nil {
return err
}
hierarchy, err := convertTrelloDataToVikunja(orgName, boards, client.Token, currentMember)
hierarchy, err := convertTrelloDataToVikunja(orgName, boards, client, currentMember)
if err != nil {
return err
}

2
pkg/modules/migration/trello/trello_test.go
View File

@@ -462,7 +462,7 @@ func TestConvertTrelloToVikunja(t *testing.T) {
organizationMap := getTrelloOrganizationsWithBoards(trelloData)
for organizationID, boards := range organizationMap {
hierarchy, err := convertTrelloDataToVikunja(organizationID, boards, "", nil)
hierarchy, err := convertTrelloDataToVikunja(organizationID, boards, &trello.Client{}, nil)
require.NoError(t, err)
assert.NotNil(t, hierarchy)