From 34a378a60e4494cb59b9df708896b2747dddf309 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Mon, 19 Apr 2021 10:47:25 +0100 Subject: [PATCH] Update the Zendesk ticket content for `check_if_letters_still_in_created` The message to Zendesk includes a list of notification ids, this isn't really necessary and is included in the run book. Creation of the Zendesk ticket can fail if the message is too long, removing the list of ids can prevent that from happening. --- app/celery/scheduled_tasks.py | 5 +---- tests/app/celery/test_scheduled_tasks.py | 14 ++++++-------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/celery/scheduled_tasks.py b/app/celery/scheduled_tasks.py index b5fece6b0..f3d5e39bc 100644 --- a/app/celery/scheduled_tasks.py +++ b/app/celery/scheduled_tasks.py @@ -226,13 +226,10 @@ def check_if_letters_still_in_created(): letters = dao_old_letters_with_created_status() if len(letters) > 0: - letter_ids = [str(letter.id) for letter in letters] - msg = "{} letters were created before 17.30 yesterday and still have 'created' status. " \ "Follow runbook to resolve: " \ "https://github.com/alphagov/notifications-manuals/wiki/Support-Runbook" \ - "#deal-with-Letters-still-in-created. " \ - "Notifications: {}".format(len(letters), letter_ids) + "#deal-with-Letters-still-in-created.".format(len(letters)) current_app.logger.warning(msg) diff --git a/tests/app/celery/test_scheduled_tasks.py b/tests/app/celery/test_scheduled_tasks.py index 350b05112..9e67e4920 100644 --- a/tests/app/celery/test_scheduled_tasks.py +++ b/tests/app/celery/test_scheduled_tasks.py @@ -396,8 +396,8 @@ def test_check_if_letters_still_in_created_during_bst(mocker, sample_letter_temp mock_logger = mocker.patch('app.celery.tasks.current_app.logger.warning') mock_create_ticket = mocker.patch('app.celery.nightly_tasks.zendesk_client.create_ticket') - noti_1 = create_notification(template=sample_letter_template, created_at=datetime(2019, 5, 1, 12, 0)) - noti_2 = create_notification(template=sample_letter_template, created_at=datetime(2019, 5, 29, 16, 29)) + create_notification(template=sample_letter_template, created_at=datetime(2019, 5, 1, 12, 0)) + create_notification(template=sample_letter_template, created_at=datetime(2019, 5, 29, 16, 29)) create_notification(template=sample_letter_template, created_at=datetime(2019, 5, 29, 16, 30)) create_notification(template=sample_letter_template, created_at=datetime(2019, 5, 29, 17, 29)) create_notification(template=sample_letter_template, status='delivered', created_at=datetime(2019, 5, 28, 10, 0)) @@ -407,8 +407,7 @@ def test_check_if_letters_still_in_created_during_bst(mocker, sample_letter_temp message = "2 letters were created before 17.30 yesterday and still have 'created' status. " \ "Follow runbook to resolve: " \ - "https://github.com/alphagov/notifications-manuals/wiki/Support-Runbook#deal-with-Letters-still-in-created. " \ - "Notifications: ['{}', '{}']".format(noti_1.id, noti_2.id) + "https://github.com/alphagov/notifications-manuals/wiki/Support-Runbook#deal-with-Letters-still-in-created." mock_logger.assert_called_once_with(message) mock_create_ticket.assert_called_with( @@ -423,8 +422,8 @@ def test_check_if_letters_still_in_created_during_utc(mocker, sample_letter_temp mock_logger = mocker.patch('app.celery.tasks.current_app.logger.warning') mock_create_ticket = mocker.patch('app.celery.scheduled_tasks.zendesk_client.create_ticket') - noti_1 = create_notification(template=sample_letter_template, created_at=datetime(2018, 12, 1, 12, 0)) - noti_2 = create_notification(template=sample_letter_template, created_at=datetime(2019, 1, 29, 17, 29)) + create_notification(template=sample_letter_template, created_at=datetime(2018, 12, 1, 12, 0)) + create_notification(template=sample_letter_template, created_at=datetime(2019, 1, 29, 17, 29)) create_notification(template=sample_letter_template, created_at=datetime(2019, 1, 29, 17, 30)) create_notification(template=sample_letter_template, created_at=datetime(2019, 1, 29, 18, 29)) create_notification(template=sample_letter_template, status='delivered', created_at=datetime(2019, 1, 29, 10, 0)) @@ -434,8 +433,7 @@ def test_check_if_letters_still_in_created_during_utc(mocker, sample_letter_temp message = "2 letters were created before 17.30 yesterday and still have 'created' status. " \ "Follow runbook to resolve: " \ - "https://github.com/alphagov/notifications-manuals/wiki/Support-Runbook#deal-with-Letters-still-in-created. " \ - "Notifications: ['{}', '{}']".format(noti_1.id, noti_2.id) + "https://github.com/alphagov/notifications-manuals/wiki/Support-Runbook#deal-with-Letters-still-in-created." mock_logger.assert_called_once_with(message) mock_create_ticket.assert_called_with(