refactor: clean up SearchAPIQueryFilterFactory #259

ral-facilities · Dec 6, 2021 · 4134a16 · 4134a16
1 parent 605315c
commit 4134a16
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/datagateway_api/src/search_api/query_filter_factory.py b/datagateway_api/src/search_api/query_filter_factory.py
@@ -63,27 +63,23 @@ def get_where_filter(filter_input, entity_name):
         ):
             boolean_operator = list(filter_input.keys())[0]
             conditions = list(filter_input.values())[0]
-            test_where_filters = []
+            conditional_where_filters = []
 
             for condition in conditions:
                 # Could be nested AND/OR
                 where_filter = {
                     "filter": {"where": condition},
                 }
-                conditional_where_filters = SearchAPIQueryFilterFactory.get_query_filter(
-                    where_filter, entity_name,
+                conditional_where_filters.extend(
+                    SearchAPIQueryFilterFactory.get_query_filter(
+                        where_filter, entity_name,
+                    ),
                 )
-                # TODO - could just go to extend the function call?
-                test_where_filters.extend(conditional_where_filters)
-
-                # for conditional_where_filter in conditional_where_filters:
-                # conditional_where_filter.boolean_operator = boolean_operator
-                # where_filters.extend(conditional_where_filters)
-
-            print(f"test Cond where filters: {test_where_filters}")
 
             nested = NestedWhereFilters(
-                test_where_filters[:-1], test_where_filters[-1], boolean_operator,
+                conditional_where_filters[:-1],
+                conditional_where_filters[-1],
+                boolean_operator,
             )
             where_filters.append(nested)
         elif list(filter_input.keys())[0] == "text":