konova/filters/mixins.py

@@ -145,20 +145,26 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet):
     class Meta:
         abstract = True
 
-    def _filter_parcel_reference(self, queryset, filter_q) -> QuerySet:
+    def _filter_parcel_reference(self, queryset, name, value, filter_value) -> QuerySet:
-        """ Filters the parcel entries by a given filter_q
+        """ Filters the parcel entries by a given filter_value.
+
+        filter_value may already include further filter annotations like 'xy__icontains'
 
         Args:
-            queryset (QuerySet): The queryset
+            queryset ():
-            filter_q (Q): The Q-style filter expression
+            name ():
+            value ():
+            filter_value ():
 
         Returns:
 
         """
+        _filter = {
+            filter_value: value
+        }
         matching_parcels = Parcel.objects.filter(
-            filter_q
+            **_filter
         )
-
         related_geoms = matching_parcels.values(
             "geometries"
         ).distinct()
@@ -179,9 +185,8 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet):
 
         """
         matching_districts = District.objects.filter(
-            Q(name__icontains=value) |
+            name__icontains=value
-            Q(key__icontains=value)
+        )
-        ).distinct()
         matching_parcels = Parcel.objects.filter(
             district__in=matching_districts
         )
@@ -204,10 +209,7 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet):
         Returns:
 
         """
-        queryset = self._filter_parcel_reference(
+        queryset = self._filter_parcel_reference(queryset, name, value, "parcel_group__name__icontains")
-            queryset,
-            Q(parcel_group__name__icontains=value) | Q(parcel_group__key__icontains=value),
-        )
         return queryset
 
     def filter_parcel(self, queryset, name, value) -> QuerySet:
@@ -222,10 +224,7 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet):
 
         """
         value = value.replace("-", "")
-        queryset = self._filter_parcel_reference(
+        queryset = self._filter_parcel_reference(queryset, name, value, "flr")
-            queryset,
-            Q(flr=value),
-        )
         return queryset
 
     def filter_parcel_counter(self, queryset, name, value) -> QuerySet:
@@ -240,10 +239,7 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet):
 
         """
         value = value.replace("-", "")
-        queryset = self._filter_parcel_reference(
+        queryset = self._filter_parcel_reference(queryset, name, value, "flrstck_zhlr")
-            queryset,
-            Q(flrstck_zhlr=value)
-        )
         return queryset
 
     def filter_parcel_number(self, queryset, name, value) -> QuerySet:
@@ -258,10 +254,7 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet):
 
         """
         value = value.replace("-", "")
-        queryset = self._filter_parcel_reference(
+        queryset = self._filter_parcel_reference(queryset, name, value, "flrstck_nnr")
-            queryset,
-            Q(flrstck_nnr=value),
-        )
         return queryset