diff --git a/app/main/views/platform_admin.py b/app/main/views/platform_admin.py index 1259c7e5c..b2bd773b4 100644 --- a/app/main/views/platform_admin.py +++ b/app/main/views/platform_admin.py @@ -245,33 +245,6 @@ def live_services_csv(): } -@main.route("/platform-admin/reports/performance-platform.xlsx") -@user_is_platform_admin -def performance_platform_xlsx(): - 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" if row["live_date"] else None, - "govuk-notify", - 1 - ]) - - return Spreadsheet.from_rows(live_services_data).as_excel_file, 200, { - 'Content-Type': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', - 'Content-Disposition': 'attachment; filename="{} performance platform report.xlsx"'.format( - format_date_numeric(datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%fZ")), - ) - } - - @main.route("/platform-admin/reports/notifications-sent-by-service", methods=['GET', 'POST']) @user_is_platform_admin def notifications_sent_by_service(): diff --git a/app/navigation.py b/app/navigation.py index a3bd4c29f..28ce97c59 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -96,7 +96,6 @@ class HeaderNavigation(Navigation): 'live_services', 'live_services_csv', 'notifications_sent_by_service', - 'performance_platform_xlsx', 'usage_for_all_services', 'organisations', 'platform_admin', @@ -650,7 +649,6 @@ class MainNavigation(Navigation): 'organisation_settings', 'organisations', 'performance', - 'performance_platform_xlsx', 'platform_admin', 'platform_admin_list_complaints', 'platform_admin_reports', @@ -919,7 +917,6 @@ class CaseworkNavigation(Navigation): 'organisation_settings', 'organisations', 'performance', - 'performance_platform_xlsx', 'platform_admin_list_complaints', 'platform_admin_reports', 'platform_admin_returned_letters', @@ -1239,7 +1236,6 @@ class OrgNavigation(Navigation): 'old_using_notify', 'organisations', 'performance', - 'performance_platform_xlsx', 'platform_admin', 'platform_admin_list_complaints', 'platform_admin_reports', diff --git a/app/templates/views/platform-admin/reports.html b/app/templates/views/platform-admin/reports.html index 999f418b8..da3b94cd4 100644 --- a/app/templates/views/platform-admin/reports.html +++ b/app/templates/views/platform-admin/reports.html @@ -13,14 +13,9 @@

Download live services csv report

- -

- Download performance platform report (.xlsx) -

-

Monthly notification statuses for live services -

+

Usage for all services

diff --git a/tests/app/main/views/test_platform_admin.py b/tests/app/main/views/test_platform_admin.py index bff8eb62c..a77049530 100644 --- a/tests/app/main/views/test_platform_admin.py +++ b/tests/app/main/views/test_platform_admin.py @@ -4,7 +4,6 @@ import uuid from functools import partial from unittest.mock import ANY, call -import pyexcel import pytest from bs4 import BeautifulSoup from flask import url_for @@ -760,10 +759,6 @@ def test_reports_page( 'a', text="Download live services csv report" ).attrs['href'] == '/platform-admin/reports/live-services.csv' - assert page.find( - 'a', text="Download performance platform report (.xlsx)" - ).attrs['href'] == '/platform-admin/reports/performance-platform.xlsx' - assert page.find( 'a', text="Monthly notification statuses for live services" ).attrs['href'] == url_for('main.notifications_sent_by_service') @@ -803,35 +798,6 @@ def test_get_live_services_report(platform_admin_client, mocker): ) -def test_get_performance_platform_report(platform_admin_client, mocker): - - mocker.patch( - 'app.service_api_client.get_live_services_data', - return_value={'data': [ - {'service_id': 'abc123', 'service_name': 'jessie the oak tree', 'organisation_name': 'Forest', - 'consent_to_research': True, 'contact_name': 'Forest fairy', 'organisation_type': 'Ecosystem', - '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': 'def456', 'service_name': 'james the pine tree', 'organisation_name': 'Forest', - 'consent_to_research': None, 'contact_name': None, 'organisation_type': 'Ecosystem', - 'contact_email': None, 'contact_mobile': None, - 'live_date': None, 'sms_volume_intent': None, 'email_volume_intent': 60, - 'letter_volume_intent': 0, 'sms_totals': 0, 'email_totals': 0, 'letter_totals': 0}, - ]} - ) - response = platform_admin_client.get(url_for('main.performance_platform_xlsx')) - assert response.status_code == 200 - assert pyexcel.get_array( - file_type='xlsx', - file_stream=response.get_data(), - ) == [ - ['service_id', 'agency', 'service_name', '_timestamp', 'service', 'count'], - ['abc123', 'Forest', 'jessie the oak tree', '2014-03-29T00:00:00Z', 'govuk-notify', 1], - ['def456', 'Forest', 'james the pine tree', '', 'govuk-notify', 1], - ] - - def test_get_notifications_sent_by_service_shows_date_form(client_request, platform_admin_user): client_request.login(platform_admin_user) page = client_request.get('main.notifications_sent_by_service')