darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-15 17:52:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

initial sms provider cleanup

Browse Source
This commit is contained in:
Jim Moffet
2022-06-25 13:05:10 -07:00
parent b0f8a51f99
commit 2bcae20441
7 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/delivery/send_to_providers.py
View File

@@ -45,6 +45,9 @@ def send_sms_to_provider(notification):
if notification.status == 'created':
provider = provider_to_use(SMS_TYPE, notification.international)
if not provider:
technical_failure(notification=notification)
return
template_model = SerialisedTemplate.from_id_and_service_id(
template_id=notification.template_id, service_id=service.id, version=notification.template_version
@@ -169,9 +172,10 @@ provider_cache = TTLCache(maxsize=8, ttl=10)
@cached(cache=provider_cache)
def provider_to_use(notification_type, international=True):
international = True # TODO: remove or resolve the functionality of this
international = False # TODO: remove or resolve the functionality of this flag
# TODO rip firetext and mmg out of early migrations and clean up the expression below
active_providers = [
p for p in get_provider_details_by_notification_type(notification_type, international) if p.active
p for p in get_provider_details_by_notification_type(notification_type, international) if p.active and p.identifier not in ['firetext','mmg']
]
if not active_providers:
@@ -181,11 +185,10 @@ def provider_to_use(notification_type, international=True):
raise Exception("No active {} providers".format(notification_type))
if len(active_providers) == 1:
weights = [100]
chosen_provider = active_providers[0]
else:
weights = [p.priority for p in active_providers]
chosen_provider = random.choices(active_providers, weights=weights)[0]
chosen_provider = random.choices(active_providers, weights=weights)[0]
return notification_provider_clients.get_client_by_name_and_type(chosen_provider.identifier, notification_type)