darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 21:49:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

separate detailed and normal service_api_client.get_service

Browse Source 
to make it easier to mock and control return values
This commit is contained in:
Leo Hemsted
2016-07-20 11:46:29 +01:00
parent 3e6eedd079
commit 3ffd6c744c
8 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/main/views/dashboard.py
View File

@@ -148,8 +148,7 @@ def get_dashboard_partials(service_id):
lambda job: job['original_file_name'] != current_app.config['TEST_MESSAGE_FILENAME'],
job_api_client.get_job(service_id, limit_days=7)['data']
))
service = service_api_client.get_service(service_id, detailed=True)
service = service_api_client.get_detailed_service(service_id)
return {
'totals': render_template(
@@ -178,10 +177,10 @@ def get_dashboard_partials(service_id):
def get_dashboard_totals(service):
for msg_type in service['statistics']:
for msg_type in service['data']['statistics'].values():
msg_type['failed_percentage'] = get_formatted_percentage(msg_type['failed'], msg_type['requested'])
msg_type['show_warning'] = msg_type['failed_percentage'] > 3
return service['statistics']
msg_type['show_warning'] = float(msg_type['failed_percentage']) > 3
return service['data']['statistics']
def calculate_usage(usage):