Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions geonode/api/resourcebase_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,6 @@ def build_filters(self, filters=None, ignore_bad_filters=False, **kwargs):
if "app_type__in" in filters:
orm_filters.update({"resource_type": filters["app_type__in"].lower()})

_metadata = {f"metadata__{_k}": _v for _k, _v in filters.items() if _k.startswith("metadata__")}
if _metadata:
orm_filters.update({"metadata_filters": _metadata})

if "extent" in filters:
orm_filters.update({"extent": filters["extent"]})
orm_filters["f_method"] = filters["f_method"] if "f_method" in filters else "and"
Expand All @@ -165,7 +161,6 @@ def apply_filters(self, request, applicable_filters):
keywords = applicable_filters.pop("keywords__slug__in", None)
metadata_only = applicable_filters.pop("metadata_only", False)
filtering_method = applicable_filters.pop("f_method", "and")
metadata_filters = applicable_filters.pop("metadata_filters", None)
if filtering_method == "or":
filters = Q()
for f in applicable_filters.items():
Expand Down Expand Up @@ -207,9 +202,6 @@ def apply_filters(self, request, applicable_filters):
if keywords:
filtered = self.filter_h_keywords(filtered, keywords)

if metadata_filters:
filtered = filtered.filter(**metadata_filters)

# return filtered
return get_visible_resources(
filtered,
Expand Down
32 changes: 0 additions & 32 deletions geonode/api/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
from geonode.layers.models import Dataset
from geonode.documents.models import Document
from geonode.base.models import (
ExtraMetadata,
Thesaurus,
ThesaurusLabel,
ThesaurusKeyword,
Expand Down Expand Up @@ -535,37 +534,6 @@ def test_category_filters(self):
self.assertValidJSONResponse(resp)
self.assertEqual(len(self.deserialize(resp)["objects"]), 5)

def test_metadata_filters(self):
"""Test category filtering"""
_r = Dataset.objects.first()
_m = ExtraMetadata.objects.create(
resource=_r,
metadata={
"name": "metadata-updated",
"slug": "metadata-slug-updated",
"help_text": "this is the help text-updated",
"field_type": "str-updated",
"value": "my value-updated",
"category": "category",
},
)

list_url = reverse("api_dispatch_list", kwargs={"api_name": "api", "resource_name": "datasets"})
_r.metadata.add(_m)
# check we get the correct layers number returnered filtering on one
# and then two different categories
filter_url = f"{list_url}?metadata__category=category"

resp = self.api_client.get(filter_url)
self.assertValidJSONResponse(resp)
self.assertEqual(len(self.deserialize(resp)["objects"]), 1)

filter_url = f"{list_url}?metadata__category=not-existing-category"

resp = self.api_client.get(filter_url)
self.assertValidJSONResponse(resp)
self.assertEqual(len(self.deserialize(resp)["objects"]), 0)

def test_tag_filters(self):
"""Test keywords filtering"""
list_url = reverse("api_dispatch_list", kwargs={"api_name": "api", "resource_name": "datasets"})
Expand Down
Loading
Loading