Merge pull request #283 from thenx/fix-280

Fix #277

Author: jettify

aiohttp_admin/backends/mongo_utils.py

@@ -1,4 +1,5 @@
 import re
+from collections import defaultdict
 import trafaret as t
 from trafaret.contrib.object_id import MongoId
 
@@ -11,21 +12,21 @@
 
 def op(filter, field, operation, value):
     if operation == 'in':
-        filter[field] = {'$in': value}
+        filter[field].update({'$in': value})
     elif operation == 'like':
-        filter[field] = {'$regex': '^{}'.format(re.escape(value))}
+        filter[field].update({'$regex': '^{}'.format(re.escape(value))})
     elif operation == 'eq':
-        filter[field] = {'$eq': value}
+        filter[field].update({'$eq': value})
     elif operation == 'ne':
-        filter[field] = {'$ne': value}
+        filter[field].update({'$ne': value})
     elif operation == 'le':
-        filter[field] = {'$lte': value}
+        filter[field].update({'$lte': value})
     elif operation == 'lt':
-        filter[field] = {'$lt': value}
+        filter[field].update({'$lt': value})
     elif operation == 'gt':
-        filter[field] = {'$gt': value}
+        filter[field].update({'$gt': value})
     elif operation == 'ge':
-        filter[field] = {'$gte': value}
+        filter[field].update({'$gte': value})
     else:
         raise ValueError('Operation not supported {}'.format(operation))
     return filter
@@ -82,7 +83,10 @@ def text_filter(query, value, schema):
                       if isinstance(s.trafaret, t.String)]
     query_list = []
     for column_name in string_columns:
-        query_list.append(op({}, column_name, "like", value))
+        query_list.append(op(defaultdict(lambda: {}),
+                             column_name,
+                             "like",
+                             value))
     query["$or"] = query_list
     return query
 
@@ -92,7 +96,7 @@ def text_filter(query, value, schema):
 # same level
 def create_filter(filter, schema):
     column_traf_map = {s.name: s.trafaret for s in schema.keys}
-    query = {}
+    query = defaultdict(lambda: {})
     for field_name, operation in filter.items():
         # case for special q filter, {"q": "text"}
         if field_name == MULTI_FIELD_TEXT_QUERY:

tests/test_rest.py

@@ -204,6 +204,10 @@ async def test_list_filtering(create_admin):
     resp = await client.list(resource, page=1, per_page=30, filters=filters)
     assert len(resp) == 9
 
+    filters = {'views': {'gt': 10, 'lt': 15}}
+    resp = await client.list(resource, page=1, per_page=30, filters=filters)
+    assert len(resp) == 4
+
     filters = {'views': {'ge': 15}}
     resp = await client.list(resource, page=1, per_page=30, filters=filters)
     assert len(resp) == 10