From 1eb12b93f18903a0f9c119f4fb713c4faa598837 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 21 Feb 2025 09:22:29 -0800 Subject: [PATCH] fix runaway report generation --- app/main/views/dashboard.py | 7 ++----- app/utils/csv.py | 7 +++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index b7dce493a..25e00c1cc 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -65,10 +65,7 @@ def service_dashboard(service_id): active_jobs = [job for job in job_response if job["job_status"] != "cancelled"] sorted_jobs = sorted(active_jobs, key=lambda job: job["created_at"], reverse=True) job_lists = [ - { - **job_dict, - "finished_processing": job_is_finished(job_dict) - } + {**job_dict, "finished_processing": job_is_finished(job_dict)} for job_dict in sorted_jobs ] @@ -91,7 +88,7 @@ def job_is_finished(job_dict): "technical-failure", "temporary-failure", "permanent-failure", - "cancelled" + "cancelled", ] processed_count = sum( diff --git a/app/utils/csv.py b/app/utils/csv.py index 79e3535c8..717481ef4 100644 --- a/app/utils/csv.py +++ b/app/utils/csv.py @@ -128,6 +128,13 @@ def generate_notifications_csv(**kwargs): notifications_resp = notification_api_client.get_notifications_for_service( **kwargs ) + # Stop if we are finished + if ( + notifications_resp.get("notifications") is None + or len(notifications_resp["notifications"]) == 0 + ): + return + for notification in notifications_resp["notifications"]: preferred_tz_created_at = convert_report_date_to_preferred_timezone( notification["created_at"]