csw should only display public datasets

metadata_catalogue/datasets/managers.py

@@ -11,7 +11,7 @@
 
 class DatasetQuerySet(models.QuerySet):
     def as_csw(self, *args, base_url="", warn=True, **kwargs):
-        logger.warn("DANGER: This method consumes the queryset and returns and array of items")
+        logger.warning("DANGER: This method consumes the queryset and returns and array of items")
         return [CSWMapping(instance, base_url) for instance in self]
 
     def csw_filter(self, filter):

metadata_catalogue/datasets/repository.py

@@ -1,5 +1,5 @@
 # from pycsw.core.repository import Repository
-from django.db.models import Max, Min
+from django.db.models import Max, Min, Q
 
 from metadata_catalogue.datasets.models import Dataset
 
@@ -9,6 +9,11 @@
 class DatasetsRepository:
     """Class to interact with underlying repository"""
 
+    def _get_queryset(self):
+        return Dataset.objects.select_related("metadata").exclude(
+            Q(metadata=None) | Q(public=False) | Q(metadata__xml="")
+        )
+
     def __init__(self, context, repo_filter=None):
         """Initialize repository"""
 
@@ -36,27 +41,33 @@ def __init__(self, context, repo_filter=None):
 
     def query_ids(self, ids):
         """Query by list of identifiers"""
-        return Dataset.objects.filter(uuid__in=ids).all().as_csw()
+        return self._get_queryset().filter(uuid__in=ids).all().as_csw()
 
     def query_insert(self, direction="max"):
         """Query to get latest (default) or earliest update to repository"""
         if direction == "min":
-            return Dataset.objects.aggregate(Min("last_modified_at"))["last_modified_at__min"].strftime(
-                "%Y-%m-%dT%H:%M:%SZ"
+            return (
+                self._get_queryset()
+                .aggregate(Min("last_modified_at"))["last_modified_at__min"]
+                .strftime("%Y-%m-%dT%H:%M:%SZ")
             )
-        return Dataset.objects.aggregate(Max("last_modified_at"))["last_modified_at__max"].strftime(
-            "%Y-%m-%dT%H:%M:%SZ"
+        return (
+            self._get_queryset()
+            .aggregate(Max("last_modified_at"))["last_modified_at__max"]
+            .strftime("%Y-%m-%dT%H:%M:%SZ")
         )
 
     def query_source(self, source):
         """Query by source"""
-        return Dataset.objects.filter(source=source)
+        return self._get_queryset().filter(source=source)
 
     def query(self, constraint, sortby=None, typenames=None, maxrecords=10, startposition=0):
         """Query records from underlying repository"""
         limit = int(maxrecords)
         offset = int(startposition)
-        query = Dataset.objects.csw_filter(constraint)
+        query = self._get_queryset().csw_filter(constraint)
         if sortby:
             query = query.csw_sort(sortby)
-        return [str(query.count()), query[offset : offset + limit].as_csw()]
+
+        csw = query[offset : offset + limit].as_csw()
+        return [str(query.count()), csw]