Merge pull request #76 from uc-cdis/fix/timestamps

Fix/timestamps
uc-cdis · Jan 29, 2018 · daa0b73 · daa0b73
2 parents 62fae95 + 8e679eb
commit daa0b73
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -243,8 +243,8 @@ HTTP/1.1 200 OK
   "version": "ver_123",
   "urls": ["s3://endpointurl/bucket/key"],
   "hashes": {"md5": "8b9942cf415384b27cadf1f4d2d682e5"},
-  "created_date": "Fri, 17 Nov 2017 06:07:29 GMT",
-  "updated_date": "Fri, 17 Nov 2017 06:17:39 GMT"
+  "created_date": "2017-11-17T06:07:27.069524",
+  "updated_date": "2017-11-17T06:07:27.069524"
 }
 ```
 
@@ -331,8 +331,8 @@ HTTP/1.1 200 OK
   "version": "ver_123",
   "urls": ["s3://endpointurl/bucket/key"],
   "hashes": {"md5": "8b9942cf415384b27cadf1f4d2d682e5"},
-  "created_date": "Tue, 05 Dec 2017 21:02:59 GMT",
-  "updated_date": "Tue, 05 Dec 2017 21:02:59 GMT"
+  "created_date": "2017-12-05T21:02:59.05345",
+  "updated_date": "2017-12-05T21:02:59.05345"
 }
 ```
 
@@ -372,8 +372,8 @@ HTTP/1.1 200 OK
       "size": 123,
       "file_name": "abc.txt",
       "version": "ver_123",
-      "created_date": "Fri, 17 Nov 2017 06:11:18 GMT"
-      "updated_date": "Fri, 17 Nov 2017 06:11:18 GMT",
+      "created_date": "2017-11-17T06:11:18.01434"
+      "updated_date": "2017-11-17T06:11:18.01434",
       "urls": ["s3://endpointurl/bucket/key"]
     },
   "1":
@@ -385,8 +385,8 @@ HTTP/1.1 200 OK
       "rev": "fec0ce30", "size": 123,
       "file_name": "abc.txt",
       "version": "ver_123",
-      "created_date": "Fri, 17 Nov 2017 06:17:39 GMT",
-      "updated_date": "Fri, 17 Nov 2017 06:17:39 GMT",
+      "created_date": "2017-11-17T06:07:27.069524",
+      "updated_date": "2017-11-17T06:07:27.069524",
       "urls": ["s3://endpointurl/bucket/key"]
    }
 }

diff --git a/indexd/index/drivers/alchemy.py b/indexd/index/drivers/alchemy.py
@@ -351,8 +351,8 @@ def get(self, did):
             hashes = {h.hash_type: h.hash_value for h in record.hashes}
             metadata = {m.key: m.value for m in record.index_metadata}
 
-            created_date = record.created_date
-            updated_date = record.updated_date
+            created_date = record.created_date.isoformat()
+            updated_date = record.updated_date.isoformat()
 
             ret = {
                 'did': did,
@@ -517,8 +517,8 @@ def get_all_versions(self, did):
                 hashes = {h.hash_type: h.hash_value for h in record.hashes}
                 metadata = {m.key: m.value for m in record.index_metadata}
 
-                created_date = record.created_date
-                updated_date = record.updated_date
+                created_date = record.created_date.isoformat()
+                updated_date = record.updated_date.isoformat()
 
                 ret[idx] = {
                     'did': did,
@@ -574,8 +574,8 @@ def get_latest_version(self, did):
             urls = [u.url for u in record.urls]
             hashes = {h.hash_type: h.hash_value for h in record.hashes}
 
-            created_date = record.created_date
-            updated_date = record.updated_date
+            created_date = record.created_date.isoformat()
+            updated_date = record.updated_date.isoformat()
 
             ret = {
                 'did': did,

diff --git a/tests/test_driver_alchemy_crud.py b/tests/test_driver_alchemy_crud.py
@@ -358,8 +358,8 @@ def test_driver_get_record():
         assert record['rev'] == rev, 'record revision does not match'
         assert record['size'] == size, 'record size does not match'
         assert record['form'] == form, 'record form does not match'
-        assert record['created_date'] == created_date, 'created date does not match'
-        assert record['updated_date'] == updated_date, 'updated date does not match'
+        assert record['created_date'] == created_date.isoformat(), 'created date does not match'
+        assert record['updated_date'] == updated_date.isoformat(), 'updated date does not match'
 
 @util.removes('index.sq3')
 def test_driver_get_fails_with_no_records():
@@ -402,8 +402,8 @@ def test_driver_get_latest_version():
         assert record['rev'] == rev, 'record revision does not match'
         assert record['size'] == size, 'record size does not match'
         assert record['form'] == form, 'record form does not match'
-        assert record['created_date'] == created_date, 'created date does not match'
-        assert record['updated_date'] == updated_date, 'updated date does not match'
+        assert record['created_date'] == created_date.isoformat(), 'created date does not match'
+        assert record['updated_date'] == updated_date.isoformat(), 'updated date does not match'
 
 @util.removes('index.sq3')
 def test_driver_get_latest_version_with_no_record():
@@ -477,8 +477,8 @@ def test_driver_get_all_version():
             assert record['rev'] == revs[i], 'record revision does not match'
             assert record['size'] == size, 'record size does not match'
             assert record['form'] == form, 'record form does not match'
-            assert record['created_date'] == created_dates[i], 'created date does not match'
-            assert record['updated_date'] == updated_dates[i], 'updated date does not match'
+            assert record['created_date'] == created_dates[i].isoformat(), 'created date does not match'
+            assert record['updated_date'] == updated_dates[i].isoformat(), 'updated date does not match'
 
 @util.removes('index.sq3')
 def test_driver_get_all_version_with_no_record():