Merge 18444b4 into 05774e7

alphagov · Mar 3, 2016 · 30457d3 · 30457d3
2 parents 05774e7 + 18444b4
commit 30457d3
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 9 deletions.
diff --git a/backdrop/core/records.py b/backdrop/core/records.py
@@ -75,31 +75,62 @@ def parse_timestamps(record):
     >>> record
     {'_timestamp': 'invalid'}
     >>> error
-    '_timestamp is not a valid timestamp, it must be ISO8601'
+    'the _timestamp must be a date in the format yyyy-MM-ddT00:00:00Z'
+    >>> record, error = parse_timestamps({'_timestamp': '31-11-12T00:00:00'})
+    >>> record
+    {'_timestamp': '31-11-12T00:00:00'}
+    >>> error
+    '31-11-12T00:00:00 in the _timestamp field is not a valid date'
     >>> record, error = parse_timestamps({'_start_at': 'invalid'})
     >>> record
     {'_start_at': 'invalid'}
     >>> error
-    '_start_at is not a valid timestamp, it must be ISO8601'
+    '_start_at must be a date in the format yyyy-MM-ddT00:00:00Z'
+    >>> record, error = parse_timestamps({'_start_at': '31-11-12T00:00:00'})
+    >>> record
+    {'_start_at': '31-11-12T00:00:00'}
+    >>> error
+    '31-11-12T00:00:00 in the _start_at field is not a valid date'
+    >>> record, error = parse_timestamps({'_end_at': 'invalid'})
+    >>> record
+    {'_end_at': 'invalid'}
+    >>> error
+    '_end_at must be a date in the format yyyy-MM-ddT00:00:00Z'
+    >>> record, error = parse_timestamps({'_end_at': '31-11-12T00:00:00'})
+    >>> record
+    {'_end_at': '31-11-12T00:00:00'}
+    >>> error
+    '31-11-12T00:00:00 in the _end_at field is not a valid date'
     """
     error = None
     if '_timestamp' in record:
         try:
             record['_timestamp'] = parse_time_as_utc(record['_timestamp'])
-        except (TypeError, ValueError):
-            error = '_timestamp is not a valid timestamp, it must be ISO8601'
+        except TypeError:
+            error = 'the _timestamp must be a date in the format ' \
+                    'yyyy-MM-ddT00:00:00Z'
+        except ValueError:
+            error = '{} in the _timestamp field is not a valid date'.format(
+                record['_timestamp'])
 
     if '_start_at' in record:
         try:
             record['_start_at'] = parse_time_as_utc(record['_start_at'])
-        except (TypeError, ValueError):
-            error = '_start_at is not a valid timestamp, it must be ISO8601'
+        except TypeError:
+            error = '_start_at must be a date in the format ' \
+                    'yyyy-MM-ddT00:00:00Z'
+        except ValueError:
+            error = '{} in the _start_at field is not a valid date'.format(
+                record['_start_at'])
 
     if '_end_at' in record:
         try:
             record['_end_at'] = parse_time_as_utc(record['_end_at'])
-        except (TypeError, ValueError):
-            error = '_end_at is not a valid timestamp, it must be ISO8601'
+        except TypeError:
+            error = '_end_at must be a date in the format yyyy-MM-ddT00:00:00Z'
+        except ValueError:
+            error = '{} in the _end_at field is not a valid date'.format(
+                record['_end_at'])
 
     return (record, error)
 

diff --git a/tests/core/test_data_set.py b/tests/core/test_data_set.py
@@ -168,7 +168,7 @@ def test_store_returns_array_of_errors_if_errors(
             is_(True)
         )
         assert_that(
-            '_timestamp is not a valid timestamp, it must be ISO8601'
+            'the _timestamp must be a date in the format yyyy-MM-ddT00:00:00Z'
             in errors,
             is_(True)
         )