diff --git a/app/dao/jobs_dao.py b/app/dao/jobs_dao.py index e78b27645..f562a091f 100644 --- a/app/dao/jobs_dao.py +++ b/app/dao/jobs_dao.py @@ -37,7 +37,7 @@ def dao_get_jobs_by_service_id(service_id, limit_days=None, page=1, page_size=50 ) return Job.query \ .filter(*query_filter) \ - .order_by(desc(Job.created_at)) \ + .order_by(Job.processing_started.desc(), Job.created_at.desc()) \ .paginate(page=page, per_page=page_size) diff --git a/tests/app/conftest.py b/tests/app/conftest.py index c3b8e1093..1dd226b7c 100644 --- a/tests/app/conftest.py +++ b/tests/app/conftest.py @@ -264,7 +264,8 @@ def sample_job(notify_db, notification_count=1, created_at=None, job_status='pending', - scheduled_for=None): + scheduled_for=None, + processing_started=None): if service is None: service = sample_service(notify_db, notify_db_session) if template is None: @@ -281,7 +282,8 @@ def sample_job(notify_db, 'created_at': created_at or datetime.utcnow(), 'created_by': service.created_by, 'job_status': job_status, - 'scheduled_for': scheduled_for + 'scheduled_for': scheduled_for, + 'processing_started': processing_started } job = Job(**data) dao_create_job(job) diff --git a/tests/app/dao/test_jobs_dao.py b/tests/app/dao/test_jobs_dao.py index e13a00795..f823acb3c 100644 --- a/tests/app/dao/test_jobs_dao.py +++ b/tests/app/dao/test_jobs_dao.py @@ -1,4 +1,5 @@ from datetime import datetime, timedelta +from functools import partial import uuid from freezegun import freeze_time @@ -192,23 +193,26 @@ def test_get_jobs_for_service_with_limit_days_edge_case(notify_db, notify_db_ses assert job_eight_days_old not in jobs_limit_days -def test_get_jobs_for_service_in_created_at_order(notify_db, notify_db_session, sample_template): - job_1 = create_job( - notify_db, notify_db_session, sample_template.service, sample_template, created_at=datetime.utcnow()) - job_2 = create_job( - notify_db, notify_db_session, sample_template.service, sample_template, created_at=datetime.utcnow()) - job_3 = create_job( - notify_db, notify_db_session, sample_template.service, sample_template, created_at=datetime.utcnow()) - job_4 = create_job( - notify_db, notify_db_session, sample_template.service, sample_template, created_at=datetime.utcnow()) +def test_get_jobs_for_service_in_processed_at_then_created_at_order(notify_db, notify_db_session, sample_template): + _create_job = partial(create_job, notify_db, notify_db_session, sample_template.service, sample_template) + scheduled_jobs, processed_jobs = [], [] + + for index in range(0, 4): + scheduled_jobs.append(_create_job( + created_at=datetime.utcnow() - timedelta(seconds=index) + )) + processed_jobs.append(_create_job( + created_at=datetime.utcnow() - timedelta(minutes=(4 - index)), + processing_started=datetime.utcnow() - timedelta(hours=index) + )) jobs = dao_get_jobs_by_service_id(sample_template.service.id).items - assert len(jobs) == 4 - assert jobs[0].id == job_4.id - assert jobs[1].id == job_3.id - assert jobs[2].id == job_2.id - assert jobs[3].id == job_1.id + assert len(jobs) == 8 + + for index in range(0, 4): + assert jobs[index].id == scheduled_jobs[index].id + assert jobs[index + 4].id == processed_jobs[index].id def test_update_job(sample_job):