diff --git a/app/delivery/send_to_providers.py b/app/delivery/send_to_providers.py index 394478036..416032471 100644 --- a/app/delivery/send_to_providers.py +++ b/app/delivery/send_to_providers.py @@ -15,7 +15,7 @@ from app.dao.notifications_dao import ( ) from app.dao.provider_details_dao import ( get_provider_details_by_notification_type, - dao_toggle_sms_provider + dao_reduce_sms_provider_priority ) from app.celery.research_mode_tasks import send_sms_response, send_email_response from app.dao.templates_dao import dao_get_template_by_id @@ -66,7 +66,7 @@ def send_sms_to_provider(notification): except Exception as e: notification.billable_units = template.fragment_count dao_update_notification(notification) - dao_reduce_sms_provider_priority(provider) + dao_reduce_sms_provider_priority(provider.get_name()) raise e else: notification.billable_units = template.fragment_count diff --git a/tests/app/celery/test_provider_tasks.py b/tests/app/celery/test_provider_tasks.py index 8ea1a5a8e..9886c348b 100644 --- a/tests/app/celery/test_provider_tasks.py +++ b/tests/app/celery/test_provider_tasks.py @@ -120,9 +120,11 @@ def test_send_sms_should_not_switch_providers_on_non_provider_failure( 'app.delivery.send_to_providers.send_sms_to_provider', side_effect=Exception("Non Provider Exception") ) - switch_provider_mock = mocker.patch('app.delivery.send_to_providers.dao_toggle_sms_provider') + mock_dao_reduce_sms_provider_priority = mocker.patch( + 'app.delivery.send_to_providers.dao_reduce_sms_provider_priority' + ) mocker.patch('app.celery.provider_tasks.deliver_sms.retry') deliver_sms(sample_notification.id) - assert switch_provider_mock.called is False + assert mock_dao_reduce_sms_provider_priority.called is False diff --git a/tests/app/delivery/test_send_to_providers.py b/tests/app/delivery/test_send_to_providers.py index ee1004c6a..1b95c17d3 100644 --- a/tests/app/delivery/test_send_to_providers.py +++ b/tests/app/delivery/test_send_to_providers.py @@ -553,7 +553,7 @@ def test_should_set_notification_billable_units_if_sending_to_provider_fails( mocker, ): mocker.patch('app.mmg_client.send_sms', side_effect=Exception()) - mock_toggle_provider = mocker.patch('app.delivery.send_to_providers.dao_toggle_sms_provider') + mocker.patch('app.delivery.send_to_providers.dao_reduce_sms_provider_priority') sample_notification.billable_units = 0 assert sample_notification.sent_by is None @@ -562,7 +562,6 @@ def test_should_set_notification_billable_units_if_sending_to_provider_fails( send_to_providers.send_sms_to_provider(sample_notification) assert sample_notification.billable_units == 1 - assert mock_toggle_provider.called def test_should_send_sms_to_international_providers( diff --git a/tests/app/provider_details/test_rest.py b/tests/app/provider_details/test_rest.py index dd3a41ab7..9e58d7c9a 100644 --- a/tests/app/provider_details/test_rest.py +++ b/tests/app/provider_details/test_rest.py @@ -8,7 +8,7 @@ from tests import create_authorization_header from tests.app.db import create_ft_billing -def test_get_provider_details_returns_all_providers(admin_request, db_session): +def test_get_provider_details_returns_all_providers(admin_request, notify_db_session): json_resp = admin_request.get('provider_details.get_providers')['provider_details'] assert len(json_resp) == 4