From 44d90b0a4f06acc611097cbec17bd5f4addbaa5e Mon Sep 17 00:00:00 2001
From: Ben Thorner <ben.thorner@digital.cabinet-office.gov.uk>
Date: Tue, 12 Apr 2022 14:58:34 +0100
Subject: [PATCH] Remove redundant ternary on SMS client FROM_NUMBER

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.
---
 app/clients/sms/__init__.py   | 10 ----------
 tests/app/clients/test_sms.py | 21 +--------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/app/clients/sms/__init__.py b/app/clients/sms/__init__.py
index a862680e0..d788245f7 100644
--- a/app/clients/sms/__init__.py
+++ b/app/clients/sms/__init__.py
@@ -23,7 +23,6 @@ class SmsClient(Client):
     def init_app(self, current_app, statsd_client):
         self.current_app = current_app
         self.statsd_client = statsd_client
-        self.from_number = self.current_app.config.get('FROM_NUMBER')
 
     def record_outcome(self, success):
         log_message = "Provider request for {} {}".format(
@@ -41,15 +40,6 @@ class SmsClient(Client):
     def send_sms(self, to, content, reference, international, sender):
         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:
             response = self.try_send_sms(to, content, reference, international, sender)
             self.record_outcome(True)
diff --git a/tests/app/clients/test_sms.py b/tests/app/clients/test_sms.py
index b61777a35..86c2c7531 100644
--- a/tests/app/clients/test_sms.py
+++ b/tests/app/clients/test_sms.py
@@ -24,7 +24,7 @@ def test_send_sms(fake_client, mocker):
         content='content',
         reference='reference',
         international=False,
-        sender=None,
+        sender='testing',
     )
 
     mock_send.assert_called_with(
@@ -45,22 +45,3 @@ def test_send_sms_error(fake_client, mocker):
             international=False,
             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'
-    )