darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-30 14:31:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1820 from alphagov/ken-fix-precompiled-research-mode

Browse Source 
Fix research mode preview of precompiled letters
This commit is contained in:
Rebecca Law
2018-04-06 15:22:09 +01:00
committed by GitHub
parent 15d92e235f 39e4f63b8c
commit 002b96b4f8
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/v2/notifications/post_notifications.py
View File

@@ -265,12 +265,6 @@ def process_letter_notification(*, letter_data, api_key, template, reply_to_text
[str(notification.id)], [str(notification.id)],
queue=QueueNames.CREATE_LETTERS_PDF queue=QueueNames.CREATE_LETTERS_PDF
) )
elif (api_key.service.research_mode and
current_app.config['NOTIFY_ENVIRONMENT'] in ['preview', 'development']):
create_fake_letter_response_file.apply_async(
(notification.reference,),
queue=QueueNames.RESEARCH_MODE
)
else: else:
if precompiled and api_key.key_type == KEY_TYPE_TEST: if precompiled and api_key.key_type == KEY_TYPE_TEST:
filename = upload_letter_pdf(notification, letter_content) filename = upload_letter_pdf(notification, letter_content)
@@ -281,6 +275,14 @@ def process_letter_notification(*, letter_data, api_key, template, reply_to_text
kwargs={'filename': filename}, kwargs={'filename': filename},
queue=QueueNames.ANTIVIRUS, queue=QueueNames.ANTIVIRUS,
) )
elif (
api_key.service.research_mode and
current_app.config['NOTIFY_ENVIRONMENT'] in ['preview', 'development']
):
create_fake_letter_response_file.apply_async(
(notification.reference,),
queue=QueueNames.RESEARCH_MODE
)
else: else:
update_notification_status_by_reference(notification.reference, NOTIFICATION_DELIVERED) update_notification_status_by_reference(notification.reference, NOTIFICATION_DELIVERED)

7
tests/app/v2/notifications/test_post_letter_notifications.py
View File

@@ -393,12 +393,15 @@ def test_post_letter_notification_is_delivered_if_in_trial_mode_and_using_test_k
assert not fake_create_letter_task.called assert not fake_create_letter_task.called
@pytest.mark.parametrize('is_research_mode', [True, False])
def test_post_letter_notification_is_delivered_and_has_pdf_uploaded_to_test_letters_bucket_using_test_key( def test_post_letter_notification_is_delivered_and_has_pdf_uploaded_to_test_letters_bucket_using_test_key(
client, client,
notify_user, notify_user,
mocker mocker,
is_research_mode
): ):
sample_letter_service = create_service(service_permissions=['letter', 'precompiled_letter']) sample_letter_service = create_service(
service_permissions=['letter', 'precompiled_letter'], research_mode=is_research_mode)
s3mock = mocker.patch('app.v2.notifications.post_notifications.upload_letter_pdf', return_value='test.pdf') s3mock = mocker.patch('app.v2.notifications.post_notifications.upload_letter_pdf', return_value='test.pdf')
mocker.patch('app.v2.notifications.post_notifications.pdf_page_count', return_value=1) mocker.patch('app.v2.notifications.post_notifications.pdf_page_count', return_value=1)
mock_celery = mocker.patch("app.letters.rest.notify_celery.send_task") mock_celery = mocker.patch("app.letters.rest.notify_celery.send_task")