diff --git a/app/notify_client/notification_api_client.py b/app/notify_client/notification_api_client.py index bfb8c9cc7..596de8ff2 100644 --- a/app/notify_client/notification_api_client.py +++ b/app/notify_client/notification_api_client.py @@ -27,7 +27,9 @@ class NotificationApiClient(BaseAPIClient): status=None, page=None, page_size=None, - limit_days=None + limit_days=None, + include_jobs=None, + include_from_test_key=None ): params = {} if page is not None: @@ -38,6 +40,10 @@ class NotificationApiClient(BaseAPIClient): params['template_type'] = template_type if status is not None: params['status'] = status + if include_jobs is not None: + params['include_jobs'] = include_jobs + if include_from_test_key is not None: + params['include_from_test_key'] = include_from_test_key if job_id: return self.get( url='/service/{}/job/{}/notifications'.format(service_id, job_id), diff --git a/tests/app/notify_client/test_notification_client.py b/tests/app/notify_client/test_notification_client.py index 08db26780..2a5820c02 100644 --- a/tests/app/notify_client/test_notification_client.py +++ b/tests/app/notify_client/test_notification_client.py @@ -25,6 +25,14 @@ def test_client_gets_notifications_with_page(mocker): {'page': 99}, {'url': '/service/abcd1234/notifications', 'params': {'page': 99}} ), + ( + {'include_jobs': False}, + {'url': '/service/abcd1234/notifications', 'params': {'include_jobs': False}} + ), + ( + {'include_from_test_key': True}, + {'url': '/service/abcd1234/notifications', 'params': {'include_from_test_key': True}} + ), ( {'job_id': 'efgh5678'}, {'url': '/service/abcd1234/job/efgh5678/notifications', 'params': {}} diff --git a/tests/conftest.py b/tests/conftest.py index 07c71c421..0e295f657 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -938,7 +938,9 @@ def mock_get_notifications(mocker, api_user_active): limit_days=None, rows=5, set_template_type=None, - set_status=None + set_status=None, + include_jobs=None, + include_from_test_key=None ): job = None if job_id is not None: