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

Remove redundant ternary on SMS client FROM_NUMBER

Browse Source 
Logs over the past 14 days confirm we never call this code with
None as the sender, so it's safe to remove the ternary.
This commit is contained in:
Ben Thorner
2022-04-12 14:58:34 +01:00
parent 385be77d67
commit 44d90b0a4f
2 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/clients/sms/__init__.py
View File

@@ -23,7 +23,6 @@ class SmsClient(Client):
def init_app(self, current_app, statsd_client): def init_app(self, current_app, statsd_client):
self.current_app = current_app self.current_app = current_app
self.statsd_client = statsd_client self.statsd_client = statsd_client
self.from_number = self.current_app.config.get('FROM_NUMBER')
def record_outcome(self, success): def record_outcome(self, success):
log_message = "Provider request for {} {}".format( log_message = "Provider request for {} {}".format(
@@ -41,15 +40,6 @@ class SmsClient(Client):
def send_sms(self, to, content, reference, international, sender): def send_sms(self, to, content, reference, international, sender):
start_time = monotonic() start_time = monotonic()
if sender is None:
# temporary log to see if the following ternary is necessary
# or if it's safe to remove it - keep for 1-2 weeks
self.current_app.logger.warning(
f"send_sms called with 'sender' of 'None' for {reference}"
)
sender = self.from_number if sender is None else sender
try: try:
response = self.try_send_sms(to, content, reference, international, sender) response = self.try_send_sms(to, content, reference, international, sender)
self.record_outcome(True) self.record_outcome(True)

21
tests/app/clients/test_sms.py
View File

@@ -24,7 +24,7 @@ def test_send_sms(fake_client, mocker):
content='content', content='content',
reference='reference', reference='reference',
international=False, international=False,
sender=None, sender='testing',
) )
mock_send.assert_called_with( mock_send.assert_called_with(
@@ -45,22 +45,3 @@ def test_send_sms_error(fake_client, mocker):
international=False, international=False,
sender=None, sender=None,
) )
def test_send_sms_override_configured_shortcode_with_sender(
fake_client,
mocker
):
mock_send = mocker.patch.object(fake_client, 'try_send_sms')
fake_client.send_sms(
to='to',
content='content',
reference='reference',
international=False,
sender='sender'
)
mock_send.assert_called_with(
'to', 'content', 'reference', False, 'sender'
)