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

Merge branch 'master' into improve-get-services

Browse Source
This commit is contained in:
Rebecca Law
2017-10-25 16:11:35 +01:00
parent d1561903ed 5ed8f17885
commit 4304aad9fc
7 changed files with 81 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/delivery/send_to_providers.py
View File

@@ -73,7 +73,7 @@ def send_sms_to_provider(notification):
to=validate_and_format_phone_number(notification.to, international=notification.international),
content=str(template),
reference=str(notification.id),
sender=service.get_inbound_number()
sender=service.get_default_sms_sender()
)
except Exception as e:
dao_toggle_sms_provider(provider.name)

2
app/models.py
View File

@@ -275,8 +275,6 @@ class Service(db.Model, Versioned):
def get_inbound_number(self):
if self.inbound_number and self.inbound_number.active:
return self.inbound_number.number
else:
return self.get_default_sms_sender()
def get_default_sms_sender(self):
default_sms_sender = [x for x in self.service_sms_senders if x.is_default]

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

@@ -95,7 +95,7 @@ def post_notification(notification_type):
if notification_type == SMS_TYPE:
create_resp_partial = functools.partial(
create_post_sms_response_from_notification,
from_number=authenticated_service.get_inbound_number()
from_number=authenticated_service.get_default_sms_sender()
)
elif notification_type == EMAIL_TYPE:
create_resp_partial = functools.partial(