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.

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
 			}
 		}