update to support status dropdown

This commit is contained in:
Kenneth Kehl
2025-01-31 11:03:35 -08:00
parent 1942a4452c
commit 6c66d66c09
2 changed files with 20 additions and 9 deletions

View File

@@ -268,18 +268,23 @@ def get_notifications_for_job(
def get_recent_notifications_for_job(
service_id, job_id, filter_dict=None, page=1, page_size=None
service_id, job_id, filter_dict=None, page=1, page_size=None, status=None
):
if page_size is None:
page_size = current_app.config["PAGE_SIZE"]
stmt = select(Notification).where(
Notification.service_id == service_id,
Notification.job_id == job_id,
Notification.status.in_(
[NotificationStatus.FAILED, NotificationStatus.DELIVERED]
),
)
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 = _filter_query(stmt, filter_dict)
stmt = stmt.order_by(desc(Notification.job_row_number))
print(f"STMT {stmt}")

View File

@@ -134,8 +134,14 @@ def get_recent_notifications_for_service_job(service_id, job_id):
if "page_size" in data
else current_app.config.get("PAGE_SIZE")
)
status = data["status"] if "status" in data else None
paginated_notifications = get_recent_notifications_for_job(
service_id, job_id, filter_dict=data, page=page, page_size=page_size
service_id,
job_id,
filter_dict=data,
page=page,
page_size=page_size,
status=status,
)
kwargs = request.args.to_dict()