From 039271394ee3aed5b265c6c5c5e1f8d979478970 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Wed, 5 Jul 2017 12:10:15 -0400 Subject: PLT-6753 Fixed deactivated users counting against max members on a team (#6758) * PLT-6753 Fixed deactivated users counting against max members on a team * Removed nested sql query when checking the number of team members --- store/sql_team_store.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'store/sql_team_store.go') diff --git a/store/sql_team_store.go b/store/sql_team_store.go index 6a2bcc9b0..b2c872880 100644 --- a/store/sql_team_store.go +++ b/store/sql_team_store.go @@ -494,9 +494,14 @@ func (s SqlTeamStore) SaveMember(member *model.TeamMember) StoreChannel { COUNT(0) FROM TeamMembers + INNER JOIN + Users + ON + TeamMembers.UserId = Users.Id WHERE TeamId = :TeamId - AND DeleteAt = 0`, map[string]interface{}{"TeamId": member.TeamId}); err != nil { + AND TeamMembers.DeleteAt = 0 + AND Users.DeleteAt = 0`, map[string]interface{}{"TeamId": member.TeamId}); err != nil { result.Err = model.NewLocAppError("SqlUserStore.Save", "store.sql_user.save.member_count.app_error", nil, "teamId="+member.TeamId+", "+err.Error()) storeChannel <- result close(storeChannel) -- cgit v1.2.3-1-g7c22