From 77c35da5caecabfb3494cd280465de2841cc7a0d Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Wed, 8 May 2019 15:55:45 +0100 Subject: [PATCH] Refactor send_email_to_provider - Remove debug statement --- app/delivery/send_to_providers.py | 10 +++------- tests/app/delivery/test_send_to_providers.py | 3 ++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/delivery/send_to_providers.py b/app/delivery/send_to_providers.py index ba7fd5764..bcf699ff2 100644 --- a/app/delivery/send_to_providers.py +++ b/app/delivery/send_to_providers.py @@ -90,9 +90,7 @@ def send_email_to_provider(notification): return if notification.status == 'created': provider = provider_to_use(EMAIL_TYPE, notification.id) - current_app.logger.debug( - "Starting sending EMAIL {} to provider at {}".format(notification.id, datetime.utcnow()) - ) + template_dict = dao_get_template_by_id(notification.template_id, notification.template_version).__dict__ html_email = HTMLEmailTemplate( @@ -107,11 +105,9 @@ def send_email_to_provider(notification): ) if service.research_mode or notification.key_type == KEY_TYPE_TEST: - reference = str(create_uuid()) - notification.billable_units = 0 - notification.reference = reference + notification.reference = str(create_uuid()) update_notification_to_sending(notification, provider) - send_email_response(reference, notification.to) + send_email_response(notification.reference, notification.to) else: from_address = '"{}" <{}@{}>'.format(service.name, service.email_from, current_app.config['NOTIFY_EMAIL_DOMAIN']) diff --git a/tests/app/delivery/test_send_to_providers.py b/tests/app/delivery/test_send_to_providers.py index fbfd6dec9..e3002a8c3 100644 --- a/tests/app/delivery/test_send_to_providers.py +++ b/tests/app/delivery/test_send_to_providers.py @@ -319,7 +319,8 @@ def test_send_email_to_provider_should_call_research_mode_task_response_task_if_ notification = create_notification( template=sample_email_template, to_field="john@smith.com", - key_type=key_type + key_type=key_type, + billable_units=0 ) sample_service.research_mode = research_mode