#18: Update filter factory

ral-facilities · Aug 14, 2019 · f7335c3 · f7335c3
1 parent 1382e9b
commit f7335c3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/common/database_helpers.py b/common/database_helpers.py
@@ -194,9 +194,14 @@ def get_query_filter(filter):
         """
         filter_name = list(filter)[0].lower()
         if filter_name == "where":
-            return WhereFilter(list(filter["where"])[0], filter["where"][list(filter["where"])[0]])
+            field = list(filter[filter_name].keys())[0]
+            operation = list(filter[filter_name][field].keys())[0]
+            value = filter[filter_name][field][operation]
+            return WhereFilter(field, value, operation)
         elif filter_name == "order":
-            return OrderFilter(filter["order"].split(" ")[0], filter["order"].split(" ")[1])
+            field = filter_name["order"].split(" ")[0]
+            direction = filter["order"].split(" ")[1]
+            return OrderFilter(field, direction)
         elif filter_name == "skip":
             return SkipFilter(filter["skip"])
         elif filter_name == "limit":