From 078756919ddc198f638b6645f2bf588f75775fa7 Mon Sep 17 00:00:00 2001 From: Adam Shimali Date: Wed, 27 Apr 2016 17:30:15 +0100 Subject: [PATCH] Add events to temporary history view for story sign off. --- app/service/rest.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/service/rest.py b/app/service/rest.py index 0d13d18b5..aed2ffad7 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -186,11 +186,12 @@ def _process_permissions(user, service, permission_groups): # tables. This is so product owner can pass stories as done @service.route('//history', methods=['GET']) def get_service_history(service_id): - from app.models import (Service, ApiKey, Template) + from app.models import (Service, ApiKey, Template, Event) from app.schemas import ( service_history_schema, api_key_history_schema, - template_history_schema + template_history_schema, + event_schema ) service_history = Service.get_history_model().query.filter_by(id=service_id).all() @@ -207,9 +208,13 @@ def get_service_history(service_id): template_history = Template.get_history_model().query.filter_by(service_id=service_id).all() template_data, errors = template_history_schema.dump(template_history, many=True) + events = Event.query.all() + events_data, errors = event_schema.dump(events, many=True) + data = { 'service_history': service_data, 'api_key_history': api_keys_data, - 'template_history': template_data} + 'template_history': template_data, + 'events': events_data} return jsonify(data=data)