diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index 5dc5906b3..71dee7614 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -268,35 +268,25 @@ def get_notifications_for_job( def get_recent_notifications_for_job( - service_id, job_id, filter_dict=None, page=1, page_size=None, status=None + service_id, job_id, filter_dict=None, page=1, page_size=None ): if page_size is None: page_size = current_app.config["PAGE_SIZE"] - if status is None: - stmt = select(Notification).where( - Notification.service_id == service_id, - Notification.job_id == job_id, - ) - else: - stmt = select(Notification).where( - Notification.service_id == service_id, - Notification.job_id == job_id, - Notification.status == status, - ) + stmt = select(Notification).where( + Notification.service_id == service_id, + Notification.job_id == job_id, + ) stmt = _filter_query(stmt, filter_dict) stmt = stmt.order_by(desc(Notification.job_row_number)) print(f"STMT {stmt}") results = db.session.execute(stmt).scalars().all() - print(f"RESULTS {results}") page_size = current_app.config["PAGE_SIZE"] offset = (page - 1) * page_size paginated_results = results[offset : offset + page_size] - print( - f"PAGINATED RESULTS {paginated_results} page_size {page_size} offset {offset}" - ) + pagination = Pagination(paginated_results, page, page_size, len(results)) return pagination diff --git a/tests/app/job/test_rest.py b/tests/app/job/test_rest.py index 75eb8660d..6abbf4cee 100644 --- a/tests/app/job/test_rest.py +++ b/tests/app/job/test_rest.py @@ -518,11 +518,12 @@ def test_get_recent_notifications_for_job_in_reverse_order_of_job_number( assert resp["notifications"][0]["status"] == "virus-scan-failed" assert resp["notifications"][0]["job_row_number"] == 13 + filter_dict = {"status": NotificationStatus.DELIVERED} resp = admin_request.get( "job.get_recent_notifications_for_service_job", service_id=main_job.service_id, job_id=main_job.id, - status=NotificationStatus.DELIVERED, + filter_dict=filter_dict, ) assert len(resp["notifications"]) == 1