Merge pull request #1376 from alphagov/remove-computed-sms-prefix

Remove computed SMS prefix

app/models.py

@@ -281,11 +281,6 @@ class Service(db.Model, Versioned):
         default_letter_contact = [x for x in self.letter_contacts if x.is_default]
         return default_letter_contact[0].contact_block if default_letter_contact else None
 
-    def get_prefix_sms_with_service_name(self):
-        if self.prefix_sms is not None:
-            return self.prefix_sms
-        return self.get_default_sms_sender() == current_app.config['FROM_NUMBER']
-
 
 class AnnualBilling(db.Model):
     __tablename__ = "annual_billing"

app/schemas.py

@@ -209,7 +209,6 @@ class ServiceSchema(BaseSchema):
     reply_to_email_address = fields.Method(method_name="get_reply_to_email_address")
     sms_sender = fields.Method(method_name="get_sms_sender")
     letter_contact_block = fields.Method(method_name="get_letter_contact")
-    prefix_sms_with_service_name = fields.Method(method_name="get_prefix_sms_with_service_name")
 
     def service_permissions(self, service):
         return [p.permission for p in service.permissions]
@@ -223,9 +222,6 @@ class ServiceSchema(BaseSchema):
     def get_letter_contact(self, service):
         return service.get_default_letter_contact()
 
-    def get_prefix_sms_with_service_name(self, service):
-        return service.get_prefix_sms_with_service_name()
-
     class Meta:
         model = models.Service
         dump_only = ['reply_to_email_address', 'letter_contact_block']

tests/app/service/test_rest.py

@@ -158,7 +158,6 @@ def test_get_service_by_id(client, sample_service):
     assert json_resp['data']['branding'] == 'govuk'
     assert json_resp['data']['dvla_organisation'] == '001'
     assert json_resp['data']['sms_sender'] == current_app.config['FROM_NUMBER']
-    assert json_resp['data']['prefix_sms_with_service_name'] is True
     assert json_resp['data']['prefix_sms'] is True
 
 
@@ -1518,7 +1517,7 @@ def test_prefixing_messages_based_on_prefix_sms(
         headers=[('Content-Type', 'application/json'), create_authorization_header()]
     )
     service = json.loads(result.get_data(as_text=True))['data']
-    assert service['prefix_sms_with_service_name'] == should_prefix
+    assert service['prefix_sms'] == should_prefix
 
 
 @pytest.mark.parametrize('posted_value, stored_value, returned_value', [
@@ -1539,10 +1538,6 @@ def test_set_sms_prefixing_for_service(
         _data={'prefix_sms': posted_value},
     )
     assert result['data']['prefix_sms'] == stored_value
-    # This derived value will go away eventually, once we’ve done a migration
-    assert result['data']['prefix_sms_with_service_name'] == returned_value
-    # The derived value is dependent on the service sending from the platform’s
-    # default from number
     assert result['data']['sms_sender'] == current_app.config['FROM_NUMBER']