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

fix dao_get_jobs_by_service_id

Browse Source 
statuses now defaults to correct val
This commit is contained in:
Leo Hemsted
2016-09-23 17:05:42 +01:00
parent fb6cb5f236
commit d3c0c48401
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dao/jobs_dao.py
View File

@@ -27,11 +27,11 @@ def dao_get_job_by_service_id_and_job_id(service_id, job_id):
return Job.query.filter_by(service_id=service_id, id=job_id).one() return Job.query.filter_by(service_id=service_id, id=job_id).one()
def dao_get_jobs_by_service_id(service_id, limit_days=None, page=1, page_size=50, statuses=''): def dao_get_jobs_by_service_id(service_id, limit_days=None, page=1, page_size=50, statuses=None):
query_filter = [Job.service_id == service_id] query_filter = [Job.service_id == service_id]
if limit_days is not None: if limit_days is not None:
query_filter.append(cast(Job.created_at, sql_date) >= days_ago(limit_days)) query_filter.append(cast(Job.created_at, sql_date) >= days_ago(limit_days))
if statuses != ['']: if statuses is not None and statuses != ['']:
query_filter.append( query_filter.append(
Job.job_status.in_(statuses) Job.job_status.in_(statuses)
) )

1
app/models.py
View File

@@ -313,6 +313,7 @@ JOB_STATUS_TYPES = [
JOB_STATUS_CANCELLED JOB_STATUS_CANCELLED
] ]
class JobStatus(db.Model): class JobStatus(db.Model):
__tablename__ = 'job_status' __tablename__ = 'job_status'