From b1e1ec57efb3339f77f25d6dfb564b5d131a80c4 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Nov 02 2018 14:00:56 +0000 Subject: Return shorter list of builds in /api/1/events. --- diff --git a/freshmaker/models.py b/freshmaker/models.py index eeefe3e..9a4a802 100644 --- a/freshmaker/models.py +++ b/freshmaker/models.py @@ -338,7 +338,7 @@ class Event(FreshmakerBase): "url": event_url, "dry_run": self.dry_run, "requester": self.requester, - "builds": [b.json() for b in self.builds], + "builds": [b.short_json() for b in self.builds], } def find_dependent_events(self): @@ -531,6 +531,18 @@ class ArtifactBuild(FreshmakerBase): self.name, ArtifactType(self.type).name, ArtifactBuildState(self.state).name, self.event.message_id) + def short_json(self): + """ + Returns the short JSON representation of the ArtifactBuild containing + just `id`, `name`, `build_id` and `state`. + """ + return { + "id": self.id, + "state": self.state, + "build_id": self.build_id, + "name": self.name, + } + def json(self): build_args = {} if self.build_args: diff --git a/tests/test_views.py b/tests/test_views.py index 0797041..07c6662 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -313,7 +313,11 @@ class TestViews(helpers.ModelsTestCase): self.assertEqual(data['message_id'], '2017-00000000-0000-0000-0000-000000000001') self.assertEqual(data['search_key'], 'RHSA-2018-101') self.assertEqual(data['event_type_id'], models.EVENT_TYPES[events.TestingEvent]) - self.assertEqual(len(data['builds']), 3) + self.assertEqual( + data["builds"], [ + {'build_id': 1234, 'state': 0, 'id': 1, 'name': 'ed'}, + {'build_id': 1235, 'state': 0, 'id': 2, 'name': 'mksh'}, + {'build_id': 1236, 'state': 0, 'id': 3, 'name': 'bash'}]) def test_query_events(self): resp = self.client.get('/api/1/events/')