darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 17:01:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Created a get_default_sms_sender method, which returns the default sms_sender from the service_sms_sender table rather than service.sms_sender.

Browse Source 
One step closer to removing services.sms_sender.

fix the unit tests
This commit is contained in:
Rebecca Law
2017-09-21 16:41:10 +01:00
parent a74db5a80b
commit ba7cd79581
4 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models.py
View File

@@ -249,7 +249,13 @@ class Service(db.Model, Versioned):
if self.inbound_number and self.inbound_number.active:
return self.inbound_number.number
else:
return self.sms_sender
return self.get_default_sms_sender()
def get_default_sms_sender(self):
default_sms_sender = [x for x in self.service_sms_senders if x.is_default]
if len(default_sms_sender) > 1:
raise Exception("There should only ever be one default")
return default_sms_sender[0].sms_sender
def get_default_reply_to_email_address(self):
default_reply_to = [x for x in self.reply_to_email_addresses if x.is_default]
@@ -303,7 +309,7 @@ class ServiceSmsSender(db.Model):
id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
sms_sender = db.Column(db.String(11), nullable=False)
service_id = db.Column(UUID(as_uuid=True), db.ForeignKey('services.id'), unique=True, index=True, nullable=False)
service = db.relationship(Service, backref=db.backref("service_sms_senders", uselist=False))
service = db.relationship(Service, backref=db.backref("service_sms_senders", uselist=True))
is_default = db.Column(db.Boolean, nullable=False, default=True)
inbound_number_id = db.Column(UUID(as_uuid=True), db.ForeignKey('inbound_numbers.id'),
unique=True, index=True, nullable=True)
@@ -1002,7 +1008,7 @@ class Notification(db.Model):
return NOTIFICATION_STATUS_LETTER_ACCEPTED
else:
# Currently can only be technical-failure
return status
return self.status
def serialize_for_csv(self):
created_at_in_bst = convert_utc_to_bst(self.created_at)