Test for filtering a job by notification status

It’s going to be useful to see all the notifications for a job that are
failed/delivered/etc.

The API seems to support this behaviour already, but it doesn’t seem to
be tested.

This commit adds some testsfor the DAO and REST layers.

tests/app/dao/test_notification_dao.py

@@ -1,5 +1,6 @@
 from datetime import datetime, timedelta, date
 import uuid
+from functools import partial
 
 import pytest
 
@@ -12,7 +13,8 @@ from app.models import (
     Notification,
     Job,
     NotificationStatistics,
-    TemplateStatistics
+    TemplateStatistics,
+    NOTIFICATION_STATUS_TYPES
 )
 
 from app.dao.notifications_dao import (
@@ -607,6 +609,28 @@ def test_get_all_notifications_for_job(notify_db, notify_db_session, sample_job)
     _assert_notification_stats(sample_job.service.id, sms_requested=5)
 
 
+def test_get_all_notifications_for_job_by_status(notify_db, notify_db_session, sample_job):
+
+    notifications = partial(get_notifications_for_job, sample_job.service.id, sample_job.id)
+
+    for status in NOTIFICATION_STATUS_TYPES:
+        sample_notification(
+            notify_db,
+            notify_db_session,
+            service=sample_job.service,
+            template=sample_job.template,
+            job=sample_job,
+            status=status
+        )
+
+    assert len(notifications().items) == len(NOTIFICATION_STATUS_TYPES)
+
+    for status in NOTIFICATION_STATUS_TYPES:
+        assert len(notifications(filter_dict={'status': status}).items) == 1
+
+    assert len(notifications(filter_dict={'status': NOTIFICATION_STATUS_TYPES[:3]}).items) == 3
+
+
 def test_update_notification(sample_notification, sample_template):
     assert sample_notification.status == 'sending'
     sample_notification.status = 'failed'

tests/app/notifications/test_rest.py

@@ -2,6 +2,7 @@ from datetime import datetime
 import uuid
 import random
 import string
+import pytest
 import app.celery.tasks
 from mock import ANY
 from app import encryption
@@ -12,7 +13,7 @@ from tests.app.conftest import sample_service as create_sample_service
 from tests.app.conftest import sample_email_template as create_sample_email_template
 from tests.app.conftest import sample_template as create_sample_template
 from flask import (json, current_app, url_for)
-from app.models import Service
+from app.models import Service, NOTIFICATION_STATUS_TYPES
 from app.dao.templates_dao import dao_get_all_templates_for_service, dao_update_template
 from app.dao.services_dao import dao_update_service
 from app.dao.notifications_dao import get_notification_by_id, dao_get_notification_statistics_for_service
@@ -182,6 +183,62 @@ def test_get_all_notifications_for_job_in_order_of_job_number(notify_api,
             assert response.status_code == 200
 
 
+@pytest.mark.parametrize(
+    "expected_notification_count, status_args",
+    [
+        (
+            1,
+            '?status={}'.format(NOTIFICATION_STATUS_TYPES[0])
+        ),
+        (
+            0,
+            '?status={}'.format(NOTIFICATION_STATUS_TYPES[1])
+        ),
+        (
+            1,
+            '?status={}&status={}&status={}'.format(
+                *NOTIFICATION_STATUS_TYPES[0:3]
+            )
+        ),
+        (
+            0,
+            '?status={}&status={}&status={}'.format(
+                *NOTIFICATION_STATUS_TYPES[3:6]
+            )
+        ),
+    ]
+)
+def test_get_all_notifications_for_job_filtered_by_status(
+    notify_api,
+    notify_db,
+    notify_db_session,
+    sample_service,
+    expected_notification_count,
+    status_args
+):
+    with notify_api.test_request_context():
+        with notify_api.test_client() as client:
+            job = create_sample_job(notify_db, notify_db_session, service=sample_service)
+
+            create_sample_notification(
+                notify_db,
+                notify_db_session,
+                job=job,
+                to_field="1",
+                created_at=datetime.utcnow(),
+                status=NOTIFICATION_STATUS_TYPES[0],
+                job_row_number=1
+            )
+
+            response = client.get(
+                path='/service/{}/job/{}/notifications{}'.format(sample_service.id, job.id, status_args),
+                headers=[create_authorization_header()]
+            )
+            resp = json.loads(response.get_data(as_text=True))
+            assert len(resp['notifications']) == expected_notification_count
+            assert response.status_code == 200
+
+
 def test_should_not_get_notifications_by_service_with_client_credentials(notify_api, sample_api_key):
     with notify_api.test_request_context():
         with notify_api.test_client() as client: