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

Allow jobs to be grouped by contact list

tests/app/dao/test_jobs_dao.py

@@ -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'
 

tests/app/job/test_rest.py

@@ -718,6 +718,7 @@ def test_get_jobs(admin_request, sample_template):
         'service_name': {'name': sample_template.service.name},
         'statistics': [],
         'template': str(sample_template.id),
+        'template_name': sample_template.name,
         'template_type': 'sms',
         'template_version': 1,
         'updated_at': None,
@@ -740,6 +741,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)

tests/app/service/test_service_contact_list_rest.py

@@ -1,9 +1,13 @@
+import pytest
 import uuid
 
+from datetime import datetime, timedelta
+
 from app.models import ServiceContactList
 from tests.app.db import (
     create_job,
     create_service_contact_list,
+    create_service_data_retention,
     create_service,
     create_template,
 )
@@ -65,6 +69,48 @@ def test_get_contact_list(admin_request, notify_db_session):
 
     assert len(response) == 1
     assert response[0] == contact_list.serialize()
+    assert response[0]['job_count'] == 0
+
+
+@pytest.mark.parametrize('days_of_email_retention, expected_job_count', (
+    (None, 8),
+    (7, 8),
+    (3, 4),
+))
+def test_get_contact_list_counts_jobs(
+    sample_template,
+    admin_request,
+    days_of_email_retention,
+    expected_job_count,
+):
+    if days_of_email_retention:
+        create_service_data_retention(sample_template.service, 'email', days_of_email_retention)
+
+    # This should be ignored because it’s another template type
+    create_service_data_retention(sample_template.service, 'sms', 1)
+
+    contact_list_1 = create_service_contact_list(service=sample_template.service)
+    contact_list_2 = create_service_contact_list(service=sample_template.service)
+
+    for i in range(10):
+        create_job(
+            template=sample_template,
+            contact_list_id=contact_list_2.id,
+            created_at=datetime.utcnow() - timedelta(days=i)
+        )
+
+    response = admin_request.get(
+        'service.get_contact_list',
+        service_id=contact_list_1.service_id
+    )
+
+    assert len(response) == 2
+
+    assert response[0]['id'] == str(contact_list_2.id)
+    assert response[0]['job_count'] == expected_job_count
+
+    assert response[1]['id'] == str(contact_list_1.id)
+    assert response[1]['job_count'] == 0
 
 
 def test_get_contact_list_returns_for_service(admin_request, notify_db_session):