Merge pull request #267 from thenx/master

Fix #260 - SimpleType validation converts values

Author: jettify

aiohttp_admin/utils.py

@@ -47,7 +47,7 @@ def json_datetime_serial(obj):
 OptKey = partial(t.Key, optional=True)
 
 
-SimpleType = t.Int | t.Bool | t.String | t.Float
+SimpleType = t.IntRaw | t.Bool | t.String | t.FloatRaw
 Filter = t.Dict({
     OptKey('in'): t.List(SimpleType),
     OptKey('gt'): SimpleType,

tests/test_utils.py

@@ -6,7 +6,7 @@
 
 from aiohttp_admin.exceptions import JsonValidaitonError
 from aiohttp_admin.utils import (validate_query_structure, jsonify,
-                                 validate_payload, as_dict)
+                                 validate_payload, as_dict, SimpleType)
 
 
 def test_validate_query_empty_defaults():
@@ -33,6 +33,32 @@ def test_validate_query_all_possible_params():
     assert q == expected
 
 
+def test_simple_type():
+    assert 42 == SimpleType(42)
+    assert 13.37 == SimpleType(13.37)
+    assert True is SimpleType(True)
+    assert 'string' == SimpleType('string')
+    assert '42' == SimpleType('42')
+    assert '13.37' == SimpleType('13.37')
+
+
+def test_validate_query_numeric_string():
+    filters = {
+        'views': "20"
+    }
+
+    query = {'_page': 1,
+             '_perPage': 30,
+             '_sortField': 'id',
+             '_sortDir': 'DESC',
+             '_filters': json.dumps(filters)}
+    q = validate_query_structure(query)
+
+    expected = query.copy()
+    expected['_filters'] = filters
+    assert q == expected
+
+
 def test_validate_query_filters_is_not_json():
     query = {'_filters': 'foo'}