diff options
author | George Goldberg <george@gberg.me> | 2017-10-04 18:17:58 +0100 |
---|---|---|
committer | Chris <ccbrown112@gmail.com> | 2017-10-04 10:17:58 -0700 |
commit | e16bdf8d1d4d2972be4e89cbc9c4dbef134895ba (patch) | |
tree | 6e9a4f0000538f4720606da427519661f475d1cf /app/import.go | |
parent | 35d56821ff959d7041fb5ab5071756980c8c94d6 (diff) | |
download | chat-e16bdf8d1d4d2972be4e89cbc9c4dbef134895ba.tar.gz chat-e16bdf8d1d4d2972be4e89cbc9c4dbef134895ba.tar.bz2 chat-e16bdf8d1d4d2972be4e89cbc9c4dbef134895ba.zip |
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.
Diffstat (limited to 'app/import.go')
-rw-r--r-- | app/import.go | 14 |
1 files changed, 5 insertions, 9 deletions
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 } } |