Update Catalog manager methods and use subquery in viewset

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>

Author: MyPyDavid

rdmo/projects/viewsets.py

@@ -920,4 +920,13 @@ class CatalogViewSet(ListModelMixin, GenericViewSet):
     serializer_class = CatalogSerializer
 
     def get_queryset(self):
-        return Catalog.objects.for_projects_view(self.request.user)
+        queryset = (
+            Catalog.objects.filter_current_site().filter_group(self.request.user)
+        )
+        availability_subquery = Subquery(
+            queryset.filter_availability(self.request.user).values('pk')
+        )
+        return (
+            queryset.filter(Q(pk__in=availability_subquery) | Q(projects__user=self.request.user))
+            .order_by('-available', 'order', 'id').distinct()
+        )

rdmo/questions/managers.py

@@ -20,32 +20,12 @@ def prefetch_elements(self):
 
     def filter_for_user(self, user):
         return (
-            self
-                .filter_current_site()
+            self.filter_current_site()
                 .filter_group(user)
                 .filter_availability(user)
                 .order_by('-available', 'order')
         )
 
-    def for_projects_view(self, user):
-        qs = self.filter_current_site().filter_group(user)
-
-        available_ids = (
-            qs
-            .filter_availability(user)
-            .values('pk')
-        )
-
-        return (
-            qs
-            .filter(
-                models.Q(pk__in=available_ids) |
-                models.Q(projects__user=user)
-            )
-            .distinct()
-            .order_by('-available', 'order', 'id')
-        )
-
 
 class CatalogManager(CurrentSiteManagerMixin, GroupsManagerMixin, AvailabilityManagerMixin, models.Manager):
 
@@ -61,9 +41,6 @@ def prefetch_elements(self):
     def filter_for_user(self, user):
         return self.get_queryset().filter_for_user(user)
 
-    def for_projects_view(self, user):
-        return self.get_queryset().for_projects_view(user)
-
 
 class SectionQuerySet(models.QuerySet):