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

Remove the status column from jobs, and update the new job status column with the previous values

Browse Source
This commit is contained in:
Martyn Inglis
2016-08-25 16:59:38 +01:00
committed by Chris Hill-Scott
parent 668e6c9716
commit 6488feaeec
5 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models.py
View File

@@ -300,9 +300,6 @@ class ProviderDetails(db.Model):
active = db.Column(db.Boolean, default=False)
JOB_STATUS_TYPES = ['pending', 'in progress', 'finished', 'sending limits exceeded']
JOB_STATUS_PENDING = 'pending'
JOB_STATUS_IN_PROGRESS = 'in progress'
JOB_STATUS_FINISHED = 'finished'
@@ -338,7 +335,6 @@ class Job(db.Model):
unique=False,
nullable=True,
onupdate=datetime.datetime.utcnow)
status = db.Column(db.Enum(*JOB_STATUS_TYPES, name='job_status_types'), nullable=False, default='pending')
notification_count = db.Column(db.Integer, nullable=False)
notifications_sent = db.Column(db.Integer, nullable=False, default=0)
notifications_delivered = db.Column(db.Integer, nullable=False, default=0)
@@ -362,7 +358,7 @@ class Job(db.Model):
unique=False,
nullable=True)
job_status = db.Column(
db.String(255), db.ForeignKey('job_status.name'), index=True, nullable=True, default='pending'
db.String(255), db.ForeignKey('job_status.name'), index=True, nullable=False, default='pending'
)