Sort Freshmaker events by timestamps instead of by IDs in recents end…

…point
redhat-exd-rebuilds · Jul 26, 2019 · d434a83 · d434a83
1 parent 5744a60
commit d434a83
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/estuary/utils/recents.py b/estuary/utils/recents.py
@@ -22,7 +22,7 @@ def get_recent_nodes():
     :rtype: tuple
     """
     timestamp_dict = {
-        FreshmakerEvent.__label__: 'id',
+        FreshmakerEvent.__label__: 'time_created',
         BugzillaBug.__label__: 'modified_time',
         DistGitCommit.__label__: 'commit_date',
         KojiBuild.__label__: 'completion_time',

diff --git a/tests/api/test_recents.py b/tests/api/test_recents.py
@@ -21,7 +21,7 @@ def test_get_recent_nodes(client):
         Advisory.__label__: 'id'
     }
     timestamp_dict = {
-        FreshmakerEvent.__label__: 'id',
+        FreshmakerEvent.__label__: 'time_created',
         BugzillaBug.__label__: 'modified_time',
         DistGitCommit.__label__: 'commit_date',
         KojiBuild.__label__: 'completion_time',
@@ -78,19 +78,17 @@ def test_get_recent_nodes(client):
                 {
                     'state_reason': None,
                     'state_name': None,
-                    'time_created': None,
+                    'time_created': '2017-05-30T11:44:38Z',
                     'time_done': None,
                     'id': '77777',
                     'state': None,
                     'event_type_id': None,
                     'message_id': None,
                     'display_name': 'Freshmaker event 77777',
                     'resource_type': 'FreshmakerEvent',
-                    'time_created': None,
-                    'time_done': None,
                     'requested_builds': [],
                     'successful_koji_builds': [],
-                    'triggered_by_advisory': None
+                    'triggered_by_advisory': None,
                 }
             ],
             'KojiBuild': [
@@ -224,7 +222,8 @@ def test_get_recent_nodes(client):
         'advisory_name': 'RHBA-2017:27760-01'
     })
     FreshmakerEvent.get_or_create({
-        'id_': '77777'
+        'id_': '77777',
+        'time_created': datetime(2017, 5, 30, 11, 44, 38),
     })
 
     rv = client.get('/api/v1/recents')

diff --git a/tests/utils/test_recents.py b/tests/utils/test_recents.py
@@ -42,7 +42,8 @@ def test_get_recent_nodes():
         'update_date': None
     })
     FreshmakerEvent.get_or_create({
-        'id_': '77777'
+        'id_': '77777',
+        'time_created': datetime(2017, 5, 30, 11, 44, 38),
     })
 
     nodes, meta = estuary.utils.recents.get_recent_nodes()
@@ -62,7 +63,7 @@ def test_get_recent_nodes():
         Advisory.__label__: 'id'
     }
     timestamp_dict = {
-        FreshmakerEvent.__label__: 'id',
+        FreshmakerEvent.__label__: 'time_created',
         BugzillaBug.__label__: 'modified_time',
         DistGitCommit.__label__: 'commit_date',
         KojiBuild.__label__: 'completion_time',