darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-02 17:48:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

use service statistics endpoint instead of detailed service

Browse Source 
we're not actually looking at the detailed service aspects - just
the stats. We're doing this in three places:

* dashboard
* notification activity page
* when checking jobs to see if we're over the daily limit

change these places to use a new api endpoint (service/id/statistics),
which hopefully be a little more performant, and will definitely be a
little more organised - moving away from generic endpoints with loads
of optional parameters.

We still need the detailed endpoints for the platform admin page tho.

Depends on https://github.com/alphagov/notifications-api/pull/1865
This commit is contained in:
Leo Hemsted
2018-05-09 13:53:02 +01:00
parent e47a459757
commit 78a6f86043
11 changed files with 93 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/app/main/views/test_dashboard.py
View File

@@ -75,7 +75,7 @@ def test_get_started(
mocker,
mock_get_service_templates_when_no_templates_exist,
mock_get_jobs,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_usage,
mock_get_inbound_sms_summary
):
@@ -96,7 +96,7 @@ def test_get_started_is_hidden_once_templates_exist(
mocker,
mock_get_service_templates,
mock_get_jobs,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_usage,
mock_get_inbound_sms_summary
):
@@ -116,7 +116,7 @@ def test_inbound_messages_not_visible_to_service_without_permissions(
service_one,
mock_get_service_templates_when_no_templates_exist,
mock_get_jobs,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_template_statistics,
mock_get_usage,
mock_get_inbound_sms_summary
@@ -142,7 +142,7 @@ def test_inbound_messages_shows_count_of_messages(
service_one,
mock_get_service_templates_when_no_templates_exist,
mock_get_jobs,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_template_statistics,
mock_get_usage,
inbound_summary_mock,
@@ -177,7 +177,7 @@ def test_inbox_showing_inbound_messages(
service_one,
mock_get_service_templates_when_no_templates_exist,
mock_get_jobs,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_template_statistics,
mock_get_usage,
mock_get_most_recent_inbound_sms,
@@ -205,7 +205,7 @@ def test_get_inbound_sms_shows_page_links(
service_one,
mock_get_service_templates_when_no_templates_exist,
mock_get_jobs,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_template_statistics,
mock_get_usage,
mock_get_most_recent_inbound_sms,
@@ -226,7 +226,7 @@ def test_empty_inbox(
service_one,
mock_get_service_templates_when_no_templates_exist,
mock_get_jobs,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_template_statistics,
mock_get_usage,
mock_get_most_recent_inbound_sms_with_no_messages,
@@ -378,7 +378,7 @@ def test_should_show_recent_templates_on_dashboard(
mocker,
mock_get_service_templates,
mock_get_jobs,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_usage,
mock_get_inbound_sms_summary
):
@@ -539,7 +539,7 @@ def test_should_show_upcoming_jobs_on_dashboard(
logged_in_client,
mock_get_service_templates,
mock_get_template_statistics,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_jobs,
mock_get_usage,
mock_get_inbound_sms_summary
@@ -574,7 +574,7 @@ def test_correct_columns_display_on_dashboard(
client_request,
mock_get_service_templates,
mock_get_template_statistics,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_jobs,
service_one,
permissions,
@@ -637,7 +637,7 @@ def test_correct_font_size_for_big_numbers(
mocker,
mock_get_service_templates,
mock_get_template_statistics,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_jobs,
service_one,
permissions,
@@ -668,7 +668,7 @@ def test_should_show_recent_jobs_on_dashboard(
logged_in_client,
mock_get_service_templates,
mock_get_template_statistics,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_jobs,
mock_get_usage,
mock_get_inbound_sms_summary
@@ -837,7 +837,7 @@ def test_menu_send_messages(
mock_get_service_templates,
mock_get_jobs,
mock_get_template_statistics,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_usage,
mock_get_inbound_sms_summary,
mock_get_free_sms_fragment_limit,
@@ -869,7 +869,7 @@ def test_menu_manage_service(
mock_get_service_templates,
mock_get_jobs,
mock_get_template_statistics,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_usage,
mock_get_inbound_sms_summary,
mock_get_free_sms_fragment_limit,
@@ -900,7 +900,7 @@ def test_menu_manage_api_keys(
mock_get_service_templates,
mock_get_jobs,
mock_get_template_statistics,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_usage,
mock_get_inbound_sms_summary,
mock_get_free_sms_fragment_limit,
@@ -929,7 +929,7 @@ def test_menu_all_services_for_platform_admin_user(
mock_get_service_templates,
mock_get_jobs,
mock_get_template_statistics,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_usage,
mock_get_inbound_sms_summary,
mock_get_free_sms_fragment_limit,
@@ -960,7 +960,7 @@ def test_route_for_service_permissions(
mock_get_service_templates,
mock_get_jobs,
mock_get_template_statistics,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_usage,
mock_get_inbound_sms_summary
):
@@ -1004,7 +1004,7 @@ def test_service_dashboard_updates_gets_dashboard_totals(
logged_in_client,
mock_get_service_templates,
mock_get_template_statistics,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_jobs,
mock_get_usage,
mock_get_inbound_sms_summary
@@ -1229,7 +1229,7 @@ def test_get_tuples_of_financial_years_defaults_to_2015():
def test_should_show_all_jobs_with_valid_statuses(
logged_in_client,
mock_get_template_statistics,
mock_get_detailed_service,
mock_get_service_statistics,
mock_get_service_templates_when_no_templates_exist,
mock_get_jobs,
mock_get_usage,