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

Merge branch 'master' into sent-status

Browse Source
This commit is contained in:
Leo Hemsted
2017-04-26 16:52:16 +01:00
parent 9afc07175a f77b82a4a5
commit a138ec478a
9 changed files with 149 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models.py
View File

@@ -443,6 +443,7 @@ class ProviderDetails(db.Model):
updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow)
created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=True)
created_by = db.relationship('User')
supports_international = db.Column(db.Boolean, nullable=False, default=False)
class ProviderDetailsHistory(db.Model, HistoryModel):
@@ -458,6 +459,7 @@ class ProviderDetailsHistory(db.Model, HistoryModel):
updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow)
created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=True)
created_by = db.relationship('User')
supports_international = db.Column(db.Boolean, nullable=False, default=False)
JOB_STATUS_PENDING = 'pending'
@@ -664,6 +666,12 @@ class Notification(db.Model):
foreign(template_version) == remote(TemplateHistory.version)
))
client_reference = db.Column(db.String, index=True, nullable=True)
international = db.Column(db.Boolean, nullable=False, default=False)
phone_prefix = db.Column(db.String, nullable=True)
rate_multiplier = db.Column(db.Numeric(), nullable=True)
@property
def personalisation(self):
if self._personalisation:
@@ -837,6 +845,10 @@ class NotificationHistory(db.Model, HistoryModel):
reference = db.Column(db.String, nullable=True, index=True)
client_reference = db.Column(db.String, nullable=True)
international = db.Column(db.Boolean, nullable=False, default=False)
phone_prefix = db.Column(db.String, nullable=True)
rate_multiplier = db.Column(db.Numeric(), nullable=True)
@classmethod
def from_original(cls, notification):
history = super().from_original(notification)