darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-31 15:15:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Check Firetext code first to determine status and log the reason

Browse Source 
If there is no code, fall back to old way of determining status.
If the code is not recognised, log an Error so we are notified
and can look into it.
This commit is contained in:
Pea Tyczynska
2020-04-20 18:20:01 +01:00
parent fef03920f0
commit b962dcac5d
3 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,15 +20,15 @@ firetext_responses = {
}
firetext_codes = {
'101': 'permanent-failure', # Unknown Subscriber
'102': 'temporary-failure', # Absent Subscriber
'103': 'temporary-failure', # Subscriber Busy
'104': 'temporary-failure', # No Subscriber Memory
'201': 'permanent-failure', # Invalid Number
'301': 'permanent-failure', # SMS Not Supported
'302': 'temporary-failure', # SMS Not Supported
'401': 'permanent-failure', # Message Rejected
'900': 'temporary-failure', # Routing Error
'101': {'status': 'permanent-failure', 'reason': 'Unknown Subscriber'},
'102': {'status': 'temporary-failure', 'reason': 'Absent Subscriber'},
'103': {'status': 'temporary-failure', 'reason': 'Subscriber Busy'},
'104': {'status': 'temporary-failure', 'reason': 'No Subscriber Memory'},
'201': {'status': 'permanent-failure', 'reason': 'Invalid Number'},
'301': {'status': 'permanent-failure', 'reason': 'SMS Not Supported'},
'302': {'status': 'temporary-failure', 'reason': 'SMS Not Supported'},
'401': {'status': 'permanent-failure', 'reason': 'Message Rejected'},
'900': {'status': 'temporary-failure', 'reason': 'Routing Error'},
}
@@ -36,8 +36,8 @@ def get_firetext_responses(status):
return firetext_responses[status]
def get_message_status_from_firetext_code(code):
return firetext_codes[code]
def get_message_status_and_reason_from_firetext_code(code):
return firetext_codes[code]['status'], firetext_codes[code]['reason']
class FiretextClientResponseException(SmsClientResponseException):

20
app/dao/notifications_dao.py
View File

@@ -52,7 +52,7 @@ from app.models import (
)
from app.utils import get_london_midnight_in_utc
from app.utils import midnight_n_days_ago, escape_special_characters
from app.clients.sms.firetext import get_message_status_from_firetext_code
from app.clients.sms.firetext import get_message_status_and_reason_from_firetext_code
@statsd(namespace="dao")
@@ -90,15 +90,19 @@ def dao_create_notification(notification):
db.session.add(notification)
def _decide_permanent_temporary_failure(current_status, status, code=None):
def _decide_permanent_temporary_failure(status, notification, code=None):
# Firetext will send pending, then send either succes or fail.
# If we go from pending to failure we need to set failure type as temporary-failure,
# unless we get a detailed code from firetext. Then we should use that code to set status instead.
if current_status == NOTIFICATION_PENDING and status == NOTIFICATION_PERMANENT_FAILURE:
if code:
status = get_message_status_from_firetext_code(code)
else:
status = NOTIFICATION_TEMPORARY_FAILURE
if code:
try:
status, reason = get_message_status_and_reason_from_firetext_code(code)
current_app.logger.info(f'Updating notification id {notification.id} to status {status}, reason: {reason}')
return status
except KeyError:
current_app.logger.error(f'Failure code {code} from Firetext not recognised')
if notification.status == NOTIFICATION_PENDING and status == NOTIFICATION_PERMANENT_FAILURE:
status = NOTIFICATION_TEMPORARY_FAILURE
return status
@@ -108,7 +112,7 @@ def country_records_delivery(phone_prefix):
def _update_notification_status(notification, status, code=None):
status = _decide_permanent_temporary_failure(current_status=notification.status, status=status, code=code)
status = _decide_permanent_temporary_failure(status=status, notification=notification, code=code)
notification.status = status
dao_update_notification(notification)
return notification