darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 01:41:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into noti-stats-cleanup

Browse Source
This commit is contained in:
Leo Hemsted
2016-08-23 09:49:12 +01:00
parent 8fb0ba56ed 0b73da94e7
commit 132addb181
34 changed files with 780 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/service/rest.py
View File

@@ -173,7 +173,7 @@ def get_service_provider_aggregate_statistics(service_id):
# tables. This is so product owner can pass stories as done
@service.route('/<uuid:service_id>/history', methods=['GET'])
def get_service_history(service_id):
from app.models import (Service, ApiKey, Template, Event)
from app.models import (Service, ApiKey, Template, TemplateHistory, Event)
from app.schemas import (
service_history_schema,
api_key_history_schema,
@@ -186,7 +186,7 @@ def get_service_history(service_id):
api_key_history = ApiKey.get_history_model().query.filter_by(service_id=service_id).all()
api_keys_data = api_key_history_schema.dump(api_key_history, many=True).data
template_history = Template.get_history_model().query.filter_by(service_id=service_id).all()
template_history = TemplateHistory.query.filter_by(service_id=service_id).all()
template_data, errors = template_history_schema.dump(template_history, many=True)
events = Event.query.all()