mirror of
https://github.com/GSA/notifications-api.git
synced 2026-07-09 02:43:55 -04:00
update to support status dropdown
This commit is contained in:
@@ -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}")
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user