# 61 Filter backend

* refactors XYTableFilter classes to hold query_filter and checkbox_filter which are separate instances of django_filter.FilterSets
* improves render ability for frontend

konova/filters.py

@@ -19,8 +19,17 @@ class AbstractTableFilter(django_filters.FilterSet):
     """ TableFilter for Intervention model
 
     """
+    class Meta:
+        abstract = True
+
+    def __init__(self, user: User, *args, **kwargs):
+        self.user = user
+        super().__init__(*args, **kwargs)
+
+
+class KeywordTableFilterMixin(django_filters.FilterSet):
     q = django_filters.Filter(
-        method='_filter_by_keyword',
+        method='filter_by_keyword',
         # Since we use a custom search bar in the template, we need to 'render' this filter
         # as 'anonymous' HiddenInput (no id, no name). This way our custom search bar's id and name won't be
         # overwritten with these id and name (which would be equal)
@@ -31,11 +40,7 @@ class AbstractTableFilter(django_filters.FilterSet):
     class Meta:
         abstract = True
 
-    def __init__(self, user: User, *args, **kwargs):
-        self.user = user
-        super().__init__(*args, **kwargs)
-
-    def _filter_by_keyword(self, queryset, name, value) -> QuerySet:
+    def filter_by_keyword(self, queryset, name, value) -> QuerySet:
         """ Filters queryset depending on value of search bar input
 
         Args:
@@ -309,3 +314,17 @@ class RecordableTableFilterMixin(django_filters.FilterSet):
             )
         else:
             return queryset
+
+
+class QueryTableFilter(AbstractTableFilter, KeywordTableFilterMixin, GeoReferencedTableFilterMixin):
+    """ TableFilter holding different filter options for query related filtering
+
+    """
+    pass
+
+
+class CheckboxTableFilter(AbstractTableFilter, ShareableTableFilterMixin, RecordableTableFilterMixin):
+    """ TableFilter holding different filter options for checkbox related filtering
+
+    """
+    pass