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

@@ -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)