Merge pull request readthedocs#4322 from italia/fasterqsfiltering

Do less work in querysets
geeksambhu · Jul 3, 2018 · ab3b567 · ab3b567
2 parents f895af5 + 8d63db2
commit ab3b567
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/readthedocs/builds/querysets.py b/readthedocs/builds/querysets.py
@@ -86,7 +86,7 @@ def _add_user_repos(self, queryset, user=None):
             return self.all().distinct()
         if user.is_authenticated():
             user_queryset = get_objects_for_user(user, 'builds.view_version')
-            pks = [p.pk for p in user_queryset]
+            pks = user_queryset.values_list('pk', flat=True)
             queryset = self.filter(version__pk__in=pks) | queryset
         return queryset.distinct()
 
@@ -118,7 +118,7 @@ def _add_user_repos(self, queryset, user=None):
             return self.all().distinct()
         if user.is_authenticated():
             user_queryset = get_objects_for_user(user, 'builds.view_version')
-            pks = [p.pk for p in user_queryset]
+            pks = user_queryset.values_list('pk', flat=True)
             queryset = self.filter(
                 build__version__pk__in=pks) | queryset
         return queryset.distinct()

diff --git a/readthedocs/projects/querysets.py b/readthedocs/projects/querysets.py
@@ -86,7 +86,7 @@ def _add_user_repos(self, queryset, user=None):
         if user.is_authenticated():
             # Add in possible user-specific views
             project_qs = get_objects_for_user(user, 'projects.view_project')
-            pks = [p.pk for p in project_qs]
+            pks = project_qs.values_list('pk', flat=True)
             kwargs = {'%s__pk__in' % self.project_field: pks}
             queryset = self.filter(**kwargs) | queryset
         return queryset.distinct()