From e16bdf8d1d4d2972be4e89cbc9c4dbef134895ba Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Wed, 4 Oct 2017 18:17:58 +0100 Subject: PLT-7789: Fix raciness on Aurora with importing team members. (#7573) * PLT-7789: Fix raciness on Aurora with importing team members. * Fix and document return values. --- app/import.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'app/import.go') diff --git a/app/import.go b/app/import.go index 2fab6b3f7..6a309ad3e 100644 --- a/app/import.go +++ b/app/import.go @@ -773,18 +773,14 @@ func (a *App) ImportUserTeams(username string, data *[]UserTeamImportData) *mode roles = *tdata.Roles } - if _, err := a.joinUserToTeam(team, user); err != nil { + var member *model.TeamMember + if member, _, err = a.joinUserToTeam(team, user); err != nil { return err } - var member *model.TeamMember - if member, err = a.GetTeamMember(team.Id, user.Id); err != nil { - return err - } else { - if member.Roles != roles { - if _, err := a.UpdateTeamMemberRoles(team.Id, user.Id, roles); err != nil { - return err - } + if member.Roles != roles { + if _, err := a.UpdateTeamMemberRoles(team.Id, user.Id, roles); err != nil { + return err } } -- cgit v1.2.3-1-g7c22