[Fixes #11847] Implement the option to hide resources from search and…

… catalogue listing

geonode/base/api/tests.py

@@ -2567,6 +2567,40 @@ def test_api_should_return_only_the_advertised_false_where_user_is_owner(self):
         dataset.delete()
         test_user_for_api.delete()
 
+    def test_api_should_filter_by_advertised_param(self):
+        """
+        If anonymous user, only the advertised resoruces whould be returned by the API.
+        """
+        dts = create_single_dataset("advertised_false")
+        dts.advertised = False
+        dts.save()
+        # should show the result based on the logic
+        url = reverse("base-resources-list")
+        payload = self.client.get(url)
+        prev_count = payload.json().get("total")
+        # the user can see only the advertised resources
+        self.assertEqual(ResourceBase.objects.filter(advertised=True).count(), prev_count)
+
+        payload = self.client.get(f"{url}?advertised=True")
+        # so if advertised is True, we dont see the advertised=False resource
+        new_count = payload.json().get("total")
+        # recheck the count
+        self.assertEqual(new_count, prev_count)
+
+        payload = self.client.get(f"{url}?advertised=False")
+        # so if advertised is False, we see only the resource with advertised==False
+        new_count = payload.json().get("total")
+        # recheck the count
+        self.assertEqual(new_count, 1)
+
+        # if all is requested, we will see all the resources
+        payload = self.client.get(f"{url}?advertised=all")
+        new_count = payload.json().get("total")
+        # recheck the count
+        self.assertEqual(new_count, prev_count + 1)
+
+        Dataset.objects.update(advertised=True)
+
 
 class TestExtraMetadataBaseApi(GeoNodeBaseTestSupport):
     def setUp(self):

geonode/base/api/views.py

@@ -383,22 +383,22 @@ def list(self, request, *args, **kwargs):
         # resources is generated
         user = request.user
         try:
-            _filter = request.query_params.get("filter{advertised}", "None")
-            advertised = strtobool(_filter) if _filter!='all' else 'all'
+            _filter = request.query_params.get("advertised", "None")
+            advertised = strtobool(_filter) if _filter.lower() != "all" else "all"
         except Exception:
             advertised = None
 
-        if advertised is not None and advertised != 'all':
+        if advertised is not None and advertised != "all":
             queryset = queryset.filter(advertised=advertised)
-
-        is_admin = user.is_superuser if user and user.is_authenticated else False
-
-        if advertised == 'all':
-            pass
-        elif not is_admin and user and not user.is_anonymous:
-            queryset = (queryset.filter(advertised=True) | queryset.filter(owner=user)).distinct()
-        elif not user or user.is_anonymous:
-            queryset = queryset.filter(advertised=True)
+        else:
+            is_admin = user.is_superuser if user and user.is_authenticated else False
+
+            if advertised == "all":
+                pass
+            elif not is_admin and user and not user.is_anonymous:
+                queryset = (queryset.filter(advertised=True) | queryset.filter(owner=user)).distinct()
+            elif not user or user.is_anonymous:
+                queryset = queryset.filter(advertised=True)
 
         page = self.paginate_queryset(queryset)
         if page is not None: