From a358acfd052279fa0f2b06836fcbb36912d143df Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Tue, 7 Nov 2017 11:08:26 +0000
Subject: [PATCH] Remove references to computed service attribute

`prefix_sms` is the real database column, which should be referred to
from now on.
---
 app/main/views/service_settings.py        | 5 ++---
 app/templates/views/service-settings.html | 2 +-
 app/utils.py                              | 2 +-
 tests/__init__.py                         | 6 ++----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index ad5817fa1..effcea000 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -109,8 +109,7 @@ def service_settings(service_id):
         default_sms_sender=default_sms_sender,
         sms_sender_count=sms_sender_count,
         free_sms_fragment_limit=free_sms_fragment_limit,
-        prefix_sms_with_service_name=current_service['prefix_sms_with_service_name'],
-
+        prefix_sms=current_service['prefix_sms'],
     )
 
 
@@ -477,7 +476,7 @@ def service_set_sms(service_id):
 def service_set_sms_prefix(service_id):
 
     form = SMSPrefixForm(enabled=(
-        'on' if current_service['prefix_sms_with_service_name'] else 'off'
+        'on' if current_service['prefix_sms'] else 'off'
     ))
 
     form.enabled.label.text = 'Start all text messages with ‘{}:’'.format(current_service['name'])
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index cebf16b43..07439ba83 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -94,7 +94,7 @@
 
           {% call row() %}
             {{ text_field('Text messages start with service name') }}
-            {{ boolean_field(prefix_sms_with_service_name) }}
+            {{ boolean_field(prefix_sms) }}
             {{ edit_field('Change', url_for('.service_set_sms_prefix', service_id=current_service.id)) }}
           {% endcall %}
 
diff --git a/app/utils.py b/app/utils.py
index 3a69f4486..5b1052567 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -288,7 +288,7 @@ def get_template(
         return SMSPreviewTemplate(
             template,
             prefix=service['name'],
-            sender=not service['prefix_sms_with_service_name'],
+            sender=not service['prefix_sms'],
             show_recipient=show_recipient,
             redact_missing_personalisation=redact_missing_personalisation,
         )
diff --git a/tests/__init__.py b/tests/__init__.py
index c8f7ec629..372d34f6c 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -56,7 +56,7 @@ def service_json(
     permissions=None,
     organisation_type='central',
     free_sms_fragment_limit=250000,
-    prefix_sms_with_service_name='Treat as None',
+    prefix_sms=True,
 ):
     if users is None:
         users = []
@@ -64,8 +64,6 @@ def service_json(
         permissions = ['email', 'sms']
     if inbound_api is None:
         inbound_api = []
-    if prefix_sms_with_service_name == 'Treat as None':
-        prefix_sms_with_service_name = (sms_sender == 'GOVUK')
     return {
         'id': id_,
         'name': name,
@@ -86,7 +84,7 @@ def service_json(
         'dvla_organisation': '001',
         'permissions': permissions,
         'inbound_api': inbound_api,
-        'prefix_sms_with_service_name': prefix_sms_with_service_name,
+        'prefix_sms': prefix_sms,
     }