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

Don’t use magic string for job status

Browse Source
This commit is contained in:
Chris Hill-Scott
2016-09-02 23:13:32 +01:00
parent 5d4e942fa1
commit 2c17825c12
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/dao/jobs_dao.py
View File

@@ -2,7 +2,7 @@ from datetime import date, timedelta, datetime
from sqlalchemy import desc, asc, cast, Date as sql_date from sqlalchemy import desc, asc, cast, Date as sql_date
from app import db from app import db
from app.dao import days_ago from app.dao import days_ago
from app.models import Job, NotificationHistory from app.models import Job, NotificationHistory, JOB_STATUS_SCHEDULED
from app.statsd_decorators import statsd from app.statsd_decorators import statsd
from sqlalchemy import func, asc from sqlalchemy import func, asc
@@ -39,7 +39,7 @@ def dao_get_job_by_id(job_id):
def dao_get_scheduled_jobs(): def dao_get_scheduled_jobs():
return Job.query \ return Job.query \
.filter(Job.job_status == 'scheduled', Job.scheduled_for < datetime.utcnow()) \ .filter(Job.job_status == JOB_STATUS_SCHEDULED, Job.scheduled_for < datetime.utcnow()) \
.order_by(asc(Job.scheduled_for)) \ .order_by(asc(Job.scheduled_for)) \
.all() .all()
@@ -49,7 +49,7 @@ def dao_get_future_scheduled_job_by_id_and_service_id(job_id, service_id):
.filter( .filter(
Job.service_id == service_id, Job.service_id == service_id,
Job.id == job_id, Job.id == job_id,
Job.job_status == 'scheduled', Job.job_status == JOB_STATUS_SCHEDULED,
Job.scheduled_for > datetime.utcnow() Job.scheduled_for > datetime.utcnow()
) \ ) \
.one() .one()