From 3ebca93d75b82a833e237637e97630040afe1e58 Mon Sep 17 00:00:00 2001 From: Luiz Carvalho Date: Mar 19 2020 18:03:20 +0000 Subject: Display event dependency in api/v2 fixes #463 Signed-off-by: Luiz Carvalho --- diff --git a/freshmaker/models.py b/freshmaker/models.py index c14939b..b0499c4 100644 --- a/freshmaker/models.py +++ b/freshmaker/models.py @@ -393,8 +393,6 @@ class Event(FreshmakerBase): def json(self): data = self._common_json() data['builds'] = [b.json() for b in self.builds] - data['depends_on_events'] = [event.id for event in self.event_dependencies] - data['depending_events'] = [event.id for event in self.depending_events] return data def json_min(self): @@ -427,6 +425,8 @@ class Event(FreshmakerBase): "requested_rebuilds": (self.requested_rebuilds.split(" ") if self.requested_rebuilds else []), "requester_metadata": self.requester_metadata_json, + "depends_on_events": [event.id for event in self.event_dependencies], + "depending_events": [event.id for event in self.depending_events], } def find_dependent_events(self): diff --git a/tests/test_models.py b/tests/test_models.py index d8fbdce..25f9fb1 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -205,6 +205,8 @@ class TestModels(helpers.ModelsTestCase): 'url': 'http://localhost:5001/api/1/events/1', 'requested_rebuilds': [], 'requester_metadata': {}, + 'depending_events': [], + 'depends_on_events': [], })