Merge pull request #2617 from alphagov/notification-count-for-job

Return count of notifications in the database for a job
This commit is contained in:
Rebecca Law
2019-10-03 16:54:30 +01:00
committed by GitHub
4 changed files with 59 additions and 1 deletions

View File

@@ -15,6 +15,7 @@ from app.dao.notifications_dao import (
dao_get_last_notification_added_for_job_id,
dao_get_last_template_usage,
dao_get_notifications_by_to_field,
dao_get_notification_count_for_job_id,
dao_get_scheduled_notifications,
dao_timeout_notifications,
dao_update_notification,
@@ -554,6 +555,27 @@ def test_get_all_notifications_for_job_by_status(sample_job):
assert len(notifications(filter_dict={'status': NOTIFICATION_STATUS_TYPES[:3]}).items) == 3
def test_dao_get_notification_count_for_job_id(notify_db_session):
service = create_service()
template = create_template(service)
job = create_job(template, notification_count=3)
for i in range(3):
create_notification(job=job)
create_notification(template)
assert dao_get_notification_count_for_job_id(job_id=job.id) == 3
def test_dao_get_notification_count_for_job_id_returns_zero_for_no_notifications_for_job(notify_db_session):
service = create_service()
template = create_template(service)
job = create_job(template, notification_count=3)
create_notification(template)
assert dao_get_notification_count_for_job_id(job_id=job.id) == 0
def test_update_notification_sets_status(sample_notification):
assert sample_notification.status == 'created'
sample_notification.status = 'failed'

View File

@@ -563,6 +563,28 @@ def test_get_all_notifications_for_job_returns_correct_format(
assert resp['notifications'][0]['status'] == sample_notification_with_job.status
def test_get_notification_count_for_job_id(admin_request, mocker, sample_job):
mock_dao = mocker.patch('app.job.rest.dao_get_notification_count_for_job_id', return_value=3)
response = admin_request.get('job.get_notification_count_for_job_id',
service_id=sample_job.service_id, job_id=sample_job.id)
mock_dao.assert_called_once_with(job_id=str(sample_job.id))
assert response["count"] == 3
def test_get_notification_count_for_job_id_for_wrong_service_id(admin_request, sample_job):
service_id = uuid.uuid4()
response = admin_request.get('job.get_notification_count_for_job_id', service_id=service_id,
job_id=sample_job.id, _expected_status=404)
assert response['message'] == 'No result found'
def test_get_notification_count_for_job_id_for_wrong_job_id(admin_request, sample_service):
job_id = uuid.uuid4()
response = admin_request.get('job.get_notification_count_for_job_id', service_id=sample_service.id,
job_id=job_id, _expected_status=404)
assert response['message'] == 'No result found'
def test_get_job_by_id(admin_request, sample_job):
job_id = str(sample_job.id)
service_id = sample_job.service.id