Update tasks in line with AV app

This commit is contained in:
Ken Tsang
2018-03-20 14:56:42 +00:00
parent d9494dbc97
commit 8391353113
2 changed files with 8 additions and 8 deletions

View File

@@ -154,8 +154,8 @@ def letter_in_created_state(filename):
return False return False
@notify_celery.task(name='process-letter-scan-passed') @notify_celery.task(name='process-virus-scan-passed')
def process_letter_scan_passed(filename): def process_virus_scan_passed(filename):
current_app.logger.info('Virus scan passed: {}'.format(filename)) current_app.logger.info('Virus scan passed: {}'.format(filename))
move_scanned_pdf_to_letters_pdf_bucket(filename) move_scanned_pdf_to_letters_pdf_bucket(filename)
reference = get_reference_from_filename(filename) reference = get_reference_from_filename(filename)
@@ -169,8 +169,8 @@ def process_letter_scan_passed(filename):
) )
@notify_celery.task(name='process-letter-scan-failed') @notify_celery.task(name='process-virus-scan-failed')
def process_letter_scan_failed(filename): def process_virus_scan_failed(filename):
current_app.logger.info('Virus scan failed: {}'.format(filename)) current_app.logger.info('Virus scan failed: {}'.format(filename))
delete_pdf_from_letters_scan_bucket(filename) delete_pdf_from_letters_scan_bucket(filename)
reference = get_reference_from_filename(filename) reference = get_reference_from_filename(filename)

View File

@@ -17,8 +17,8 @@ from app.celery.letters_pdf_tasks import (
collate_letter_pdfs_for_day, collate_letter_pdfs_for_day,
group_letters, group_letters,
letter_in_created_state, letter_in_created_state,
process_letter_scan_passed, process_virus_scan_passed,
process_letter_scan_failed, process_virus_scan_failed,
) )
from app.letters.utils import get_letter_pdf_filename from app.letters.utils import get_letter_pdf_filename
from app.models import ( from app.models import (
@@ -322,7 +322,7 @@ def test_process_letter_task_check_virus_scan_passed(sample_letter_notification,
sample_letter_notification.status = 'pending-virus-check' sample_letter_notification.status = 'pending-virus-check'
mock_move_pdf = mocker.patch('app.celery.letters_pdf_tasks.move_scanned_pdf_to_letters_pdf_bucket') mock_move_pdf = mocker.patch('app.celery.letters_pdf_tasks.move_scanned_pdf_to_letters_pdf_bucket')
process_letter_scan_passed(filename) process_virus_scan_passed(filename)
mock_move_pdf.assert_called_once_with(filename) mock_move_pdf.assert_called_once_with(filename)
assert sample_letter_notification.status == NOTIFICATION_CREATED assert sample_letter_notification.status == NOTIFICATION_CREATED
@@ -333,7 +333,7 @@ def test_process_letter_task_check_virus_scan_failed(sample_letter_notification,
sample_letter_notification.status = 'pending-virus-check' sample_letter_notification.status = 'pending-virus-check'
mock_delete_pdf = mocker.patch('app.celery.letters_pdf_tasks.delete_pdf_from_letters_scan_bucket') mock_delete_pdf = mocker.patch('app.celery.letters_pdf_tasks.delete_pdf_from_letters_scan_bucket')
process_letter_scan_failed(filename) process_virus_scan_failed(filename)
mock_delete_pdf.assert_called_once_with(filename) mock_delete_pdf.assert_called_once_with(filename)
assert sample_letter_notification.status == NOTIFICATION_PERMANENT_FAILURE assert sample_letter_notification.status == NOTIFICATION_PERMANENT_FAILURE