add endpoint for 'recent' notifications

This commit is contained in:
Kenneth Kehl
2025-01-30 13:34:44 -08:00
parent 240ec5a712
commit dd9c47e151
2 changed files with 51 additions and 0 deletions

View File

@@ -28,6 +28,7 @@ from app.dao.notifications_dao import (
get_notification_with_personalisation, get_notification_with_personalisation,
get_notifications_for_job, get_notifications_for_job,
get_notifications_for_service, get_notifications_for_service,
get_recent_notifications_for_job,
get_service_ids_with_notifications_on_date, get_service_ids_with_notifications_on_date,
notifications_not_yet_sent, notifications_not_yet_sent,
sanitize_successful_notification_by_id, sanitize_successful_notification_by_id,
@@ -692,6 +693,24 @@ def test_get_all_notifications_for_job(sample_job):
assert len(notifications_from_db) == 5 assert len(notifications_from_db) == 5
def test_get_recent_notifications_for_job(sample_job):
for x in range(0, 5):
try:
n = create_notification(template=sample_job.template, job=sample_job)
if x == 0:
n.status = NotificationStatus.DELIVERED
elif x in [1, 2]:
n.status = NotificationStatus.FAILED
except IntegrityError:
pass
notifications_from_db = get_recent_notifications_for_job(
sample_job.service.id, sample_job.id
).items
assert len(notifications_from_db) == 3
print(notifications_from_db)
def test_get_all_notifications_for_job_by_status(sample_job): def test_get_all_notifications_for_job_by_status(sample_job):
notifications = partial( notifications = partial(
get_notifications_for_job, sample_job.service.id, sample_job.id get_notifications_for_job, sample_job.service.id, sample_job.id

View File

@@ -488,6 +488,38 @@ def test_get_all_notifications_for_job_in_order_of_job_number(
assert resp["notifications"][2]["job_row_number"] == notification_3.job_row_number assert resp["notifications"][2]["job_row_number"] == notification_3.job_row_number
def test_get_recent_notifications_for_job_in_reverse_order_of_job_number(
admin_request, sample_template, mocker
):
mock_s3 = mocker.patch("app.job.rest.get_phone_number_from_s3")
mock_s3.return_value = "15555555555"
mock_s3_personalisation = mocker.patch("app.job.rest.get_personalisation_from_s3")
mock_s3_personalisation.return_value = {}
main_job = create_job(sample_template)
another_job = create_job(sample_template)
notification_1 = create_notification(job=main_job, to_field="1", job_row_number=1)
notification_2 = create_notification(job=main_job, to_field="2", job_row_number=2)
notification_3 = create_notification(job=main_job, to_field="3", job_row_number=3)
create_notification(job=another_job)
resp = admin_request.get(
"job.get_all_notifications_for_service_job",
service_id=main_job.service_id,
job_id=main_job.id,
)
assert len(resp["notifications"]) == 3
assert resp["notifications"][0]["to"] == notification_3.to
assert resp["notifications"][0]["job_row_number"] == notification_3.job_row_number
assert resp["notifications"][1]["to"] == notification_2.to
assert resp["notifications"][1]["job_row_number"] == notification_2.job_row_number
assert resp["notifications"][2]["to"] == notification_1.to
assert resp["notifications"][2]["job_row_number"] == notification_1.job_row_number
@pytest.mark.parametrize( @pytest.mark.parametrize(
"expected_notification_count, status_args", "expected_notification_count, status_args",
[ [