chore: refactor names and variables
All checks were successful
continuous-integration/drone/pr Build is passing
All checks were successful
continuous-integration/drone/pr Build is passing
This commit is contained in:
parent
879cb38721
commit
d686d417ae
|
@ -120,25 +120,25 @@ func getTrelloBoards(client *trello.Client) (trelloData []*trello.Board, err err
|
|||
return
|
||||
}
|
||||
|
||||
func createOrganizationMap(trelloData []*trello.Board) map[string][]*trello.Board {
|
||||
boardMap := make(map[string][]*trello.Board)
|
||||
func getTrelloOrganizationsWithBoards(boards []*trello.Board) (boardsByOrg map[string][]*trello.Board) {
|
||||
|
||||
for _, board := range trelloData {
|
||||
boardsByOrg = make(map[string][]*trello.Board)
|
||||
|
||||
for _, board := range boards {
|
||||
// Trello boards without an organization are considered personal boards
|
||||
if board.IDOrganization == "" {
|
||||
board.IDOrganization = "Personal"
|
||||
}
|
||||
|
||||
boards, ok := boardMap[board.IDOrganization]
|
||||
if ok {
|
||||
boards = append(boards, board)
|
||||
} else {
|
||||
boards = []*trello.Board{board}
|
||||
}
|
||||
boardMap[board.IDOrganization] = boards
|
||||
_, has := boardsByOrg[board.IDOrganization]
|
||||
if !has {
|
||||
boardsByOrg[board.IDOrganization] = []*trello.Board{}
|
||||
}
|
||||
|
||||
return boardMap
|
||||
boardsByOrg[board.IDOrganization] = append(boardsByOrg[board.IDOrganization], board)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func fillCardData(client *trello.Client, board *trello.Board) (err error) {
|
||||
|
@ -415,14 +415,14 @@ func (m *Migration) Migrate(u *user.User) (err error) {
|
|||
client := trello.NewClient(config.MigrationTrelloKey.GetString(), m.Token)
|
||||
client.Logger = log.GetLogger()
|
||||
|
||||
data, err := getTrelloBoards(client)
|
||||
boards, err := getTrelloBoards(client)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
log.Debugf("[Trello Migration] Got all trello data for user %d", u.ID)
|
||||
|
||||
organizationMap := createOrganizationMap(data)
|
||||
organizationMap := getTrelloOrganizationsWithBoards(boards)
|
||||
for organizationID, boards := range organizationMap {
|
||||
log.Debugf("[Trello Migration] Getting organization with id %s for user %d", organizationID, u.ID)
|
||||
organization, err := client.GetOrganization(organizationID, trello.Defaults())
|
||||
|
|
|
@ -452,7 +452,7 @@ func TestConvertTrelloToVikunja(t *testing.T) {
|
|||
},
|
||||
}
|
||||
|
||||
organizationMap := createOrganizationMap(trelloData)
|
||||
organizationMap := getTrelloOrganizationsWithBoards(trelloData)
|
||||
for organizationID, boards := range organizationMap {
|
||||
hierarchy, err := convertTrelloDataToVikunja(organizationID, boards, "")
|
||||
|
||||
|
@ -467,7 +467,7 @@ func TestConvertTrelloToVikunja(t *testing.T) {
|
|||
func TestCreateOrganizationMap(t *testing.T) {
|
||||
trelloData, _ := getTestBoard(t)
|
||||
|
||||
organizationMap := createOrganizationMap(trelloData)
|
||||
organizationMap := getTrelloOrganizationsWithBoards(trelloData)
|
||||
expectedMap := map[string][]*trello.Board{
|
||||
"orgid": {
|
||||
trelloData[0],
|
||||
|
|
Loading…
Reference in New Issue
Block a user