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

Merge branch 'master' into update_template_schema

Browse Source
This commit is contained in:
Rebecca Law
2018-01-04 11:45:36 +00:00
committed by GitHub
parent 6a3831eace 9b18afc314
commit 6e6f388f88
25 changed files with 260 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models.py
View File

@@ -14,6 +14,7 @@ from sqlalchemy import UniqueConstraint, CheckConstraint
from notifications_utils.recipients import (
validate_email_address,
validate_phone_number,
try_validate_and_format_phone_number,
InvalidPhoneError,
InvalidEmailError
)
@@ -366,6 +367,9 @@ class ServiceSmsSender(db.Model):
created_at = db.Column(db.DateTime, default=datetime.datetime.utcnow, nullable=False)
updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow)
def get_reply_to_text(self):
return try_validate_and_format_phone_number(self.sms_sender)
def serialize(self):
return {
"id": str(self.id),
@@ -640,7 +644,7 @@ class TemplateBase(db.Model):
elif self.template_type == EMAIL_TYPE:
return self.service.get_default_reply_to_email_address()
elif self.template_type == SMS_TYPE:
return self.service.get_default_sms_sender()
return try_validate_and_format_phone_number(self.service.get_default_sms_sender())
else:
return None