Merge branch 'fast-queries' into 'master'

Optimize some queries

Closes #320

See merge request !433

aleksis/apps/alsijil/models.py

@@ -171,22 +171,11 @@ class Documentation(CalendarEvent):
 
             doc = next(existing_documentations_event, None)
             if doc:
-                if (
-                    (incomplete and doc.topic)
-                    or (
-                        not request.user.has_perm(
-                            "alsijil.edit_participation_status_for_documentation_rule", doc
-                        )
-                        and not doc.participations.filter(
-                            person__pk=request.user.person.pk, absence_reason__isnull=False
-                        ).exists()
-                    )
-                    or (
-                        absences_exist
-                        and (
-                            not doc.participations.all()
-                            or not [d for d in doc.participations.all() if d.absence_reason]
-                        )
+                if (incomplete and doc.topic) or (
+                    absences_exist
+                    and (
+                        not doc.participations.all()
+                        or not [d for d in doc.participations.all() if d.absence_reason]
                     )
                 ):
                     continue

aleksis/apps/alsijil/schema/__init__.py

 from datetime import datetime
 
-from django.core.exceptions import PermissionDenied
 from django.db.models import BooleanField, ExpressionWrapper, Q
 
 import graphene
@@ -76,7 +75,13 @@ class Query(graphene.ObjectType):
 
     def resolve_documentations_by_course_id(root, info, course_id, **kwargs):
         documentations = Documentation.objects.filter(
-            Q(course__pk=course_id) | Q(amends__course__pk=course_id)
+            pk__in=Documentation.objects.filter(course_id=course_id)
+            .values_list("id", flat=True)
+            .union(
+                Documentation.objects.filter(amends__course_id=course_id).values_list(
+                    "id", flat=True
+                )
+            )
         )
         return documentations
 
@@ -112,7 +117,7 @@ class Query(graphene.ObjectType):
                 )
             )
         ):
-            raise PermissionDenied()
+            return []
 
         # Find all LessonEvents for all Lessons of this Course in this date range
         event_params = {
@@ -150,16 +155,22 @@ class Query(graphene.ObjectType):
         if person:
             person = Person.objects.get(pk=person)
             if not info.context.user.has_perm("core.view_person_rule", person):
-                raise PermissionDenied()
+                return []
         elif has_person(info.context.user):
             person = info.context.user.person
         else:
-            raise PermissionDenied()
+            return []
 
         return (
             Group.objects.for_current_school_term_or_all()
-            .filter(Q(members=person) | Q(owners=person) | Q(parent_groups__owners=person))
-            .distinct()
+            .filter(
+                pk__in=Group.objects.filter(members=person)
+                .values_list("id", flat=True)
+                .union(Group.objects.filter(owners=person).values_list("id", flat=True))
+                .union(
+                    Group.objects.filter(parent_groups__owners=person).values_list("id", flat=True)
+                )
+            )
             .annotate(
                 is_priority=ExpressionWrapper(
                     Q(group_type=get_site_preferences()["alsijil__group_type_priority_coursebook"]),
@@ -174,20 +185,24 @@ class Query(graphene.ObjectType):
         if person:
             person = Person.objects.get(pk=person)
             if not info.context.user.has_perm("core.view_person_rule", person):
-                raise PermissionDenied()
+                return []
         elif has_person(info.context.user):
             person = info.context.user.person
         else:
-            raise PermissionDenied()
+            return []
         return Course.objects.filter(
-            (
-                Q(teachers=person)
-                | Q(groups__members=person)
-                | Q(groups__owners=person)
-                | Q(groups__parent_groups__owners=person)
+            pk__in=(
+                Course.objects.filter(teachers=person)
+                .values_list("id", flat=True)
+                .union(Course.objects.filter(groups__members=person).values_list("id", flat=True))
+                .union(Course.objects.filter(groups__owners=person).values_list("id", flat=True))
+                .union(
+                    Course.objects.filter(groups__parent_groups__owners=person).values_list(
+                        "id", flat=True
+                    )
+                )
             )
-            & Q(groups__in=Group.objects.for_current_school_term_or_all())
-        ).distinct()
+        ).filter(groups__in=Group.objects.for_current_school_term_or_all())
 
     @staticmethod
     def resolve_absence_creation_persons(root, info, **kwargs):

aleksis/apps/alsijil/schema/documentation.py

@@ -108,7 +108,9 @@ class DocumentationType(PermissionsTypeMixin, DjangoFilterMixin, DjangoObjectTyp
             "alsijil.view_participation_status_for_documentation_rule", root
         ):
             if has_person(info.context.user):
-                return root.participations.filter(person=info.context.user.person)
+                return [
+                    p for p in root.participations.all() if p.person == info.context.user.person
+                ]
             return []
         return root.participations.all()