rework consequence queryset filtering

Author: jeriox

ephios/core/consequences.py

@@ -40,11 +40,14 @@ def consequence_handler_from_slug(slug):
 
 def editable_consequences(user):
     handlers = list(installed_consequence_handlers())
-    # qs = LocalConsequence.objects.all().select_related("user")
-    # for handler in handlers:
-    #     qs = handler.filter_queryset(qs, user)
-    qs = AbstractConsequence.objects.all()
-    return qs.filter(slug__in=map(operator.attrgetter("slug"), handlers)).distinct()
+    consequence_classes = AbstractConsequence.__subclasses__()
+
+    qs = AbstractConsequence.objects.filter(slug__in=map(operator.attrgetter("slug"), handlers)).distinct()
+    q_obj = Q()
+    for handler in handlers:
+        for ConcreteConsequence in consequence_classes:
+            q_obj = q_obj | ConcreteConsequence.filter_editable_by_user(handler, user)
+    return qs.filter(q_obj)
 
 
 def pending_consequences(user):
@@ -81,10 +84,9 @@ def render(cls, consequence):
         raise NotImplementedError
 
     @classmethod
-    def filter_queryset(cls, qs, user: UserProfile):
+    def filter_editable_by_user(cls, user: UserProfile) -> Q:
         """
-        Return a filtered that excludes consequences with the slug of this class that the user is not allowed to edit.
-        Consequences should also be annotated with values needed for rendering.
+        Return a Q object that include consequences with the slug of this class that the user is allowed to edit.
         """
         raise NotImplementedError
 
@@ -126,15 +128,12 @@ def render(cls, consequence):
         )
 
     @classmethod
-    def filter_queryset(cls, qs, user: UserProfile):
-        return qs.filter(
-            ~Q(slug=cls.slug)
-            | Q(
-                user__groups__in=get_objects_for_user(
+    def filter_editable_by_user(cls, user: UserProfile):
+        return Q(slug=cls.slug,
+                localconsequence__user__groups__in=get_objects_for_user(
                     user, "decide_workinghours_for_group", klass=Group
                 )
             )
-        )
 
 
 class QualificationConsequenceHandler(BaseConsequenceHandler):
@@ -215,25 +214,14 @@ def render(cls, consequence):
         return s
 
     @classmethod
-    def filter_queryset(cls, qs, user: UserProfile):
-        qs = qs.annotate(
-            qualification_id=Cast(KeyTransform("qualification_id", "data"), IntegerField()),
-            event_id=Cast(KeyTransform("event_id", "data"), IntegerField()),
-        ).annotate(
-            qualification_title=Subquery(
-                Qualification.objects.filter(id=OuterRef("qualification_id")).values("title")[:1]
-            ),
-            event_title=Subquery(Event.objects.filter(id=OuterRef("event_id")).values("title")[:1]),
-        )
-
-        return qs.filter(
-            ~Q(slug=cls.slug)
+    def filter_editable_by_user(cls, user: UserProfile):
+        return Q(slug=cls.slug) & Q(
             # Qualifications can be granted by people who...
-            | Q(  # are responsible for the event the consequence originated from, if applicable
-                event_id__in=get_objects_for_user(user, perms="change_event", klass=Event),
+            Q(  # are responsible for the event the consequence originated from, if applicable
+                data__event_id__in=get_objects_for_user(user, perms="change_event", klass=Event),
             )
             | Q(  # can edit the affected user anyway
-                user__in=get_objects_for_user(
+                localconsequence__user__in=get_objects_for_user(
                     user, perms="change_userprofile", klass=get_user_model()
                 )
             )

ephios/core/models/users.py

@@ -416,6 +416,10 @@ class Meta:
         verbose_name = _("Abstract consequence")
         verbose_name_plural = _("Abstract consequences")
 
+    @classmethod
+    def filter_editable_by_user(cls, handler, user):
+        raise NotImplementedError
+
     @property
     def handler(self):
         from ephios.core import consequences
@@ -491,6 +495,10 @@ class Meta:
         verbose_name = _("Local consequence")
         verbose_name_plural = _("Local consequences")
 
+    @classmethod
+    def filter_editable_by_user(cls, handler, user):
+        return handler.filter_editable_by_user(user)
+
     def participant_display_name(self):
         return self.user.display_name
 

ephios/plugins/federation/models.py

@@ -4,7 +4,9 @@
 import json
 from secrets import token_hex
 
+from django.contrib.contenttypes.models import ContentType
 from django.db import models
+from django.db.models import Q
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.safestring import mark_safe
@@ -172,6 +174,10 @@ class Meta:
         verbose_name = _("Federated consequence")
         verbose_name_plural = _("Federated consequences")
 
+    @classmethod
+    def filter_editable_by_user(cls, handler, user):
+        return Q(polymorphic_ctype=ContentType.objects.get_for_model(cls))
+
     def participant_display_name(self):
         return f"{self.federated_user.display_name} ({self.federated_user.federated_instance.name})"
 
@@ -199,7 +205,7 @@ def all_participations(self):
         return FederatedParticipation.objects.filter(federated_user=self.federated_user)
 
     def new_consequence(self) -> AbstractConsequence:
-        return FederatedConsequence()
+        return FederatedConsequence(federated_user=self.federated_user)
 
     def reverse_signup_action(self, shift):
         return reverse(