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

Merge pull request #2841 from alphagov/jobs-by-contact-list

Browse Source 
Allow jobs to be grouped by contact list
This commit is contained in:
Chris Hill-Scott
2020-05-20 11:49:25 +01:00
committed by GitHub
parent c7f914122a c8cd3c2b70
commit 95a779c649
7 changed files with 130 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/dao/jobs_dao.py
View File

@@ -58,7 +58,15 @@ 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()
def dao_get_jobs_by_service_id(service_id, limit_days=None, page=1, page_size=50, statuses=None):
def dao_get_jobs_by_service_id(
service_id,
*,
limit_days=None,
page=1,
page_size=50,
statuses=None,
contact_list_id=None,
):
query_filter = [
Job.service_id == service_id,
Job.original_file_name != current_app.config['TEST_MESSAGE_FILENAME'],
@@ -70,6 +78,8 @@ def dao_get_jobs_by_service_id(service_id, limit_days=None, page=1, page_size=50
query_filter.append(
Job.job_status.in_(statuses)
)
if contact_list_id is not None:
query_filter.append(Job.contact_list_id == contact_list_id)
return Job.query \
.filter(*query_filter) \
.order_by(Job.processing_started.desc(), Job.created_at.desc()) \