darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-06 06:30:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Remove computed SMS prefix
This commit is contained in:
Chris Hill-Scott
2017-11-21 14:29:33 +00:00
committed by GitHub
parent ef9f18a175 ac885dd4e6
commit 22ec134668
3 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models.py
View File

@@ -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"

4
app/schemas.py
View File

@@ -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']