From 02dac5299c26a0fe08c1639b7ddf21d547b8566c Mon Sep 17 00:00:00 2001
From: AlanCoding <arominger@ansible.com>
Date: Fri, 24 Jun 2016 13:31:10 -0400
Subject: [PATCH] Activity Stream prefetch update to new fields, avoid
 distinct.count repeated queries

---
 awx/api/serializers.py |  4 ++--
 awx/main/access.py     | 20 ++++++++------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index 0825b08c4c..c2ec63b46f 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -2621,7 +2621,7 @@ class ActivityStreamSerializer(BaseSerializer):
             if not hasattr(obj, fk):
                 continue
             allm2m = getattr(obj, fk).distinct()
-            if allm2m.count() > 0:
+            if getattr(obj, fk).exists():
                 rel[fk] = []
                 for thisItem in allm2m:
                     rel[fk].append(reverse('api:' + fk + '_detail', args=(thisItem.id,)))
@@ -2636,7 +2636,7 @@ class ActivityStreamSerializer(BaseSerializer):
                 if not hasattr(obj, fk):
                     continue
                 allm2m = getattr(obj, fk).distinct()
-                if allm2m.count() > 0:
+                if getattr(obj, fk).exists():
                     summary_fields[fk] = []
                     for thisItem in allm2m:
                         if fk == 'job':
diff --git a/awx/main/access.py b/awx/main/access.py
index e8607f6f74..750f0fc11e 100644
--- a/awx/main/access.py
+++ b/awx/main/access.py
@@ -1466,7 +1466,8 @@ class ActivityStreamAccess(BaseAccess):
         qs = qs.select_related('actor')
         qs = qs.prefetch_related('organization', 'user', 'inventory', 'host', 'group', 'inventory_source',
                                  'inventory_update', 'credential', 'team', 'project', 'project_update',
-                                 'permission', 'job_template', 'job')
+                                 'permission', 'job_template', 'job', 'ad_hoc_command',
+                                 'notification_template', 'notification', 'label', 'role')
         if self.user.is_superuser:
             return qs.all()
         if self.user in Role.singleton('system_auditor'):
@@ -1475,17 +1476,14 @@ class ActivityStreamAccess(BaseAccess):
         inventory_set = Inventory.accessible_objects(self.user, 'read_role')
         credential_set = Credential.accessible_objects(self.user, 'read_role')
         organization_set = Organization.accessible_objects(self.user, 'read_role')
+        admin_of_orgs = Organization.accessible_objects(self.user, 'admin_role')
         group_set = Group.objects.filter(inventory__in=inventory_set)
         project_set = Project.accessible_objects(self.user, 'read_role')
         jt_set = JobTemplate.accessible_objects(self.user, 'read_role')
         team_set = Team.accessible_objects(self.user, 'read_role')
 
-        ad_hoc_results = qs.filter(
-            ad_hoc_command__inventory__in=inventory_set,
-            ad_hoc_command__credential__in=credential_set
-        )
-
-        global_results = qs.filter(
+        return qs.filter(
+            Q(ad_hoc_command__inventory__in=inventory_set) |
             Q(user__in=organization_set.values('member_role__members')) |
             Q(user=self.user) |
             Q(organization__in=organization_set) |
@@ -1500,13 +1498,11 @@ class ActivityStreamAccess(BaseAccess):
             Q(project_update__project__in=project_set) |
             Q(job_template__in=jt_set) |
             Q(job__job_template__in=jt_set) |
-            Q(notification_template__organization__admin_role__members__in=[self.user]) |
-            Q(notification__notification_template__organization__admin_role__members__in=[self.user]) |
+            Q(notification_template__organization__in=admin_of_orgs) |
+            Q(notification__notification_template__organization__in=admin_of_orgs) |
             Q(label__organization__in=organization_set) |
             Q(role__in=Role.visible_roles(self.user))
-        )
-
-        return (ad_hoc_results | global_results).distinct()
+        ).distinct()
 
     def can_add(self, data):
         return False