For hour period, don't check 7 day timespan

alphagov · Oct 18, 2013 · aa4da37 · aa4da37
1 parent d7572d6
commit aa4da37
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/backdrop/read/validation.py b/backdrop/read/validation.py
@@ -222,7 +222,8 @@ def validate(self, request_args, context):
 
     def _is_valid_date_query(self, request_args):
         return _is_valid_date(request_args.get('start_at')) \
-            and _is_valid_date(request_args.get('end_at'))
+            and _is_valid_date(request_args.get('end_at')) \
+            and request_args.get('period') != 'hour'
 
 
 class MidnightValidator(Validator):

diff --git a/tests/read/test_validation.py b/tests/read/test_validation.py
@@ -375,6 +375,14 @@ def test_queries_spanning_less_than_seven_days_are_not_allowed(self):
             "The minimum time span for a query is 7 days"
         ))
 
+    def test_queries_for_hour_period_spanning_less_than_seven_days_are_allowed(self):
+        validation_result = validate_request_args({
+            'period': 'hour',
+            'start_at': '2000-02-02T00:00:00+00:00',
+            'end_at': '2000-02-08T00:00:00+00:00'
+        }, False)
+        assert_that(validation_result, is_valid())
+
 
 class TestValidationHelpers(TestCase):
     def test_timestamp_is_valid_method(self):