mirror of
https://github.com/GSA/notifications-api.git
synced 2026-07-16 11:20:41 -04:00
Allow jobs to be filtered by contact list
Rather than showing all jobs that have been ‘copied’ from a contact list I think it makes more sense to group them under the contact list. This way it’s easier to see what messages have been sent to a given group of contacts over time. Part of this work means the API needs to return only jobs that have been created from a given contact list, when asked.
This commit is contained in:
@@ -25,7 +25,7 @@ from app.models import (
|
||||
EMAIL_TYPE, SMS_TYPE, LETTER_TYPE,
|
||||
JOB_STATUS_FINISHED
|
||||
)
|
||||
from tests.app.db import create_job, create_service, create_template, create_notification
|
||||
from tests.app.db import create_job, create_service, create_template, create_notification, create_service_contact_list
|
||||
|
||||
|
||||
def test_should_have_decorated_notifications_dao_functions():
|
||||
@@ -168,6 +168,26 @@ def test_get_jobs_for_service_in_processed_at_then_created_at_order(notify_db, n
|
||||
assert jobs[index].id == created_jobs[index].id
|
||||
|
||||
|
||||
def test_get_jobs_for_service_by_contact_list(sample_template):
|
||||
contact_list = create_service_contact_list()
|
||||
job_1 = create_job(sample_template)
|
||||
job_2 = create_job(sample_template, contact_list_id=contact_list.id)
|
||||
|
||||
assert dao_get_jobs_by_service_id(
|
||||
sample_template.service.id
|
||||
).items == [
|
||||
job_2,
|
||||
job_1,
|
||||
]
|
||||
|
||||
assert dao_get_jobs_by_service_id(
|
||||
sample_template.service.id,
|
||||
contact_list_id=contact_list.id,
|
||||
).items == [
|
||||
job_2,
|
||||
]
|
||||
|
||||
|
||||
def test_update_job(sample_job):
|
||||
assert sample_job.job_status == 'pending'
|
||||
|
||||
|
||||
@@ -740,6 +740,20 @@ def test_get_jobs_with_limit_days(admin_request, sample_template):
|
||||
assert len(resp_json['data']) == 2
|
||||
|
||||
|
||||
def test_get_jobs_by_contact_list(admin_request, sample_template):
|
||||
contact_list = create_service_contact_list()
|
||||
create_job(template=sample_template)
|
||||
create_job(template=sample_template, contact_list_id=contact_list.id)
|
||||
|
||||
resp_json = admin_request.get(
|
||||
'job.get_jobs_by_service',
|
||||
service_id=sample_template.service_id,
|
||||
contact_list_id=contact_list.id,
|
||||
)
|
||||
|
||||
assert len(resp_json['data']) == 1
|
||||
|
||||
|
||||
def test_get_jobs_should_return_statistics(admin_request, sample_template):
|
||||
now = datetime.utcnow()
|
||||
earlier = datetime.utcnow() - timedelta(days=1)
|
||||
|
||||
Reference in New Issue
Block a user