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

Order jobs on dashboard page

Browse Source
This commit is contained in:
Martyn Inglis
2016-03-14 16:31:57 +00:00
parent beb6f7ca57
commit b88b0499b9
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/app/conftest.py
View File

@@ -199,7 +199,8 @@ def sample_job(notify_db,
notify_db_session,
service=None,
template=None,
notification_count=1):
notification_count=1,
created_at=datetime.utcnow()):
if service is None:
service = sample_service(notify_db, notify_db_session)
if template is None:
@@ -215,10 +216,12 @@ def sample_job(notify_db,
'bucket_name': bucket_name,
'file_name': file_name,
'original_file_name': 'some.csv',
'notification_count': notification_count
'notification_count': notification_count,
'created_at': created_at
}
job = Job(**data)
dao_create_job(job)
print(job.created_at)
return job

9
tests/app/dao/test_jobs_dao.py
View File

@@ -1,3 +1,4 @@
from datetime import datetime
import uuid
from app.dao.jobs_dao import (
@@ -67,10 +68,10 @@ def test_get_jobs_for_service(notify_db, notify_db_session, sample_template):
def test_get_jobs_for_service_in_created_at_order(notify_db, notify_db_session, sample_template):
from tests.app.conftest import sample_job as create_job
job_1 = create_job(notify_db, notify_db_session, sample_template.service, sample_template)
job_2 = create_job(notify_db, notify_db_session, sample_template.service, sample_template)
job_3 = create_job(notify_db, notify_db_session, sample_template.service, sample_template)
job_4 = create_job(notify_db, notify_db_session, sample_template.service, 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())
jobs = dao_get_jobs_by_service_id(sample_template.service.id)