From ba128d05bcfb13213ed0abdd0ff9a832068caec7 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 3 Nov 2017 13:09:57 +0000
Subject: [PATCH] Use service setting to determine prefixing of SMSs

Rather than doing this nasty `if` statement, let the API work out what
to do. Also means that the logic is not repeated between the two apps.
---
 app/utils.py      | 2 +-
 tests/__init__.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/utils.py b/app/utils.py
index f9ce51bd8..3a69f4486 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -288,7 +288,7 @@ def get_template(
         return SMSPreviewTemplate(
             template,
             prefix=service['name'],
-            sender=sms_sender if sms_sender else (service['sms_sender'] not in {'GOVUK', None}),
+            sender=not service['prefix_sms_with_service_name'],
             show_recipient=show_recipient,
             redact_missing_personalisation=redact_missing_personalisation,
         )
diff --git a/tests/__init__.py b/tests/__init__.py
index b48e2e33e..820d39fe8 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -56,6 +56,7 @@ def service_json(
     permissions=['email', 'sms'],
     organisation_type='central',
     free_sms_fragment_limit=250000,
+    prefix_sms_with_service_name=None,
 ):
     if users is None:
         users = []
@@ -63,6 +64,8 @@ def service_json(
         permissions = []
     if inbound_api is None:
         inbound_api = []
+    if prefix_sms_with_service_name is None:
+        prefix_sms_with_service_name = (sms_sender == 'GOVUK')
     return {
         'id': id_,
         'name': name,
@@ -83,6 +86,7 @@ def service_json(
         'dvla_organisation': '001',
         'permissions': permissions,
         'inbound_api': inbound_api,
+        'prefix_sms_with_service_name': prefix_sms_with_service_name,
     }