Test for filters being well formed #2714

data-serving/reusable-data-service/reusable_data_service/controller/case_controller.py

@@ -39,6 +39,9 @@ def list_cases(self, page: int = None, limit: int = None, filter: str = None):
         if validation_error is not None:
             return jsonify(validation_error), 400
         predicate = CaseController.parse_filter(filter)
+        if predicate is None:
+            validation_error = {"message:" "cannot understand query"}
+            return jsonify(validation_error), 422
         cases = self.store.fetch_cases(page, limit, predicate)
         count = self.store.count_cases(predicate)
         response = {"cases": cases, "total": count}
@@ -55,6 +58,8 @@ def parse_filter(filter: str) -> Filter:
         # split query on spaces
         components = filter.split(" ")
         filters = [CaseController.individual_filter(c) for c in components]
+        if None in filters:
+            return None
         if len(filters) == 1:
             return filters[0]
         else:
@@ -65,6 +70,8 @@ def individual_filter(term: str) -> Filter:
         """Turn a single property:value filter request into a filter object"""
         # keyword value pairs separated by colon
         (keyword, value) = term.split(":")
+        if len(keyword) == 0 or len(value) == 0:
+            return None
         # special case dateconfirmedbefore, dateconfirmedafter
         if keyword == "dateconfirmedbefore":
             return PropertyFilter(

data-serving/reusable-data-service/tests/test_case_end_to_end.py

@@ -144,3 +144,10 @@ def test_list_cases_no_matching_results(client_with_patched_mongo):
     assert response.status_code == 200
     assert len(response.json["cases"]) == 0
     assert response.json["total"] == 0
+
+
+def test_list_cases_with_bad_filter_rejected(client_with_patched_mongo):
+    response = client_with_patched_mongo.get(
+        f"/api/cases?q=country%3A"
+    )
+    assert response.status_code == 422