From 26080a37a249593076aabc4150840e1a660eb613 Mon Sep 17 00:00:00 2001 From: apiyo Date: Thu, 29 Sep 2022 16:23:22 +0300 Subject: [PATCH] Code clean up: Format job_start datetime --- docs/forms.rst | 2 +- onadata/libs/tests/utils/test_async_status.py | 8 ++++++-- onadata/libs/utils/async_status.py | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/forms.rst b/docs/forms.rst index d800626c1a..8b04cbb5e0 100644 --- a/docs/forms.rst +++ b/docs/forms.rst @@ -1651,6 +1651,6 @@ Response [ { "job_uuid": "256dcef5-1baa-48ee-83a3-f7100123f5d2", - "time_start": 1664372983.8631873 + "time_start": "2022-09-29T09:08:59" } ] diff --git a/onadata/libs/tests/utils/test_async_status.py b/onadata/libs/tests/utils/test_async_status.py index eac712fc57..2654aa2580 100644 --- a/onadata/libs/tests/utils/test_async_status.py +++ b/onadata/libs/tests/utils/test_async_status.py @@ -1,6 +1,7 @@ """ tests for celery asyncronous task utilities """ +from datetime import datetime from unittest.mock import MagicMock from celery import states @@ -44,6 +45,7 @@ def test_async_status(self): def test_get_active_tasks(self): """test get_active_tasks""" xform = XForm() + time_start = 1664372983.8631873 self.assertEqual( async_status.get_active_tasks( ['onadata.libs.utils.csv_import.submit_csv_async'], xform @@ -57,7 +59,7 @@ def test_get_active_tasks(self): { 'args': [None, xform.pk], 'id': '11', - 'time_start': '2021-02-26T03:28:19.512875-05:00', + 'time_start': time_start, 'name': 'onadata.libs.utils.csv_import.submit_csv_async', } ] @@ -70,5 +72,7 @@ def test_get_active_tasks(self): ['onadata.libs.utils.csv_import.submit_csv_async'], xform ), '[{"job_uuid": "11", "time_start"' - + ': "2021-02-26T03:28:19.512875-05:00"}]', + + ": \"" + + datetime.fromtimestamp(time_start).strftime("%Y-%m-%dT%H:%M:%S") + + "\"}]", ) diff --git a/onadata/libs/utils/async_status.py b/onadata/libs/utils/async_status.py index ec48e6f012..2f62f659ed 100644 --- a/onadata/libs/utils/async_status.py +++ b/onadata/libs/utils/async_status.py @@ -2,6 +2,7 @@ Utilities for celery asyncronous tasks """ import json +from datetime import datetime from typing import List from celery import states @@ -65,7 +66,9 @@ def get_active_tasks(task_names: List[str], xform: XForm): map( lambda i: { 'job_uuid': gettext(i['id']), - 'time_start': i['time_start'], + 'time_start': datetime.fromtimestamp(i["time_start"]).strftime( + "%Y-%m-%dT%H:%M:%S" + ), }, data, )