darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 09:51:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3339 from alphagov/letter-runbook-link

Browse Source 
tweak zendesk message for no ack files alert
This commit is contained in:
Leo Hemsted
2021-10-20 15:23:33 +01:00
committed by GitHub
parent cf1662e8b1 b8c4e19072
commit 0b8c6ef263
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/celery/nightly_tasks.py
View File

@@ -240,17 +240,16 @@ def letter_raise_alert_if_no_ack_file_for_zip():
subfolder='root/dispatch', suffix='.ACK.txt', last_modified=yesterday): subfolder='root/dispatch', suffix='.ACK.txt', last_modified=yesterday):
ack_file_set.add(key.lstrip('root/dispatch').upper().replace('.ACK.TXT', '')) ack_file_set.add(key.lstrip('root/dispatch').upper().replace('.ACK.TXT', ''))
message = ( message = '\n'.join([
"Letter ack file does not contain all zip files sent. " "Letter ack file does not contain all zip files sent."
"Missing ack for zip files: {}, " "",
"pdf bucket: {}, subfolder: {}, " f"See runbook at https://github.com/alphagov/notifications-manuals/wiki/Support-Runbook#letter-ack-file-does-not-contain-all-zip-files-sent\n", # noqa
"ack bucket: {}" f"pdf bucket: {current_app.config['LETTERS_PDF_BUCKET_NAME']}, subfolder: {datetime.utcnow().strftime('%Y-%m-%d')}/zips_sent", # noqa
).format( f"ack bucket: {current_app.config['DVLA_RESPONSE_BUCKET_NAME']}",
str(sorted(zip_file_set - ack_file_set)), "",
current_app.config['LETTERS_PDF_BUCKET_NAME'], f"Missing ack for zip files: {str(sorted(zip_file_set - ack_file_set))}",
datetime.utcnow().strftime('%Y-%m-%d') + '/zips_sent', ])
current_app.config['DVLA_RESPONSE_BUCKET_NAME']
)
# strip empty element before comparison # strip empty element before comparison
ack_file_set.discard('') ack_file_set.discard('')
zip_file_set.discard('') zip_file_set.discard('')

11
tests/app/celery/test_nightly_tasks.py
View File

@@ -384,22 +384,17 @@ def test_letter_raise_alert_if_ack_files_not_match_zip_list(mocker, notify_db):
assert mock_file_list.call_count == 2 assert mock_file_list.call_count == 2
message = "Letter ack file does not contain all zip files sent. " \
"Missing ack for zip files: {}, " \
"pdf bucket: {}, subfolder: {}, " \
"ack bucket: {}".format(str(['NOTIFY.2018-01-11175009', 'NOTIFY.2018-01-11175010']),
current_app.config['LETTERS_PDF_BUCKET_NAME'],
datetime.utcnow().strftime('%Y-%m-%d') + '/zips_sent',
current_app.config['DVLA_RESPONSE_BUCKET_NAME'])
mock_create_ticket.assert_called_once_with( mock_create_ticket.assert_called_once_with(
ANY, ANY,
subject="Letter acknowledge error", subject="Letter acknowledge error",
message=message, message=ANY,
ticket_type='incident', ticket_type='incident',
technical_ticket=True, technical_ticket=True,
ticket_categories=['notify_letters'] ticket_categories=['notify_letters']
) )
mock_send_ticket_to_zendesk.assert_called_once() mock_send_ticket_to_zendesk.assert_called_once()
assert "['NOTIFY.2018-01-11175009', 'NOTIFY.2018-01-11175010']" in mock_create_ticket.call_args[1]['message']
assert '2018-01-11/zips_sent' in mock_create_ticket.call_args[1]['message']
@freeze_time('2018-01-11T23:00:00') @freeze_time('2018-01-11T23:00:00')