Add label and display name to recent nodes

redhat-exd-rebuilds · Jun 5, 2019 · 4e69b2b · 4e69b2b
1 parent e1398a0
commit 4e69b2b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 15 deletions.
diff --git a/estuary/utils/recents.py b/estuary/utils/recents.py
@@ -46,7 +46,10 @@ def get_recent_nodes():
             node_results = final_result_data.setdefault(label, [])
             # result is always a list of a single node
             node = inflate_node(result[0])
-            node_results.append(node.serialized)
+            serialized_node = node.serialized
+            serialized_node['resource_type'] = node.__label__
+            serialized_node['display_name'] = node.display_name
+            node_results.append(serialized_node)
             if node.__label__ not in id_dict:
                 id_dict[node.__label__] = node.unique_id_property
 

diff --git a/tests/api/test_recents.py b/tests/api/test_recents.py
@@ -31,7 +31,7 @@ def test_get_recent_nodes(client):
         'data': {
             'Advisory': [
                 {
-                    'advisory_name': None,
+                    'advisory_name': 'RHBA-2017:27760-01',
                     'update_date': '2017-05-30T11:44:38+00:00',
                     'issue_date': None,
                     'created_at': None,
@@ -45,15 +45,19 @@ def test_get_recent_nodes(client):
                     'status_time': None,
                     'actual_ship_date': None,
                     'release_date': None,
-                    'id': '66666'
+                    'id': '66666',
+                    'display_name': 'RHBA-2017:27760-01',
+                    'resource_type': 'Advisory'
                 }
             ],
             'DistGitCommit': [
                 {
                     'log_message': None,
                     'author_date': None,
                     'hash': '55555',
-                    'commit_date': '2017-05-02T11:44:38+00:00'
+                    'commit_date': '2017-05-02T11:44:38+00:00',
+                    'display_name': 'commit #55555',
+                    'resource_type': 'DistGitCommit'
                 }
             ],
             'FreshmakerEvent': [
@@ -63,21 +67,25 @@ def test_get_recent_nodes(client):
                     'id': '77777',
                     'state': None,
                     'event_type_id': None,
-                    'message_id': None
+                    'message_id': None,
+                    'display_name': 'Freshmaker event 77777',
+                    'resource_type': 'FreshmakerEvent'
                 }
             ],
             'KojiBuild': [
                 {
-                    'name': None,
+                    'name': 'slf4j',
                     'extra': None,
                     'start_time': None,
                     'creation_time': None,
                     'state': None,
                     'completion_time': '2017-05-27T11:44:38+00:00',
                     'epoch': None,
-                    'version': None,
-                    'release': None,
-                    'id': '44444'
+                    'version': '1.7.4',
+                    'release': '4.el7_4',
+                    'id': '44444',
+                    'display_name': 'slf4j-1.7.4-4.el7_4',
+                    'resource_type': 'KojiBuild'
                 }
             ],
             'BugzillaBug': [
@@ -94,7 +102,9 @@ def test_get_recent_nodes(client):
                     'priority': None,
                     'short_description': None,
                     'target_milestone': None,
-                    'id': '22222'
+                    'id': '22222',
+                    'display_name': 'RHBZ#22222',
+                    'resource_type': 'BugzillaBug'
                 },
                 {
                     'status': None,
@@ -109,7 +119,9 @@ def test_get_recent_nodes(client):
                     'priority': None,
                     'short_description': None,
                     'target_milestone': None,
-                    'id': '33333'
+                    'id': '33333',
+                    'display_name': 'RHBZ#33333',
+                    'resource_type': 'BugzillaBug'
                 },
                 {
                     'status': None,
@@ -124,7 +136,9 @@ def test_get_recent_nodes(client):
                     'priority': None,
                     'short_description': None,
                     'target_milestone': None,
-                    'id': '11111'
+                    'id': '11111',
+                    'display_name': 'RHBZ#11111',
+                    'resource_type': 'BugzillaBug'
                 }
             ]
         },
@@ -148,15 +162,19 @@ def test_get_recent_nodes(client):
     })
     KojiBuild.get_or_create({
         'id_': '44444',
-        'completion_time': datetime(2017, 5, 27, 11, 44, 38)
+        'completion_time': datetime(2017, 5, 27, 11, 44, 38),
+        'name': 'slf4j',
+        'version': '1.7.4',
+        'release': '4.el7_4'
     })
     DistGitCommit.get_or_create({
         'hash_': '55555',
         'commit_date': datetime(2017, 5, 2, 11, 44, 38)
     })
     Advisory.get_or_create({
         'id_': '66666',
-        'update_date': datetime(2017, 5, 30, 11, 44, 38)
+        'update_date': datetime(2017, 5, 30, 11, 44, 38),
+        'advisory_name': 'RHBA-2017:27760-01'
     })
     FreshmakerEvent.get_or_create({
         'id_': '77777'

diff --git a/tests/utils/test_recents.py b/tests/utils/test_recents.py
@@ -46,7 +46,6 @@ def test_get_recent_nodes():
     })
 
     nodes, meta = estuary.utils.recents.get_recent_nodes()
-
     assert nodes['Advisory'][0]['id'] == '66666'
     assert nodes['DistGitCommit'][0]['hash'] == '55555'
     assert nodes['FreshmakerEvent'][0]['id'] == '77777'