refactor: return empty list when filtering for non-public data #329

ral-facilities · Feb 16, 2022 · 5f65725 · 5f65725
1 parent d8725ab
commit 5f65725
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/datagateway_api/src/search_api/query_filter_factory.py b/datagateway_api/src/search_api/query_filter_factory.py
@@ -176,9 +176,14 @@ def get_where_filter(where_filter_input, entity_name):
                 where_filter_input,
             )
 
-            # Ignore filters on `isPublic`` fields as data is always public. This is
-            # hardcoded in the `models.py` module.
-            if field != "isPublic":
+            # Ignore filters on `isPublic`` fields as data is always public. Ensure that
+            # empty list is returned when filtering for non-public data.
+            if field == "isPublic":
+                value = not value if operation == "neq" else value
+                if not value:
+                    where_filters.append(SearchAPISkipFilter(1))
+                    where_filters.append(SearchAPILimitFilter(0))
+            else:
                 where_filters.append(SearchAPIWhereFilter(field, value, operation))
 
         return where_filters