From 2dc07b9ceede4c7b6cf74dc085cb936dab5253c0 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Thu, 30 Jan 2025 14:41:14 -0800 Subject: [PATCH] fix test --- app/dao/notifications_dao.py | 3 ++- .../dao/notification_dao/test_notification_dao.py | 14 ++++---------- tests/app/job/test_rest.py | 5 +++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index 418f33ff1..39893dfd4 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -276,7 +276,8 @@ def get_recent_notifications_for_job( stmt = select(Notification).where( Notification.service_id == service_id, Notification.job_id == job_id, - Notification.status in [NotificationStatus.FAILED, NotificationStatus.DELIVERED], + Notification.status + in [NotificationStatus.FAILED, NotificationStatus.DELIVERED], ) stmt = _filter_query(stmt, filter_dict) stmt = stmt.order_by(desc(Notification.job_row_number)) diff --git a/tests/app/dao/notification_dao/test_notification_dao.py b/tests/app/dao/notification_dao/test_notification_dao.py index 82883466e..8811ae80d 100644 --- a/tests/app/dao/notification_dao/test_notification_dao.py +++ b/tests/app/dao/notification_dao/test_notification_dao.py @@ -694,20 +694,14 @@ def test_get_all_notifications_for_job(sample_job): 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 + + for status in NotificationStatus: + create_notification(template=sample_job.template, job=sample_job, status=status) notifications_from_db = get_recent_notifications_for_job( sample_job.service.id, sample_job.id ).items - assert len(notifications_from_db) == 3 + assert len(notifications_from_db) == 2 print(notifications_from_db) diff --git a/tests/app/job/test_rest.py b/tests/app/job/test_rest.py index bdecc3165..e5299df6e 100644 --- a/tests/app/job/test_rest.py +++ b/tests/app/job/test_rest.py @@ -503,6 +503,11 @@ def test_get_recent_notifications_for_job_in_reverse_order_of_job_number( 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) + + count = 1 + for status in NotificationStatus: + create_notification(job=main_job, to_field=str(count), status=status) + count = count + 1 create_notification(job=another_job) resp = admin_request.get(