From ca1897973a1de97e1bf25e4178d69af97858d2b0 Mon Sep 17 00:00:00 2001 From: stvnrlly Date: Tue, 22 Nov 2022 17:03:42 -0500 Subject: [PATCH] test time fixes and bonus letter removal --- app/main/views/jobs.py | 12 -- app/main/views/notifications.py | 9 - app/main/views/send.py | 1 - app/main/views/uploads.py | 54 ------ app/models/job.py | 15 -- app/navigation.py | 2 - app/notify_client/upload_api_client.py | 12 +- app/templates/partials/jobs/status.html | 10 -- app/templates/views/dashboard/_jobs.html | 8 +- app/templates/views/jobs/job.html | 20 +-- .../views/notifications/notification.html | 40 ----- .../views/uploads/uploaded-letters.html | 37 ----- app/utils/letters.py | 30 ---- tests/app/main/views/test_jobs.py | 4 - tests/app/main/views/test_notifications.py | 4 - tests/app/main/views/test_send.py | 27 --- .../app/main/views/uploads/test_upload_hub.py | 154 +----------------- tests/app/test_navigation.py | 1 - tests/app/utils/test_letters.py | 69 -------- tests/conftest.py | 115 ------------- 20 files changed, 6 insertions(+), 618 deletions(-) delete mode 100644 app/templates/views/uploads/uploaded-letters.html diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index e667fcae6..9905c912f 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -35,10 +35,6 @@ from app.main.forms import SearchNotificationsForm from app.models.job import Job from app.utils import parse_filter_args, set_status_filters from app.utils.csv import generate_notifications_csv -from app.utils.letters import ( - get_letter_printing_statement, - printing_today_or_tomorrow, -) from app.utils.pagination import ( generate_next_dict, generate_previous_dict, @@ -66,11 +62,6 @@ def view_job(service_id, job_id): filter_args = parse_filter_args(request.args) filter_args['status'] = set_status_filters(filter_args) - just_sent_message = 'Your {} been sent. Printing starts {} at 5:30pm.'.format( - 'letter has' if job.notification_count == 1 else 'letters have', - printing_today_or_tomorrow(job.created_at) - ) - return render_template( 'views/jobs/job.html', job=job, @@ -82,8 +73,6 @@ def view_job(service_id, job_id): status=request.args.get('status', ''), ), partials=get_job_partials(job), - just_sent=request.args.get('just_sent') == 'yes', - just_sent_message=just_sent_message, ) @@ -426,7 +415,6 @@ def get_job_partials(job): 'status': render_template( 'partials/jobs/status.html', job=job, - letter_print_day=get_letter_printing_statement("created", job.created_at) ), } diff --git a/app/main/views/notifications.py b/app/main/views/notifications.py index fdde0f6bd..f4550d6ee 100644 --- a/app/main/views/notifications.py +++ b/app/main/views/notifications.py @@ -44,7 +44,6 @@ from app.utils import ( ) from app.utils.csv import generate_notifications_csv from app.utils.letters import ( - get_letter_printing_statement, get_letter_validation_error, ) from app.utils.templates import get_template @@ -120,7 +119,6 @@ def view_notification(service_id, notification_id): else: job = None - letter_print_day = get_letter_printing_statement(notification['status'], notification['created_at']) notification_created = parser.parse(notification['created_at']).replace(tzinfo=None) @@ -138,12 +136,6 @@ def view_notification(service_id, notification_id): service_id=current_service.id, job_id=request.args.get('from_job'), ) - elif request.args.get('from_uploaded_letters'): - back_link = url_for( - 'main.uploaded_letters', - service_id=current_service.id, - letter_print_day=request.args.get('from_uploaded_letters'), - ) else: back_link = url_for( 'main.view_notifications', @@ -185,7 +177,6 @@ def view_notification(service_id, notification_id): postage=notification['postage'], can_receive_inbound=(current_service.has_permission('inbound_sms')), is_precompiled_letter=notification['template']['is_precompiled_letter'], - letter_print_day=letter_print_day, show_cancel_button=show_cancel_button, sent_with_test_key=( notification.get('key_type') == KEY_TYPE_TEST diff --git a/app/main/views/send.py b/app/main/views/send.py index 0a1c6d7a1..68f4813ea 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -817,7 +817,6 @@ def start_job(service_id, upload_id): 'main.view_job', job_id=upload_id, service_id=service_id, - just_sent='yes', ) ) diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py index 1d27d79f2..1690e55ae 100644 --- a/app/main/views/uploads.py +++ b/app/main/views/uploads.py @@ -49,7 +49,6 @@ from app.template_previews import TemplatePreview, sanitise_letter from app.utils import unicode_truncate from app.utils.csv import Spreadsheet, get_errors_for_csv from app.utils.letters import ( - get_letter_printing_statement, get_letter_validation_error, ) from app.utils.pagination import ( @@ -95,59 +94,6 @@ def uploads(service_id): ) -@main.route("/services//uploaded-letters/") -@user_has_permissions() -def uploaded_letters(service_id, letter_print_day): - page = get_page_from_request() - if page is None: - abort(404, "Invalid page argument ({}).".format(request.args.get('page'))) - uploaded_letters = upload_api_client.get_letters_by_service_and_print_day( - current_service.id, letter_print_day=letter_print_day, page=page, - ) - - prev_page = None - if uploaded_letters['links'].get('prev'): - prev_page = generate_previous_dict('.uploaded_letters', service_id, page, url_args={ - 'letter_print_day': letter_print_day - }) - next_page = None - if uploaded_letters['links'].get('next'): - next_page = generate_next_dict('.uploaded_letters', service_id, page, url_args={ - 'letter_print_day': letter_print_day - }) - return render_template( - 'views/uploads/uploaded-letters.html', - notifications=add_preview_of_content_uploaded_letters( - uploaded_letters['notifications'] - ), - prev_page=prev_page, - next_page=next_page, - show_pagination=True, - total=uploaded_letters['total'], - letter_printing_statement=get_letter_printing_statement( - 'created', - letter_print_day, - ), - letter_print_day=letter_print_day, - single_notification_url=partial( - url_for, - '.view_notification', - service_id=current_service.id, - from_uploaded_letters=letter_print_day, - ) - ) - - -def add_preview_of_content_uploaded_letters(notifications): - - for notification in notifications: - yield(dict( - preview_of_content=', '.join(notification.pop('to').splitlines()), - to=notification['client_reference'], - **notification - )) - - @main.route("/services//upload-letter", methods=['GET', 'POST']) @user_has_permissions('send_messages') def upload_letter(service_id): diff --git a/app/models/job.py b/app/models/job.py index ac51424ff..9a5e6dc2c 100644 --- a/app/models/job.py +++ b/app/models/job.py @@ -14,7 +14,6 @@ from app.notify_client.job_api_client import job_api_client from app.notify_client.notification_api_client import notification_api_client from app.notify_client.service_api_client import service_api_client from app.utils import set_status_filters -from app.utils.letters import get_letter_printing_statement from app.utils.time import is_less_than_days_ago @@ -156,20 +155,6 @@ class Job(JSONModel): return True - @property - def letter_printing_statement(self): - if self.upload_type != 'letter_day': - raise TypeError() - return get_letter_printing_statement( - 'created', - # We have to make the time just before 5:30pm because a - # letter uploaded at 5:30pm will be printed the next day - ( - convert_utc_to_local_timezone(self.created_at) - timedelta(minutes=1) - ).astimezone(pytz.utc).isoformat(), - long_form=False, - ) - @cached_property def all_notifications(self): return self.get_notifications(set_status_filters({}))['notifications'] diff --git a/app/navigation.py b/app/navigation.py index cae6c19bc..7a0468508 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -178,7 +178,6 @@ class MainNavigation(Navigation): 'delete_contact_list', 'upload_letter', 'uploaded_letter_preview', - 'uploaded_letters', 'uploads', 'view_job', 'view_jobs', @@ -288,7 +287,6 @@ class CaseworkNavigation(Navigation): 'delete_contact_list', 'upload_letter', 'uploaded_letter_preview', - 'uploaded_letters', 'uploads', }, } diff --git a/app/notify_client/upload_api_client.py b/app/notify_client/upload_api_client.py index 33dedd87c..5a194180f 100644 --- a/app/notify_client/upload_api_client.py +++ b/app/notify_client/upload_api_client.py @@ -2,17 +2,7 @@ from app.notify_client import NotifyAdminAPIClient class UploadApiClient(NotifyAdminAPIClient): - - def get_letters_by_service_and_print_day( - self, - service_id, - *, - letter_print_day, - page=1, - ): - return self.get( - url=f'/service/{service_id}/upload/uploaded-letters/{letter_print_day}?page={page}' - ) + pass upload_api_client = UploadApiClient() diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index 86f360d39..d9b730b4f 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -3,21 +3,11 @@ {% if job.scheduled_for %} {% if job.processing_started %} Sent by {{ job.created_by.name }} on {{ job.processing_started|format_datetime_short }} - {% if job.template.template_type == "letter" %} -

- {{ letter_print_day }} -

- {% endif %} {% else %} Uploaded by {{ job.created_by.name }} on {{ job.created_at|format_datetime_short }} {% endif %} {% else %} Sent by {{ job.created_by.name }} on {{ job.created_at|format_datetime_short }} - {% if job.template.template_type == "letter" %} -

- {{ letter_print_day }} -

- {% endif %} {% endif %}

{% if job.status == 'sending limits exceeded'%} diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html index d58ec7ea2..94b5656ef 100644 --- a/app/templates/views/dashboard/_jobs.html +++ b/app/templates/views/dashboard/_jobs.html @@ -17,9 +17,7 @@ ) %} {% call row_heading() %}
- {% if item.upload_type == 'letter_day' %} - {{ item.original_file_name }} - {% elif item.upload_type == 'letter' %} + {% if item.upload_type == 'letter' %} {{ item.original_file_name }} {% elif item.upload_type == 'contact_list' %} {{ item.original_file_name }} @@ -46,10 +44,6 @@ {% else %} Not used yet {% endif %} - {% elif item.upload_type == 'letter_day' %} - - {{ item.letter_printing_statement }} - {% else %} Sent {{ diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html index 19277d36c..13f8c05eb 100644 --- a/app/templates/views/jobs/job.html +++ b/app/templates/views/jobs/job.html @@ -10,31 +10,17 @@ {% endblock %} {% block backLink %} - {% if not just_sent %} - {{ govukBackLink({ "href": url_for('main.uploads', service_id=current_service.id) }) }} - {% endif %} + {{ govukBackLink({ "href": url_for('main.uploads', service_id=current_service.id) }) }} {% endblock %} {% block maincolumn_content %} {{ page_header(job.original_file_name) }} - {% if just_sent and job.template_type == 'letter' %} - {{ banner(just_sent_message, type='default', with_tick=True) }} - {% else %} - {{ ajax_block(partials, updates_url, 'status', finished=job.processing_finished) }} - {% endif %} + {{ ajax_block(partials, updates_url, 'status', finished=job.processing_finished) }} {{ ajax_block(partials, updates_url, 'counts', finished=job.processing_finished) }} {{ ajax_block(partials, updates_url, 'notifications', finished=job.processing_finished) }} - {% if job.letter_job_can_be_cancelled %} -
-
- - Cancel sending these letters - - {% else %} -
 
- {% endif %} +
 
{% endblock %} diff --git a/app/templates/views/notifications/notification.html b/app/templates/views/notifications/notification.html index f8d92213c..cc0405b49 100644 --- a/app/templates/views/notifications/notification.html +++ b/app/templates/views/notifications/notification.html @@ -46,46 +46,6 @@ {{ created_at|format_datetime_human }}

- {% if template.template_type == 'letter' %} - {% if notification_status == 'cancelled' %} -

- Cancelled {{ updated_at|format_datetime_short }} -

- {% elif notification_status == 'validation-failed' %} -

- {{ message.summary | safe }} -

- {% elif notification_status == 'permanent-failure' %} -

- Permanent failure – The provider cannot print the letter. Your letter will not be dispatched. -

- {% elif notification_status == 'technical-failure' %} -

- Technical failure – Notify will resend once the team have - fixed the problem -

- {% else %} - {% if sent_with_test_key %} - {% if is_precompiled_letter %} -

- This letter passed our checks, but we will not print it because you used a test key. -

- {% else %} -

- We will not print this letter because you used a test key. -

- {% endif %} - {% else %} -

- {{ letter_print_day }} -

-

- Estimated delivery date: {{ estimated_letter_delivery_date|format_day_of_week }} {{ estimated_letter_delivery_date|format_date_short }} -

- {% endif %} - {% endif %} - {% endif %} -
{{ template|string }}
diff --git a/app/templates/views/uploads/uploaded-letters.html b/app/templates/views/uploads/uploaded-letters.html deleted file mode 100644 index 2f8b732d5..000000000 --- a/app/templates/views/uploads/uploaded-letters.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "withnav_template.html" %} -{% from "components/page-header.html" import page_header %} -{% from "components/back-link/macro.njk" import govukBackLink %} - -{% block service_page_title %} - Uploaded letters -{% endblock %} - -{% block backLink %} - {{ govukBackLink({ "href": url_for('main.uploads', service_id=current_service.id) }) }} -{% endblock %} - -{% block maincolumn_content %} - - {{ page_header('Uploaded letters') }} - - {% if notifications %} - -

- {{ total|message_count('letter') }} -

- -

- {{ letter_printing_statement }} -

- - {% else %} - -

- No letters printing {{ letter_print_day }} -

- - {% endif %} - - {% include 'views/activity/notifications.html' %} - -{% endblock %} diff --git a/app/utils/letters.py b/app/utils/letters.py index b4209fa6f..d4e512654 100644 --- a/app/utils/letters.py +++ b/app/utils/letters.py @@ -12,36 +12,6 @@ from notifications_utils.timezones import ( ) -def printing_today_or_tomorrow(created_at): - print_cutoff = convert_local_timezone_to_utc( - convert_utc_to_local_timezone(datetime.utcnow()).replace(hour=17, minute=30) - ).replace(tzinfo=pytz.utc) - created_at = convert_utc_to_local_timezone(created_at) - - if created_at < print_cutoff: - return 'today' - else: - return 'tomorrow' - - -def get_letter_printing_statement(status, created_at, long_form=True): - created_at_dt = parser.parse(created_at).replace(tzinfo=None) - if letter_can_be_cancelled(status, created_at_dt): - decription = 'Printing starts' if long_form else 'Printing' - return f'{decription} {printing_today_or_tomorrow(created_at)} at 5:30pm' - else: - printed_datetime = convert_utc_to_local_timezone(created_at) + timedelta(hours=6, minutes=30) - if printed_datetime.date() == datetime.now().date(): - return 'Printed today at 5:30pm' - elif printed_datetime.date() == datetime.now().date() - timedelta(days=1): - return 'Printed yesterday at 5:30pm' - - printed_date = printed_datetime.strftime('%d %B').lstrip('0') - description = 'Printed on' if long_form else 'Printed' - - return f'{description} {printed_date} at 5:30pm' - - LETTER_VALIDATION_MESSAGES = { 'letter-not-a4-portrait-oriented': { 'title': 'Your letter is not A4 portrait size', diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py index 0420bd38f..bc4a576ba 100644 --- a/tests/app/main/views/test_jobs.py +++ b/tests/app/main/views/test_jobs.py @@ -397,7 +397,6 @@ def test_should_show_letter_job_with_banner_after_sending_before_1730( 'main.view_job', service_id=SERVICE_ONE_ID, job_id=fake_uuid, - just_sent='yes', ) assert page.select('p.bottom-gutter') == [] @@ -425,7 +424,6 @@ def test_should_show_letter_job_with_banner_when_there_are_multiple_CSV_rows( 'main.view_job', service_id=SERVICE_ONE_ID, job_id=fake_uuid, - just_sent='yes', ) assert page.select('p.bottom-gutter') == [] @@ -452,7 +450,6 @@ def test_should_show_letter_job_with_banner_after_sending_after_1730( 'main.view_job', service_id=SERVICE_ONE_ID, job_id=fake_uuid, - just_sent='yes', ) assert page.select('p.bottom-gutter') == [] @@ -474,7 +471,6 @@ def test_should_show_scheduled_job( 'main.view_job', service_id=SERVICE_ONE_ID, job_id=fake_uuid, - just_sent='yes', ) assert normalize_spaces(page.select('main p')[1].text) == ( diff --git a/tests/app/main/views/test_notifications.py b/tests/app/main/views/test_notifications.py index 363039f55..ee4153992 100644 --- a/tests/app/main/views/test_notifications.py +++ b/tests/app/main/views/test_notifications.py @@ -149,10 +149,6 @@ def test_notification_status_page_respects_redaction( {'from_job': 'job_id'}, partial(url_for, 'main.view_job', job_id='job_id'), ), - ( - {'from_uploaded_letters': '2020-02-02'}, - partial(url_for, 'main.uploaded_letters', letter_print_day='2020-02-02'), - ), ( {'help': '0'}, None, diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 474ecea02..518be8d7c 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -2734,33 +2734,6 @@ def test_create_job_should_call_api( ) -def test_can_start_letters_job( - client_request, - platform_admin_user, - mock_create_job, - service_one, - fake_uuid -): - with client_request.session_transaction() as session: - session['file_uploads'] = { - fake_uuid: { - 'template_id': fake_uuid, - 'notification_count': 123, - 'valid': True - } - } - - client_request.login(platform_admin_user) - response = client_request.post_response( - 'main.start_job', - service_id=service_one['id'], - upload_id=fake_uuid, - _data={}, - _expected_status=302, - ) - assert 'just_sent=yes' in response.location - - @pytest.mark.parametrize('filetype, extra_args, expected_values, expected_page', [ ( 'png', diff --git a/tests/app/main/views/uploads/test_upload_hub.py b/tests/app/main/views/uploads/test_upload_hub.py index d1ce523c9..6b6c556a9 100644 --- a/tests/app/main/views/uploads/test_upload_hub.py +++ b/tests/app/main/views/uploads/test_upload_hub.py @@ -85,6 +85,7 @@ def test_get_upload_hub_with_no_uploads( assert not page.select('.file-list-filename') +@pytest.mark.skip(reason="Needs to be rewritten with no letters") @freeze_time('2017-10-10 10:10:10') def test_get_upload_hub_page( mocker, @@ -142,159 +143,6 @@ def test_get_upload_hub_page( ) -@freeze_time('2020-02-02 14:00') -def test_get_uploaded_letters( - mocker, - client_request, - service_one, - mock_get_uploaded_letters, -): - page = client_request.get( - 'main.uploaded_letters', - service_id=SERVICE_ONE_ID, - letter_print_day='2020-02-02' - ) - assert page.select_one('.govuk-back-link')['href'] == url_for( - 'main.uploads', - service_id=SERVICE_ONE_ID, - ) - assert normalize_spaces( - page.select_one('h1').text - ) == ( - 'Uploaded letters' - ) - assert normalize_spaces( - page.select('main p')[0].text - ) == ( - '1,234 letters' - ) - assert normalize_spaces( - page.select('main p')[1].text - ) == ( - 'Printing starts today at 5:30pm' - ) - - assert [ - normalize_spaces(row.text) - for row in page.select('tbody tr') - ] == [ - ( - 'Homer-Simpson.pdf ' - '742 Evergreen Terrace ' - '2 February at 1:59pm' - ), - ( - 'Kevin-McCallister.pdf ' - '671 Lincoln Avenue, Winnetka ' - '2 February at 12:59pm' - ), - ] - - assert [ - link['href'] for link in page.select('tbody tr a') - ] == [ - url_for( - 'main.view_notification', - service_id=SERVICE_ONE_ID, - notification_id='03e34025-be54-4d43-8e6a-fb1ea0fd1f29', - from_uploaded_letters='2020-02-02', - ), - url_for( - 'main.view_notification', - service_id=SERVICE_ONE_ID, - notification_id='fc090d91-e761-4464-9041-9c4594c96a35', - from_uploaded_letters='2020-02-02', - ), - ] - - next_page_link = page.select_one('a[rel=next]') - prev_page_link = page.select_one('a[rel=previous]') - assert next_page_link['href'] == url_for( - 'main.uploaded_letters', service_id=SERVICE_ONE_ID, letter_print_day='2020-02-02', page=2 - ) - assert normalize_spaces(next_page_link.text) == ( - 'Next page ' - 'page 2' - ) - assert prev_page_link['href'] == url_for( - 'main.uploaded_letters', service_id=SERVICE_ONE_ID, letter_print_day='2020-02-02', page=0 - ) - assert normalize_spaces(prev_page_link.text) == ( - 'Previous page ' - 'page 0' - ) - - mock_get_uploaded_letters.assert_called_once_with( - SERVICE_ONE_ID, - letter_print_day='2020-02-02', - page=1, - ) - - -@freeze_time('2020-02-02 14:00') -def test_get_empty_uploaded_letters_page( - mocker, - client_request, - service_one, - mock_get_no_uploaded_letters, -): - page = client_request.get( - 'main.uploaded_letters', - service_id=SERVICE_ONE_ID, - letter_print_day='2020-02-02' - ) - page.select_one('main table') - - assert not page.select('tbody tr') - assert not page.select_one('a[rel=next]') - assert not page.select_one('a[rel=previous]') - - -@freeze_time('2020-02-02') -def test_get_uploaded_letters_passes_through_page_argument( - mocker, - client_request, - service_one, - mock_get_uploaded_letters, -): - client_request.get( - 'main.uploaded_letters', - service_id=SERVICE_ONE_ID, - letter_print_day='2020-02-02', - page=99, - ) - mock_get_uploaded_letters.assert_called_once_with( - SERVICE_ONE_ID, - letter_print_day='2020-02-02', - page=99, - ) - - -def test_get_uploaded_letters_404s_for_bad_page_arguments( - mocker, - client_request, -): - client_request.get( - 'main.uploaded_letters', - service_id=SERVICE_ONE_ID, - letter_print_day='2020-02-02', - page='one', - _expected_status=404, - ) - - -def test_get_uploaded_letters_404s_for_invalid_date( - mocker, - client_request, -): - client_request.get( - 'main.uploaded_letters', - service_id=SERVICE_ONE_ID, - letter_print_day='1234-56-78', - _expected_status=404, - ) - - @pytest.mark.parametrize('user', ( create_active_caseworking_user(), create_active_user_with_permissions(), diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py index d2a52a2b2..276fe638b 100644 --- a/tests/app/test_navigation.py +++ b/tests/app/test_navigation.py @@ -290,7 +290,6 @@ EXCLUDED_ENDPOINTS = tuple(map(Navigation.get_endpoint_with_blueprint, { 'upload_contact_list', 'upload_letter', 'uploaded_letter_preview', - 'uploaded_letters', 'uploads', 'usage', 'user_information', diff --git a/tests/app/utils/test_letters.py b/tests/app/utils/test_letters.py index 4f73b2fd3..a5992dbb8 100644 --- a/tests/app/utils/test_letters.py +++ b/tests/app/utils/test_letters.py @@ -4,79 +4,10 @@ from flask import url_for from freezegun import freeze_time from app.utils.letters import ( - get_letter_printing_statement, get_letter_validation_error, - printing_today_or_tomorrow, ) -@pytest.mark.parametrize('utc_datetime', [ - '2018-08-01T23:00:00+00:00', - '2018-08-01T16:29:00+00:00', - '2018-11-01T00:00:00+00:00', - '2018-11-01T10:00:00+00:00', - '2018-11-01T17:29:00+00:00', -]) -def test_printing_today_or_tomorrow_returns_today(utc_datetime): - with freeze_time(utc_datetime): - assert printing_today_or_tomorrow(utc_datetime) == 'today' - - -@pytest.mark.parametrize('utc_datetime', [ - '2018-08-01T22:59:00+00:00', - '2018-08-01T16:30:00+00:00', - '2018-11-01T17:30:00+00:00', - '2018-11-01T21:00:00+00:00', - '2018-11-01T23:59:00+00:00', -]) -def test_printing_today_or_tomorrow_returns_tomorrow(utc_datetime): - with freeze_time(utc_datetime): - assert printing_today_or_tomorrow(utc_datetime) == 'tomorrow' - - -@pytest.mark.parametrize('created_at, current_datetime', [ - ('2017-07-07T12:00:00+00:00', '2017-07-07 16:29:00'), # created today, summer - ('2017-07-06T23:30:00+00:00', '2017-07-07 16:29:00'), # created just after midnight, summer - ('2017-12-12T12:00:00+00:00', '2017-12-12 17:29:00'), # created today, winter - ('2017-12-12T21:30:00+00:00', '2017-12-13 17:29:00'), # created after 5:30 yesterday - ('2017-03-25T17:31:00+00:00', '2017-03-26 16:29:00'), # over clock change period on 2017-03-26 -]) -def test_get_letter_printing_statement_when_letter_prints_today(created_at, current_datetime): - with freeze_time(current_datetime): - statement = get_letter_printing_statement('created', created_at) - - assert statement == 'Printing starts today at 5:30pm' - - -@pytest.mark.parametrize('created_at, current_datetime', [ - ('2017-07-07T16:31:00+00:00', '2017-07-07 22:59:00'), # created today, summer - ('2017-12-12T17:31:00+00:00', '2017-12-12 23:59:00'), # created today, winter -]) -def test_get_letter_printing_statement_when_letter_prints_tomorrow(created_at, current_datetime): - with freeze_time(current_datetime): - statement = get_letter_printing_statement('created', created_at) - - assert statement == 'Printing starts tomorrow at 5:30pm' - - -@pytest.mark.parametrize('created_at, print_day', [ - ('2017-07-06T16:29:00+00:00', 'yesterday'), - ('2017-12-01T00:00:00+00:00', 'on 1 December'), - ('2017-03-26T12:00:00+00:00', 'on 26 March'), -]) -@freeze_time('2017-07-07 12:00:00') -def test_get_letter_printing_statement_for_letter_that_has_been_sent(created_at, print_day): - statement = get_letter_printing_statement('delivered', created_at) - - assert statement == 'Printed {} at 5:30pm'.format(print_day) - - -def test_get_letter_validation_error_for_unknown_error(): - assert get_letter_validation_error('Unknown error') == { - 'title': 'Validation failed' - } - - @pytest.mark.parametrize('error_message, invalid_pages, expected_title, expected_content, expected_summary', [ ( 'letter-not-a4-portrait-oriented', diff --git a/tests/conftest.py b/tests/conftest.py index 2c44575e1..d0853fca4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1642,121 +1642,6 @@ def mock_get_uploads(mocker, api_user_active): return mocker.patch('app.models.job.PaginatedUploads.client_method', side_effect=_get_uploads) -@pytest.fixture(scope='function') -def mock_get_uploaded_letters(mocker): - def _get_uploaded_letters(service_id, *, letter_print_day, page=1): - uploads = [ - { - "api_key": None, - "billable_units": 1, - "client_reference": "Homer-Simpson.pdf", - "created_at": "2020-02-02T13:59:00+00:00", - "created_by": { - "email_address": "test@example.com", - "id": "a1958d6b-955b-4f68-8847-cf43cd4b189a", - "name": "Test User" - }, - "document_download_count": None, - "id": "03e34025-be54-4d43-8e6a-fb1ea0fd1f29", - "international": False, - "job": None, - "job_row_number": None, - "key_name": None, - "key_type": "normal", - "normalised_to": None, - "notification_type": "letter", - "personalisation": {}, - "phone_prefix": None, - "postage": "second", - "rate_multiplier": None, - "reference": "dvla-reference", - "reply_to_text": None, - "sent_at": "2020-02-02T14:00:00+00:00", - "sent_by": None, - "service": "f995d8a3-4ece-4961-bbbd-b657b192648c", - "status": "delivered", - "template": { - "content": "", - "id": "673e4f67-7d9a-42b8-8e56-f3444aa2fbef", - "is_precompiled_letter": True, - "name": "Pre-compiled PDF", - "redact_personalisation": False, - "subject": "Pre-compiled PDF", - "template_type": "letter", - "version": 1 - }, - "to": "742 Evergreen Terrace", - "updated_at": "2020-02-02T14:00:00+00:00" - }, - { - "api_key": None, - "billable_units": 1, - "client_reference": "Kevin-McCallister.pdf", - "created_at": "2020-02-02T12:59:00+00:00", - "created_by": { - "email_address": "test@example.com", - "id": "a1958d6b-955b-4f68-8847-cf43cd4b189a", - "name": "Test User" - }, - "document_download_count": None, - "id": "fc090d91-e761-4464-9041-9c4594c96a35", - "international": False, - "job": None, - "job_row_number": None, - "key_name": None, - "key_type": "normal", - "normalised_to": None, - "notification_type": "letter", - "personalisation": {}, - "phone_prefix": None, - "postage": "second", - "rate_multiplier": None, - "reference": "dvla-reference", - "reply_to_text": None, - "sent_at": "2020-02-02T14:00:00+00:00", - "sent_by": None, - "service": "f995d8a3-4ece-4961-bbbd-b657b192648c", - "status": "delivered", - "template": { - "content": "", - "id": "673e4f67-7d9a-42b8-8e56-f3444aa2fbef", - "is_precompiled_letter": True, - "name": "Pre-compiled PDF", - "redact_personalisation": False, - "subject": "Pre-compiled PDF", - "template_type": "letter", - "version": 1 - }, - "to": "671 Lincoln Avenue\nWinnetka", - "updated_at": "2020-02-02T14:00:00+00:00" - }, - ] - return { - 'notifications': uploads, - 'total': 1234, - 'links': { - 'prev': 'services/{}/uploads?page={}'.format(service_id, page - 1), - 'next': 'services/{}/uploads?page={}'.format(service_id, page + 1) - } - } - return mocker.patch( - 'app.main.views.uploads.upload_api_client.get_letters_by_service_and_print_day', - side_effect=_get_uploaded_letters, - ) - - -@pytest.fixture(scope='function') -def mock_get_no_uploaded_letters(mocker): - return mocker.patch( - 'app.main.views.uploads.upload_api_client.get_letters_by_service_and_print_day', - return_value={ - 'notifications': [], - 'total': 0, - 'links': {} - }, - ) - - @pytest.fixture(scope='function') def mock_get_no_uploads(mocker, api_user_active): mocker.patch(