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

Removed logging, and make fire text only client.

Browse Source
This commit is contained in:
Martyn Inglis
2016-02-17 13:59:01 +00:00
parent 226459132a
commit 837c9b7cdb
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/celery/tasks.py
View File

@@ -1,5 +1,5 @@
from app import notify_celery, twilio_client, encryption, firetext_client from app import notify_celery, encryption, firetext_client
from app.clients.sms.twilio import TwilioClientException from app.clients.sms.firetext import FiretextClientException
from app.dao.templates_dao import get_model_templates from app.dao.templates_dao import get_model_templates
from app.dao.notifications_dao import save_notification from app.dao.notifications_dao import save_notification
from app.models import Notification from app.models import Notification
@@ -23,9 +23,8 @@ def send_sms(service_id, notification_id, encrypted_notification):
save_notification(notification_db_object) save_notification(notification_db_object)
try: try:
twilio_client.send_sms(notification['to'], template.content)
firetext_client.send_sms(notification['to'], template.content) firetext_client.send_sms(notification['to'], template.content)
except TwilioClientException as e: except FiretextClientException as e:
current_app.logger.debug(e) current_app.logger.debug(e)
save_notification(notification_db_object, {"status": "failed"}) save_notification(notification_db_object, {"status": "failed"})

3
app/clients/sms/firetext.py
View File

@@ -19,7 +19,6 @@ class FiretextClient(SmsClient):
def init_app(self, config, *args, **kwargs): def init_app(self, config, *args, **kwargs):
super(SmsClient, self).__init__(*args, **kwargs) super(SmsClient, self).__init__(*args, **kwargs)
print(config.config)
self.api_key = config.config.get('FIRETEXT_API_KEY') self.api_key = config.config.get('FIRETEXT_API_KEY')
self.from_number = config.config.get('FIRETEXT_NUMBER') self.from_number = config.config.get('FIRETEXT_NUMBER')
@@ -32,8 +31,6 @@ class FiretextClient(SmsClient):
"message": content "message": content
} }
print(data)
try: try:
response = request( response = request(
"POST", "POST",

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

@@ -1,8 +1,8 @@
import uuid import uuid
import pytest import pytest
from app.celery.tasks import send_sms from app.celery.tasks import send_sms
from app import twilio_client from app import firetext_client
from app.clients.sms.twilio import TwilioClientException from app.clients.sms.firetext import FiretextClientException
from app.dao import notifications_dao from app.dao import notifications_dao
from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.exc import SQLAlchemyError
from sqlalchemy.orm.exc import NoResultFound from sqlalchemy.orm.exc import NoResultFound
@@ -14,7 +14,7 @@ def test_should_send_template_to_correct_sms_provider_and_persist(sample_templat
"to": "+441234123123" "to": "+441234123123"
} }
mocker.patch('app.encryption.decrypt', return_value=notification) mocker.patch('app.encryption.decrypt', return_value=notification)
mocker.patch('app.twilio_client.send_sms') mocker.patch('app.firetext_client.send_sms')
notification_id = uuid.uuid4() notification_id = uuid.uuid4()
@@ -23,7 +23,7 @@ def test_should_send_template_to_correct_sms_provider_and_persist(sample_templat
notification_id, notification_id,
"encrypted-in-reality") "encrypted-in-reality")
twilio_client.send_sms.assert_called_once_with("+441234123123", sample_template.content) firetext_client.send_sms.assert_called_once_with("+441234123123", sample_template.content)
persisted_notification = notifications_dao.get_notification(sample_template.service_id, notification_id) persisted_notification = notifications_dao.get_notification(sample_template.service_id, notification_id)
assert persisted_notification.id == notification_id assert persisted_notification.id == notification_id
assert persisted_notification.to == '+441234123123' assert persisted_notification.to == '+441234123123'
@@ -37,7 +37,7 @@ def test_should_persist_notification_as_failed_if_sms_client_fails(sample_templa
"to": "+441234123123" "to": "+441234123123"
} }
mocker.patch('app.encryption.decrypt', return_value=notification) mocker.patch('app.encryption.decrypt', return_value=notification)
mocker.patch('app.twilio_client.send_sms', side_effect=TwilioClientException()) mocker.patch('app.firetext_client.send_sms', side_effect=FiretextClientException())
notification_id = uuid.uuid4() notification_id = uuid.uuid4()
@@ -46,7 +46,7 @@ def test_should_persist_notification_as_failed_if_sms_client_fails(sample_templa
notification_id, notification_id,
"encrypted-in-reality") "encrypted-in-reality")
twilio_client.send_sms.assert_called_once_with("+441234123123", sample_template.content) firetext_client.send_sms.assert_called_once_with("+441234123123", sample_template.content)
persisted_notification = notifications_dao.get_notification(sample_template.service_id, notification_id) persisted_notification = notifications_dao.get_notification(sample_template.service_id, notification_id)
assert persisted_notification.id == notification_id assert persisted_notification.id == notification_id
assert persisted_notification.to == '+441234123123' assert persisted_notification.to == '+441234123123'
@@ -60,7 +60,7 @@ def test_should_not_send_sms_if_db_peristance_failed(sample_template, mocker):
"to": "+441234123123" "to": "+441234123123"
} }
mocker.patch('app.encryption.decrypt', return_value=notification) mocker.patch('app.encryption.decrypt', return_value=notification)
mocker.patch('app.twilio_client.send_sms', side_effect=TwilioClientException()) mocker.patch('app.firetext_client.send_sms', side_effect=FiretextClientException())
mocker.patch('app.db.session.add', side_effect=SQLAlchemyError()) mocker.patch('app.db.session.add', side_effect=SQLAlchemyError())
notification_id = uuid.uuid4() notification_id = uuid.uuid4()
@@ -70,7 +70,7 @@ def test_should_not_send_sms_if_db_peristance_failed(sample_template, mocker):
notification_id, notification_id,
"encrypted-in-reality") "encrypted-in-reality")
twilio_client.send_sms.assert_not_called() firetext_client.send_sms.assert_not_called()
with pytest.raises(NoResultFound) as e: with pytest.raises(NoResultFound) as e:
notifications_dao.get_notification(sample_template.service_id, notification_id) notifications_dao.get_notification(sample_template.service_id, notification_id)
assert 'No row was found for one' in str(e.value) assert 'No row was found for one' in str(e.value)