diff --git a/app/notify_client/job_api_client.py b/app/notify_client/job_api_client.py index 3db4c6631..dd43bf34c 100644 --- a/app/notify_client/job_api_client.py +++ b/app/notify_client/job_api_client.py @@ -71,9 +71,10 @@ class JobApiClient(BaseAPIClient): job = self.post(url='/service/{}/job'.format(service_id), data=data) if 'notifications_sent' not in job['data']: - stats = self.__convert_statistics(job) + stats = self.__convert_statistics(job['data']) job['data']['notifications_sent'] = stats['delivered'] + stats['failed'] job['data']['notifications_delivered'] = stats['delivered'] job['data']['notifications_failed'] = stats['failed'] + job['data']['notifications_requested'] = stats['requested'] return job diff --git a/tests/app/notify_client/test_job_client.py b/tests/app/notify_client/test_job_client.py index f2ff70560..dd8306dd7 100644 --- a/tests/app/notify_client/test_job_client.py +++ b/tests/app/notify_client/test_job_client.py @@ -20,9 +20,17 @@ def test_client_creates_job_data_correctly(mocker, fake_uuid): expected_url = '/service/{}/job'.format(service_id) client = JobApiClient() - mock_post = mocker.patch('app.notify_client.job_api_client.JobApiClient.post') + mock_post = mocker.patch( + 'app.notify_client.job_api_client.JobApiClient.post', + return_value={'data': dict(statistics=[], **expected_data)} + ) - client.create_job(job_id, service_id, template_id, original_file_name, notification_count) + result = client.create_job(job_id, service_id, template_id, original_file_name, notification_count) + + assert result['data']['notifications_requested'] == 0 + assert result['data']['notifications_sent'] == 0 + assert result['data']['notification_count'] == 1 + assert result['data']['notifications_failed'] == 0 mock_post.assert_called_once_with(url=expected_url, data=expected_data)