Adding UTC to fetcher response

Author: huzaifams-svg

api/datalake_api/fetcher.py

@@ -11,6 +11,7 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under
 # the License.
+from datetime import datetime, timezone
 from mimetypes import guess_type
 from datalake.common import Metadata
 from datalake.common.errors import NoSuchDatalakeFile
@@ -76,6 +77,20 @@ def get_file(self, file_id):
         key = self._get_s3_key(file_id)
         fd = key['Body']
         j = json.loads(key['Metadata']['datalake'])
+        start_utc = j['start']
+        end_utc = j['end']
+
+        if start_utc:
+            start_utc = datetime.fromtimestamp(
+                start_utc / 1000.0, tz=timezone.utc
+            ).isoformat()
+        if end_utc:
+            end_utc = datetime.fromtimestamp(
+                end_utc / 1000.0, tz=timezone.utc
+            ).isoformat()
+        j['start_UTC'] = start_utc
+        j['end_UTC'] = end_utc
+
         metadata = Metadata(j)
         return ArchiveFile(fd, metadata)
 

api/tests/test_metadata.py

@@ -11,6 +11,7 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under
 # the License.
+from datetime import datetime, timezone
 import pytest
 import simplejson as json
 
@@ -32,7 +33,16 @@ def test_get_metadata(metadata_getter, s3_file_maker, random_metadata):
     res = metadata_getter('12345')
     assert res.status_code == 200
     assert res.content_type == 'application/json'
-    assert json.loads(res.data) == random_metadata
+    res_data = json.loads(res.data)
+    for k, v in random_metadata.items():
+        if k == 'start_UTC' or k == 'end_UTC':
+            if v: # Null case
+                expected_v_utc = datetime.fromtimestamp(
+                    v / 1000.0, tz=timezone.utc
+                ).isoformat()
+                assert expected_v_utc == res_data[k]
+        else:
+            assert v == res_data[k]
 
 
 def test_no_such_metadata(s3_bucket_maker, metadata_getter):