darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-19 14:08:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update save_letter to handle research mode

Browse Source
This commit is contained in:
Ken Tsang
2017-12-11 16:13:41 +00:00
parent 02b67c95e5
commit 3e71e9a294
2 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/celery/tasks.py
View File

@@ -317,13 +317,17 @@ def save_letter(
reply_to_text=service.get_default_letter_contact() reply_to_text=service.get_default_letter_contact()
) )
if ( if service.has_permission('letters_as_pdf'):
service.has_permission('letters_as_pdf') and not service.research_mode if not service.research_mode:
): letters_pdf_tasks.create_letters_pdf.apply_async(
letters_pdf_tasks.create_letters_pdf.apply_async( [str(saved_notification.id)],
[str(saved_notification.id)], queue=QueueNames.CREATE_LETTERS_PDF
queue=QueueNames.CREATE_LETTERS_PDF )
) else:
update_letter_notifications_to_sent_to_dvla.apply_async(
kwargs={'notification_references': [saved_notification.reference]},
queue=QueueNames.RESEARCH_MODE
)
current_app.logger.info("Letter {} created at {}".format(saved_notification.id, saved_notification.created_at)) current_app.logger.info("Letter {} created at {}".format(saved_notification.id, saved_notification.created_at))
except SQLAlchemyError as e: except SQLAlchemyError as e:

37
tests/app/celery/test_tasks.py
View File

@@ -1040,7 +1040,42 @@ def test_save_letter_saves_letter_to_database(mocker, notify_db_session):
assert notification_db.reply_to_text == "Address contact" assert notification_db.reply_to_text == "Address contact"
def test_save_letter_saves_letter_calls_create_letters_as_pdf_with_letters_as_pdf_permission( def test_save_letter_calls_update_noti_to_sent_task_with_letters_as_pdf_permission_in_research_mode(
mocker, notify_db_session, sample_letter_job):
sample_letter_job.service.research_mode = True
service_permissions_dao.dao_add_service_permission(sample_letter_job.service.id, 'letters_as_pdf')
mock_update_letter_noti_sent = mocker.patch(
'app.celery.tasks.update_letter_notifications_to_sent_to_dvla.apply_async')
mocker.patch('app.celery.tasks.create_random_identifier', return_value="this-is-random-in-real-life")
personalisation = {
'addressline1': 'Foo',
'addressline2': 'Bar',
'postcode': 'Flob',
}
notification_json = _notification_json(
template=sample_letter_job.template,
to='Foo',
personalisation=personalisation,
job_id=sample_letter_job.id,
row_number=1
)
notification_id = uuid.uuid4()
save_letter(
sample_letter_job.service_id,
notification_id,
encryption.encrypt(notification_json),
)
assert mock_update_letter_noti_sent.called
mock_update_letter_noti_sent.assert_called_once_with(
kwargs={'notification_references': ['this-is-random-in-real-life']},
queue=QueueNames.RESEARCH_MODE
)
def test_save_letter_calls_create_letters_pdf_task_with_letters_as_pdf_permission_and_not_in_research(
mocker, notify_db_session, sample_letter_job): mocker, notify_db_session, sample_letter_job):
service_permissions_dao.dao_add_service_permission(sample_letter_job.service.id, 'letters_as_pdf') service_permissions_dao.dao_add_service_permission(sample_letter_job.service.id, 'letters_as_pdf')
mock_create_letters_pdf = mocker.patch('app.celery.letters_pdf_tasks.create_letters_pdf.apply_async') mock_create_letters_pdf = mocker.patch('app.celery.letters_pdf_tasks.create_letters_pdf.apply_async')