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

Remove Notification, NotificationHistory status labels:

Browse Source 
Replace labels by adding a key kwarg in the model for status.

We still need this as sqlalchemy attmempts to look for `notification_status`
on the model (Notification/NotificationHistory). To achieve true ORM mapping
(map status -> notification_status) we need the key kwarg.

More here:
http://docs.sqlalchemy.org/en/latest/core/metadata.html#sqlalchemy.schema.Column#key
This commit is contained in:
Imdad Ahad
2017-07-06 14:20:24 +01:00
parent c8c47f44a9
commit a9c1338873
6 changed files with 16 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/models.py
View File

@@ -788,14 +788,14 @@ class Notification(db.Model):
unique=False,
nullable=True,
onupdate=datetime.datetime.utcnow)
_status_enum = db.Column('status', NOTIFICATION_STATUS_TYPES_ENUM, index=True, nullable=True, default='created')
_status_fkey = db.Column(
status = db.Column(
'notification_status',
db.String,
db.ForeignKey('notification_status_types.name'),
index=True,
nullable=True,
default='created'
default='created',
key='status' # http://docs.sqlalchemy.org/en/latest/core/metadata.html#sqlalchemy.schema.Column
)
reference = db.Column(db.String, nullable=True, index=True)
client_reference = db.Column(db.String, index=True, nullable=True)
@@ -817,14 +817,6 @@ class Notification(db.Model):
created_by = db.relationship('User')
created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), nullable=True)
@hybrid_property
def status(self):
return self._status_fkey
@status.setter
def status(self, status):
self._status_fkey = status
@property
def personalisation(self):
if self._personalisation:
@@ -998,14 +990,14 @@ class NotificationHistory(db.Model, HistoryModel):
sent_at = db.Column(db.DateTime, index=False, unique=False, nullable=True)
sent_by = db.Column(db.String, nullable=True)
updated_at = db.Column(db.DateTime, index=False, unique=False, nullable=True)
_status_enum = db.Column('status', NOTIFICATION_STATUS_TYPES_ENUM, index=True, nullable=True, default='created')
_status_fkey = db.Column(
status = db.Column(
'notification_status',
db.String,
db.ForeignKey('notification_status_types.name'),
index=True,
nullable=True,
default='created'
default='created',
key='status' # http://docs.sqlalchemy.org/en/latest/core/metadata.html#sqlalchemy.schema.Column
)
reference = db.Column(db.String, nullable=True, index=True)
client_reference = db.Column(db.String, nullable=True)
@@ -1027,14 +1019,6 @@ class NotificationHistory(db.Model, HistoryModel):
super().update_from_original(original)
self.status = original.status
@hybrid_property
def status(self):
return self._status_fkey
@status.setter
def status(self, status):
self._status_fkey = status
INVITED_USER_STATUS_TYPES = ['pending', 'accepted', 'cancelled']