Covering mixins, pylover#182

mohadese-yousefi · Jun 5, 2019 · c0093f7 · c0093f7
1 parent fda03f9
commit c0093f7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/restfulpy/orm/mixins.py b/restfulpy/orm/mixins.py
@@ -250,8 +250,9 @@ def return_(e):
             not_ = value.startswith('!')
             groups = between_operator_match.groupdict()
             start, end = groups['min'].strip(), groups['max'].strip()
-            if not (start or end):
+            if not (start and end):
                 raise HTTPBadRequest('Invalid query string: %s' % value)
+
             expression = between(column, start, end)
             if not_:
                 expression = ~expression

diff --git a/tests/test_mixin_filtering.py b/tests/test_mixin_filtering.py
@@ -67,6 +67,15 @@ def test_filtering_mixin(db):
     with Context({'QUERY_STRING': 'id=BETWEEN(1,3)'}):
         assert FilteringObject.filter_by_request(query).count() == 3
 
+    # Not Between
+    with Context({'QUERY_STRING': 'id=!BETWEEN(1,5)'}):
+        assert FilteringObject.filter_by_request(query).count() == 1
+
+    # Bad Between
+    with pytest.raises(HTTPBadRequest), \
+            Context({'QUERY_STRING': 'id=BETWEEN(1,)'}):
+        FilteringObject.filter_by_request(query)
+
     # ==
     with Context({'QUERY_STRING': 'id=1'}):
         assert FilteringObject.filter_by_request(query).count() == 1