darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 16:24:08 -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

70
tests/app/main/views/test_send.py
View File

@@ -361,7 +361,7 @@ def test_upload_csvfile_with_errors_shows_check_page_with_errors(
mock_get_service_template_with_placeholders,
mock_s3_upload,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
fake_uuid,
):
@@ -486,7 +486,7 @@ def test_upload_csvfile_with_missing_columns_shows_error(
mock_get_service_template_with_placeholders,
mock_s3_upload,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
service_one,
fake_uuid,
@@ -567,7 +567,7 @@ def test_upload_valid_csv_shows_preview_and_table(
mock_get_live_service,
mock_get_service_template_with_placeholders,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
mock_s3_set_metadata,
fake_uuid,
@@ -672,7 +672,7 @@ def test_file_name_truncated_to_fit_in_s3_metadata(
mock_get_live_service,
mock_get_service_template_with_placeholders,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
mock_s3_set_metadata,
fake_uuid,
@@ -713,7 +713,7 @@ def test_show_all_columns_if_there_are_duplicate_recipient_columns(
mock_get_live_service,
mock_get_service_template_with_placeholders,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
fake_uuid,
):
@@ -758,7 +758,7 @@ def test_404_for_previewing_a_row_out_of_range(
mock_get_live_service,
mock_get_service_template_with_placeholders,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
mock_s3_set_metadata,
fake_uuid,
@@ -794,7 +794,7 @@ def test_send_test_doesnt_show_file_contents(
mock_get_service_template,
mock_s3_upload,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
service_one,
fake_uuid,
):
@@ -828,7 +828,7 @@ def test_send_test_doesnt_show_file_contents(
def test_send_test_step_redirects_if_session_not_setup(
mocker,
logged_in_client,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_users_by_service,
fake_uuid,
endpoint,
@@ -1060,7 +1060,7 @@ def test_send_test_redirects_to_start_if_you_skip_steps(
mock_get_service_letter_template,
mock_s3_upload,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mocker,
endpoint,
expected_redirect,
@@ -1096,7 +1096,7 @@ def test_send_test_redirects_to_start_if_index_out_of_bounds_and_some_placeholde
mock_get_service_email_template,
mock_s3_download,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
endpoint,
expected_redirect,
):
@@ -1156,7 +1156,7 @@ def test_send_test_email_message_without_placeholders_redirects_to_check_page(
mock_get_service_email_template_without_placeholders,
mock_s3_upload,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
fake_uuid,
):
with logged_in_client.session_transaction() as session:
@@ -1236,7 +1236,7 @@ def test_send_test_letter_redirects_to_right_url(
mock_get_service_letter_template,
mock_s3_upload,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mocker,
):
@@ -1399,7 +1399,7 @@ def test_send_test_sms_message_puts_submitted_data_in_session(
service_one,
mock_get_service_template_with_placeholders,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
fake_uuid,
):
with logged_in_client.session_transaction() as session:
@@ -1434,7 +1434,7 @@ def test_send_test_works_as_letter_preview(
logged_in_platform_admin_client,
mock_get_service_letter_template,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
service_one,
fake_uuid,
mocker,
@@ -1521,7 +1521,7 @@ def test_upload_csvfile_with_valid_phone_shows_all_numbers(
logged_in_client,
mock_get_service_template,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_live_service,
mock_get_job_doesnt_exist,
mock_s3_set_metadata,
@@ -1563,7 +1563,7 @@ def test_upload_csvfile_with_valid_phone_shows_all_numbers(
assert '07700 900750' not in content
assert 'Only showing the first 50 rows' in content
mock_get_detailed_service_for_today.assert_called_once_with(service_one['id'])
mock_get_service_statistics.assert_called_once_with(service_one['id'], today_only=True)
@pytest.mark.parametrize('service_mock, should_allow_international', [
@@ -1578,7 +1578,7 @@ def test_upload_csvfile_with_international_validates(
mock_s3_upload,
mock_has_permissions,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
fake_uuid,
service_mock,
@@ -1610,7 +1610,7 @@ def test_test_message_can_only_be_sent_now(
mock_get_service_template,
mock_s3_download,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
mock_s3_set_metadata,
fake_uuid
@@ -1632,7 +1632,7 @@ def test_letter_can_only_be_sent_now(
service_one,
mock_get_service_letter_template,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_s3_set_metadata,
mock_get_job_doesnt_exist,
fake_uuid,
@@ -1744,7 +1744,7 @@ def test_should_show_preview_letter_message(
logged_in_platform_admin_client,
mock_get_service_letter_template,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
service_one,
fake_uuid,
@@ -1961,7 +1961,7 @@ def test_check_messages_back_link(
mock_get_users_by_service,
mock_get_service,
mock_has_permissions,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
mock_s3_download,
mock_s3_set_metadata,
@@ -2058,13 +2058,9 @@ def test_check_messages_shows_too_many_messages_errors(
mocker.patch('app.main.views.send.s3download', return_value=',\n'.join(
['phone number'] + ([mock_get_users_by_service(None)[0].mobile_number] * 100)
))
mocker.patch('app.service_api_client.get_detailed_service_for_today', return_value={
'data': {
'statistics': {
'sms': {'requested': num_requested, 'delivered': 0, 'failed': 0},
'email': {'requested': 0, 'delivered': 0, 'failed': 0}
}
}
mocker.patch('app.service_api_client.get_service_statistics', return_value={
'sms': {'requested': num_requested, 'delivered': 0, 'failed': 0},
'email': {'requested': 0, 'delivered': 0, 'failed': 0}
})
with logged_in_client.session_transaction() as session:
@@ -2100,7 +2096,7 @@ def test_check_messages_shows_trial_mode_error(
mock_get_service,
mock_get_service_template,
mock_has_permissions,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
fake_uuid,
mocker
@@ -2147,7 +2143,7 @@ def test_check_messages_shows_trial_mode_error_for_letters(
mock_get_service_letter_template,
mock_has_permissions,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
mock_s3_set_metadata,
fake_uuid,
@@ -2197,7 +2193,7 @@ def test_check_messages_shows_data_errors_before_trial_mode_errors_for_letters(
mock_get_service_letter_template,
mock_has_permissions,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
fake_uuid,
):
@@ -2238,7 +2234,7 @@ def test_check_messages_column_error_doesnt_show_optional_columns(
mock_has_permissions,
fake_uuid,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
):
@@ -2278,7 +2274,7 @@ def test_generate_test_letter_doesnt_block_in_trial_mode(
mock_has_permissions,
fake_uuid,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
mock_s3_set_metadata,
):
@@ -2317,7 +2313,7 @@ def test_check_messages_shows_over_max_row_error(
mock_get_service,
mock_get_service_template_with_placeholders,
mock_has_permissions,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
mock_s3_download,
fake_uuid,
@@ -2361,7 +2357,7 @@ def test_non_ascii_characters_in_letter_recipients_file_shows_error(
mock_get_live_service,
mock_has_permissions,
mock_get_service_letter_template,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
fake_uuid,
mocker
@@ -2732,7 +2728,7 @@ def test_reply_to_is_previewed_if_chosen(
mock_s3_download,
mock_s3_set_metadata,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
get_default_reply_to_email_address,
fake_uuid,
@@ -2782,7 +2778,7 @@ def test_sms_sender_is_previewed(
mock_s3_download,
mock_s3_set_metadata,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
mock_get_service_statistics,
mock_get_job_doesnt_exist,
get_default_sms_sender,
fake_uuid,