From 11a4b1845181a97eea943d6651789bb5258a5bc7 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 2 Sep 2016 12:20:28 +0100 Subject: [PATCH] Combine query filters when getting scheduled job > filter_by and filter are just aliases for each other so can be > combined together - filter is probably the better one (and then use > == instead of keyword args) --- app/dao/jobs_dao.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/dao/jobs_dao.py b/app/dao/jobs_dao.py index 94bcc6210..74d9a4f90 100644 --- a/app/dao/jobs_dao.py +++ b/app/dao/jobs_dao.py @@ -46,8 +46,12 @@ def dao_get_scheduled_jobs(): def dao_get_future_scheduled_job_by_id_and_service_id(job_id, service_id): return Job.query \ - .filter_by(service_id=service_id, id=job_id) \ - .filter(Job.job_status == 'scheduled', Job.scheduled_for > datetime.utcnow()) \ + .filter( + Job.service_id == service_id, + Job.id == job_id, + Job.job_status == 'scheduled', + Job.scheduled_for > datetime.utcnow() + ) \ .one()