mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-02 08:35:15 -05:00
Change function and task name to be more accurate
Will require us to change a cronitor set up
This commit is contained in:
@@ -118,9 +118,9 @@ def get_letters_pdf(template, contact_block, filename, values):
|
||||
return resp.content, billable_units
|
||||
|
||||
|
||||
@notify_celery.task(name='collate-letter-pdfs-for-day')
|
||||
@cronitor("collate-letter-pdfs-for-day")
|
||||
def collate_letter_pdfs_for_day():
|
||||
@notify_celery.task(name='collate-letter-pdfs-to-be-sent')
|
||||
@cronitor("collate-letter-pdfs-to-be-sent")
|
||||
def collate_letter_pdfs_to_be_sent():
|
||||
"""
|
||||
Finds all letters which are still waiting to be sent to DVLA for printing
|
||||
|
||||
|
||||
@@ -296,8 +296,8 @@ class Config(object):
|
||||
},
|
||||
# The collate-letter-pdf does assume it is called in an hour that BST does not make a
|
||||
# difference to the truncate date which translates to the filename to process
|
||||
'collate-letter-pdfs-for-day': {
|
||||
'task': 'collate-letter-pdfs-for-day',
|
||||
'collate-letter-pdfs-to-be-sent': {
|
||||
'task': 'collate-letter-pdfs-to-be-sent',
|
||||
'schedule': crontab(hour=17, minute=50),
|
||||
'options': {'queue': QueueNames.PERIODIC}
|
||||
},
|
||||
|
||||
@@ -19,7 +19,7 @@ from app.exceptions import NotificationTechnicalFailureException
|
||||
from app.celery.letters_pdf_tasks import (
|
||||
create_letters_pdf,
|
||||
get_letters_pdf,
|
||||
collate_letter_pdfs_for_day,
|
||||
collate_letter_pdfs_to_be_sent,
|
||||
get_key_and_size_of_letters_to_be_sent_to_print,
|
||||
group_letters,
|
||||
process_sanitised_letter,
|
||||
@@ -52,7 +52,7 @@ from tests.conftest import set_config_values
|
||||
|
||||
def test_should_have_decorated_tasks_functions():
|
||||
assert create_letters_pdf.__wrapped__.__name__ == 'create_letters_pdf'
|
||||
assert collate_letter_pdfs_for_day.__wrapped__.__name__ == 'collate_letter_pdfs_for_day'
|
||||
assert collate_letter_pdfs_to_be_sent.__wrapped__.__name__ == 'collate_letter_pdfs_to_be_sent'
|
||||
assert process_virus_scan_passed.__wrapped__.__name__ == 'process_virus_scan_passed'
|
||||
assert process_virus_scan_failed.__wrapped__.__name__ == 'process_virus_scan_failed'
|
||||
assert process_virus_scan_error.__wrapped__.__name__ == 'process_virus_scan_error'
|
||||
@@ -316,7 +316,7 @@ def test_get_key_and_size_of_letters_to_be_sent_to_print(notify_api, mocker, sam
|
||||
|
||||
|
||||
@freeze_time('2020-02-17 18:00:00')
|
||||
def test_collate_letter_pdfs_for_day(notify_api, sample_letter_template, mocker):
|
||||
def test_collate_letter_pdfs_to_be_sent(notify_api, sample_letter_template, mocker):
|
||||
create_notification(
|
||||
template=sample_letter_template,
|
||||
status='created',
|
||||
@@ -349,7 +349,7 @@ def test_collate_letter_pdfs_for_day(notify_api, sample_letter_template, mocker)
|
||||
])
|
||||
mock_celery = mocker.patch('app.celery.letters_pdf_tasks.notify_celery.send_task')
|
||||
|
||||
collate_letter_pdfs_for_day()
|
||||
collate_letter_pdfs_to_be_sent()
|
||||
|
||||
assert len(mock_celery.call_args_list) == 2
|
||||
assert mock_celery.call_args_list[0] == call(
|
||||
@@ -373,8 +373,8 @@ def test_collate_letter_pdfs_for_day(notify_api, sample_letter_template, mocker)
|
||||
|
||||
|
||||
@freeze_time('2020-02-18 02:00:00')
|
||||
def test_collate_letter_pdfs_for_day_when_run_after_midnight(notify_api, sample_letter_template, mocker):
|
||||
# created_at times for notifications choosen to match times in above test test_collate_letter_pdfs_for_day
|
||||
def test_collate_letter_pdfs_to_be_sent_when_run_after_midnight(notify_api, sample_letter_template, mocker):
|
||||
# created_at times for notifications choosen to match times in above test test_collate_letter_pdfs_to_be_sent
|
||||
create_notification(
|
||||
template=sample_letter_template,
|
||||
status='created',
|
||||
@@ -407,7 +407,7 @@ def test_collate_letter_pdfs_for_day_when_run_after_midnight(notify_api, sample_
|
||||
])
|
||||
mock_celery = mocker.patch('app.celery.letters_pdf_tasks.notify_celery.send_task')
|
||||
|
||||
collate_letter_pdfs_for_day()
|
||||
collate_letter_pdfs_to_be_sent()
|
||||
|
||||
assert len(mock_celery.call_args_list) == 2
|
||||
assert mock_celery.call_args_list[0] == call(
|
||||
|
||||
Reference in New Issue
Block a user