Refactor code to use inbound_numbers if set

app/delivery/send_to_providers.py

@@ -51,7 +51,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.sms_sender or current_app.config['FROM_NUMBER']
+                    sender=service.get_inbound_number()
                 )
             except Exception as e:
                 dao_toggle_sms_provider(provider.name)

app/models.py

@@ -241,6 +241,12 @@ class Service(db.Model, Versioned):
 
         return cls(**fields)
 
+    def get_inbound_number(self):
+        if self.inbound_number and self.inbound_number.active:
+            return self.inbound_number.number
+        else:
+            return self.sms_sender or current_app.config['FROM_NUMBER']
+
 
 class InboundNumber(db.Model):
     __tablename__ = "inbound_numbers"

app/notifications/receive_notifications.py

@@ -107,7 +107,7 @@ def create_inbound_sms_object(service, content, from_number, provider_ref, date_
 
     inbound = InboundSms(
         service=service,
-        notify_number=service.sms_sender,
+        notify_number=service.get_inbound_number(),
         user_number=user_number,
         provider_date=provider_date,
         provider_reference=provider_ref,

app/v2/notifications/post_notifications.py

@@ -80,10 +80,9 @@ def post_notification(notification_type):
         )
 
     if notification_type == SMS_TYPE:
-        sms_sender = authenticated_service.sms_sender or current_app.config.get('FROM_NUMBER')
         create_resp_partial = functools.partial(
             create_post_sms_response_from_notification,
-            from_number=sms_sender
+            from_number=authenticated_service.get_inbound_number()
         )
     elif notification_type == EMAIL_TYPE:
         create_resp_partial = functools.partial(