From 46e8a52f2b8666752d5c6c856b528d4c31f5fbb1 Mon Sep 17 00:00:00 2001 From: Pea Tyczynska Date: Tue, 30 Apr 2019 17:44:59 +0100 Subject: [PATCH] Add performance platform csv report and format live dates Drop redundant Response wrapper --- app/main/views/platform_admin.py | 54 ++++++++++++------- app/navigation.py | 4 ++ .../views/platform-admin/reports.html | 7 ++- tests/app/main/views/test_platform_admin.py | 47 +++++++++++++--- 4 files changed, 86 insertions(+), 26 deletions(-) diff --git a/app/main/views/platform_admin.py b/app/main/views/platform_admin.py index 6ca162a9c..dbab2bc3b 100644 --- a/app/main/views/platform_admin.py +++ b/app/main/views/platform_admin.py @@ -3,15 +3,7 @@ import re from collections import OrderedDict from datetime import datetime -from flask import ( - Response, - abort, - flash, - redirect, - render_template, - request, - url_for, -) +from flask import abort, flash, redirect, render_template, request, url_for from flask_login import login_required from notifications_python_client.errors import HTTPError from requests import RequestException @@ -227,7 +219,7 @@ def live_services_csv(): row["contact_name"], row["contact_email"], row["contact_mobile"], - row["live_date"], + datetime.strptime(row["live_date"], '%a, %d %b %Y %X %Z').strftime("%d-%m-%Y"), row["sms_volume_intent"], row["email_volume_intent"], row["letter_volume_intent"], @@ -235,15 +227,39 @@ def live_services_csv(): row["email_totals"], row["letter_totals"], ]) - return Response( - Spreadsheet.from_rows(live_services_data).as_csv_data, - mimetype='text/csv', - headers={ - 'Content-Disposition': 'inline; filename="{} live services report.csv"'.format( - format_date_numeric(datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%fZ")), - ) - } - ) + + return Spreadsheet.from_rows(live_services_data).as_csv_data, 200, { + 'Content-Type': 'text/csv; charset=utf-8', + 'Content-Disposition': 'inline; filename="{} live services report.csv"'.format( + format_date_numeric(datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%fZ")), + ) + } + + +@main.route("/platform-admin/reports/performance-platform.csv") +@login_required +@user_is_platform_admin +def performance_platform_csv(): + results = service_api_client.get_live_services_data()["data"] + live_services_columns = ["service_id", "agency", "service_name", "_timestamp", "service", "count"] + live_services_data = [] + live_services_data.append(live_services_columns) + for row in results: + live_services_data.append([ + row["service_id"], + row["organisation_name"], + row["service_name"], + datetime.strptime(row["live_date"], '%a, %d %b %Y %X %Z').strftime("%Y-%m-%dT%H:%M:%S") + "Z", + "govuk-notify", + 1 + ]) + + return Spreadsheet.from_rows(live_services_data).as_csv_data, 200, { + 'Content-Type': 'text/csv; charset=utf-8', + 'Content-Disposition': 'inline; filename="{} performance platform report.csv"'.format( + format_date_numeric(datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%fZ")), + ) + } @main.route("/platform-admin/complaints") diff --git a/app/navigation.py b/app/navigation.py index 5e48d310e..f1bccc292 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -87,6 +87,7 @@ class HeaderNavigation(Navigation): 'live_services', 'live_services_csv', 'organisations', + 'performance_platform_csv', 'platform_admin', 'platform_admin_letter_validation_preview', 'platform_admin_list_complaints', @@ -493,6 +494,7 @@ class MainNavigation(Navigation): 'organisation_preview_letter_branding', 'organisation_settings', 'organisations', + 'performance_platform_csv', 'platform_admin', 'platform_admin_letter_validation_preview', 'platform_admin_list_complaints', @@ -709,6 +711,7 @@ class CaseworkNavigation(Navigation): 'organisation_preview_letter_branding', 'organisation_settings', 'organisations', + 'performance_platform_csv', 'platform_admin_letter_validation_preview', 'platform_admin_list_complaints', 'platform_admin_reports', @@ -964,6 +967,7 @@ class OrgNavigation(Navigation): 'old_terms', 'old_using_notify', 'organisations', + 'performance_platform_csv', 'platform_admin', 'platform_admin_letter_validation_preview', 'platform_admin_list_complaints', diff --git a/app/templates/views/platform-admin/reports.html b/app/templates/views/platform-admin/reports.html index 7dff974b4..2135c388c 100644 --- a/app/templates/views/platform-admin/reports.html +++ b/app/templates/views/platform-admin/reports.html @@ -10,6 +10,11 @@ Reports -Download live services information sheet +

+ Download live services csv report +

+

+ Download performance platform csv report +

{% endblock %} diff --git a/tests/app/main/views/test_platform_admin.py b/tests/app/main/views/test_platform_admin.py index f62206091..a2dad89d4 100644 --- a/tests/app/main/views/test_platform_admin.py +++ b/tests/app/main/views/test_platform_admin.py @@ -940,8 +940,14 @@ def test_reports_page( response = client.get(url_for('main.platform_admin_reports')) assert response.status_code == 200 - page = response.get_data(as_text=True) - assert "Download live services information sheet" in page + page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') + assert page.find( + 'a', text="Download live services csv report" + ).attrs['href'] == '/platform-admin/reports/live-services.csv' + + assert page.find( + 'a', text="Download performance platform csv report" + ).attrs['href'] == '/platform-admin/reports/performance-platform.csv' def test_get_live_services_report(client, platform_admin_user, mocker): @@ -954,12 +960,12 @@ def test_get_live_services_report(client, platform_admin_user, mocker): {'service_id': 1, 'service_name': 'jessie the oak tree', 'organisation_name': 'Forest', 'consent_to_research': True, 'contact_name': 'Forest fairy', 'contact_email': 'forest.fairy@digital.cabinet-office.gov.uk', 'contact_mobile': '+447700900986', - 'live_date': '2014-03-29', 'sms_volume_intent': 100, 'email_volume_intent': 50, + 'live_date': 'Sat, 29 Mar 2014 00:00:00 GMT', 'sms_volume_intent': 100, 'email_volume_intent': 50, 'letter_volume_intent': 20, 'sms_totals': 300, 'email_totals': 1200, 'letter_totals': 0}, {'service_id': 2, 'service_name': 'james the pine tree', 'organisation_name': 'Forest', 'consent_to_research': None, 'contact_name': None, 'contact_email': None, 'contact_mobile': None, - 'live_date': '2015-03-26', 'sms_volume_intent': None, 'email_volume_intent': 60, + 'live_date': 'Tue, 15 Mar 2016 00:00:00 GMT', 'sms_volume_intent': None, 'email_volume_intent': 60, 'letter_volume_intent': 0, 'sms_totals': 0, 'email_totals': 0, 'letter_totals': 0}, ]} ) @@ -970,6 +976,35 @@ def test_get_live_services_report(client, platform_admin_user, mocker): 'Service ID,Organisation,Service name,Consent to research,Main contact,Contact email,Contact mobile,' + 'Live date,SMS volume intent,Email volume intent,Letter volume intent,SMS sent this year,' + 'Emails sent this year,Letters sent this year\r\n1,Forest,jessie the oak tree,True,Forest fairy,' - + 'forest.fairy@digital.cabinet-office.gov.uk,+447700900986,2014-03-29,100,50,20,300,1200,0\r\n2,Forest,' - + 'james the pine tree,,,,,2015-03-26,,60,0,0,0,0' + + 'forest.fairy@digital.cabinet-office.gov.uk,+447700900986,29-03-2014,100,50,20,300,1200,0\r\n2,Forest,' + + 'james the pine tree,,,,,15-03-2016,,60,0,0,0,0' + ) + + +def test_get_performance_platform_report(client, platform_admin_user, mocker): + mock_get_user(mocker, user=platform_admin_user) + client.login(platform_admin_user) + + mocker.patch( + 'app.service_api_client.get_live_services_data', + return_value={'data': [ + {'service_id': 1, 'service_name': 'jessie the oak tree', 'organisation_name': 'Forest', + 'consent_to_research': True, 'contact_name': 'Forest fairy', + 'contact_email': 'forest.fairy@digital.cabinet-office.gov.uk', 'contact_mobile': '+447700900986', + 'live_date': 'Sat, 29 Mar 2014 00:00:00 GMT', 'sms_volume_intent': 100, 'email_volume_intent': 50, + 'letter_volume_intent': 20, 'sms_totals': 300, 'email_totals': 1200, 'letter_totals': 0}, + {'service_id': 2, 'service_name': 'james the pine tree', 'organisation_name': 'Forest', + 'consent_to_research': None, 'contact_name': None, + 'contact_email': None, 'contact_mobile': None, + 'live_date': 'Tue, 15 Mar 2016 00:00:00 GMT', 'sms_volume_intent': None, 'email_volume_intent': 60, + 'letter_volume_intent': 0, 'sms_totals': 0, 'email_totals': 0, 'letter_totals': 0}, + ]} + ) + response = client.get(url_for('main.performance_platform_csv')) + assert response.status_code == 200 + report = response.get_data(as_text=True) + assert report.strip() == ( + 'service_id,agency,service_name,_timestamp,service,count' + + '\r\n1,Forest,jessie the oak tree,2014-03-29T00:00:00Z,govuk-notify,1' + + '\r\n2,Forest,james the pine tree,2016-03-15T00:00:00Z,govuk-notify,1' )