add support for WHERE filters coming from count endpoints #259

ral-facilities · Nov 19, 2021 · f9d1e57 · f9d1e57
1 parent f56465c
commit f9d1e57
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/datagateway_api/src/search_api/query_filter_factory.py b/datagateway_api/src/search_api/query_filter_factory.py
@@ -104,22 +104,20 @@ def get_query_filter(request_filter):
                     raise FilterError(
                         "No valid filter name given within filter query param",
                     )
-
-            return query_filters
         elif query_param_name == "where":
             # For the count endpoints
-            """
             query_filters.extend(
                 SearchAPIQueryFilterFactory.get_query_filter(
-                    {"filter": related_model["scope"]},
+                    {"filter": request_filter},
                 ),
-            ),
-            """
+            )
         else:
             raise FilterError(
                 f"Bad filter, please check query parameters: {request_filter}",
             )
 
+        return query_filters
+
     @staticmethod
     def get_condition_values(filter_input):
         where_filter_data = []

diff --git a/test/search_api/test_search_api_query_filter_factory.py b/test/search_api/test_search_api_query_filter_factory.py
@@ -129,6 +129,15 @@ class TestSearchAPIQueryFilterFactory:
                 ["or", "or"],
                 id="OR, multiple conditions with operator",
             ),
+            pytest.param(
+                {"where": {"summary": {"like": "My Test Summary"}}},
+                1,
+                ["summary"],
+                ["like"],
+                ["My Test Summary"],
+                ["and"],
+                id="WHERE filter in syntax for count endpoints",
+            ),
         ],
     )
     def test_valid_where_filter(