Fix include/exclude multi filter to use Exist subquery

Author: stefanw

froide/account/admin.py

@@ -65,8 +65,10 @@ class TaggedUserAdmin(admin.ModelAdmin):
 class UserTagListFilter(MultiFilterMixin, TaggitListFilter):
     tag_class = TaggedUser
     title = "Tags"
-    parameter_name = "tags__slug"
+    parameter_name = "tag__slug"
     lookup_name = "__in"
+    related_model = TaggedUser
+    related_model_fk_field = "content_object"
 
 
 class AddToGroupForm(forms.Form):

froide/foirequest/admin.py

@@ -523,8 +523,10 @@ class DeliveryStatusInline(admin.TabularInline):
 class MessageTagsFilter(MultiFilterMixin, TaggitListFilter):
     tag_class = TaggedMessage
     title = "Tags"
-    parameter_name = "tags__slug"
+    parameter_name = "tag__slug"
     lookup_name = "__in"
+    related_model = TaggedMessage
+    related_model_fk_field = "content_object"
 
 
 @admin.register(FoiMessage)
@@ -610,6 +612,7 @@ def get_urls(self):
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)
+        qs = qs.select_related("request")
         qs = qs.prefetch_related("deliverystatus")
         return qs
 

froide/helper/admin_utils.py

@@ -317,6 +317,8 @@ def create_used_parameters(self):
 class MultiFilterMixin:
     template = "helper/admin/multi_filter.html"
     lookup_name = ""
+    related_model = None
+    related_model_fk_field = None
 
     def queryset(self, request, queryset):
         if request.GET.get(self.parameter_name):
@@ -329,12 +331,25 @@ def queryset(self, request, queryset):
     def get_q(cls, values, lookup):
         includes = [v for v in values if not v.startswith("~")]
         excludes = [v[1:] for v in values if v.startswith("~")]
+
+        if not lookup.endswith("__in"):
+            lookup += "__in"
+
+        def exists(values):
+            return models.Exists(
+                cls.related_model.objects.filter(
+                    **{
+                        cls.related_model_fk_field: models.OuterRef("id"),
+                        lookup: values,
+                    }
+                )
+            )
+
         q = models.Q()
         if includes:
-            for inc in includes:
-                q |= models.Q(**{lookup: [inc]})
+            q &= exists(includes)
         if excludes:
-            q &= ~models.Q(**{lookup: excludes})
+            q &= ~exists(excludes)
         return q
 
     def value_as_list(self):