GeoNode#10995 Faceting: allow AND filtering in API for tkeywords

geonode/base/api/filters.py

@@ -44,6 +44,23 @@ def filter_queryset(self, request, queryset, view):
         return queryset
 
 
+class TKeywordsFilter(BaseFilterBackend):
+    """
+    TKeywords are a ManyToMany relation but DREST can't handle AND filtering the way we need.
+    We'll be using "filter{tkeywords}" to have Resources having all of the  tkeywords
+
+    """
+
+    def filter_queryset(self, request, queryset, view):
+        f = request.GET.pop("filter{tkeywords}", None)
+        if f:
+            if not isinstance(f, list):
+                f = [f]
+            for v in f:
+                queryset = queryset.filter(tkeywords__id=v)
+        return queryset
+
+
 class FavoriteFilter(BaseFilterBackend):
     """
     Filter that only allows users to see their own objects.

geonode/base/api/views.py

@@ -67,7 +67,13 @@
 from geonode.thumbs.utils import _decode_base64, BASE64_PATTERN
 from geonode.groups.conf import settings as groups_settings
 from geonode.base.models import HierarchicalKeyword, Region, ResourceBase, TopicCategory, ThesaurusKeyword
-from geonode.base.api.filters import DynamicSearchFilter, ExtentFilter, FacetVisibleResourceFilter, FavoriteFilter
+from geonode.base.api.filters import (
+    DynamicSearchFilter,
+    ExtentFilter,
+    FacetVisibleResourceFilter,
+    FavoriteFilter,
+    TKeywordsFilter,
+)
 from geonode.groups.models import GroupProfile, GroupMember
 from geonode.people.utils import get_available_users
 from geonode.security.permissions import get_compact_perms_list, PermSpec, PermSpecCompact
@@ -346,6 +352,7 @@ class ResourceBaseViewSet(DynamicModelViewSet):
     authentication_classes = [SessionAuthentication, BasicAuthentication, OAuth2Authentication]
     permission_classes = [IsAuthenticatedOrReadOnly, UserHasPerms]
     filter_backends = [
+        TKeywordsFilter,
         DynamicFilterBackend,
         DynamicSortingFilter,
         DynamicSearchFilter,