darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 15:46:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into update-job-status

Browse Source 
Conflicts:
	app/dao/jobs_dao.py
	tests/app/dao/test_jobs_dao.py
This commit is contained in:
Rebecca Law
2017-04-06 11:11:37 +01:00
parent 6313640cbf 29c84d73ff
commit 4f6a66c904
12 changed files with 170 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/dao/jobs_dao.py
View File

@@ -121,7 +121,8 @@ def dao_update_job_status(job_id, status):
db.session.commit()
def dao_get_jobs_older_than(limit_days):
def dao_get_jobs_older_than_limited_by(older_than=7, limit_days=2):
return Job.query.filter(
cast(Job.created_at, sql_date) < days_ago(limit_days)
cast(Job.created_at, sql_date) < days_ago(older_than),
cast(Job.created_at, sql_date) >= days_ago(older_than + limit_days)
).order_by(desc(Job.created_at)).all()