Merge pull request #1942 from GSA/main

8/28/2025 Production Deploy

Author: ccostino

app/celery/tasks.py

@@ -582,6 +582,12 @@ def _generate_notifications_report(service_id, report_id, limit_days):
     count = 0
     if len(pagination.items) == 0:
         current_app.logger.info(f"SKIP {service_id}")
+
+        # Delete stale report when there's no new data
+        _, file_location, _, _, _ = get_csv_location(service_id, report_id)
+        s3.delete_s3_object(file_location)
+        current_app.logger.info(f"Deleted stale report {file_location} - no new data")
+
         return
     start_time = time.time()
     for notification in pagination.items:

app/dao/jobs_dao.py

@@ -66,7 +66,8 @@ def dao_get_jobs_by_service_id(
     if limit_days is not None:
         if use_processing_time:
             query_filter.append(
-                func.coalesce(Job.processing_started, Job.created_at) >= midnight_n_days_ago(limit_days)
+                func.coalesce(Job.processing_started, Job.created_at)
+                >= midnight_n_days_ago(limit_days)
             )
         else:
             query_filter.append(Job.created_at >= midnight_n_days_ago(limit_days))

app/job/rest.py

@@ -5,6 +5,9 @@
 
 from app import db
 from app.aws.s3 import (
+    extract_personalisation,
+    extract_phones,
+    get_job_from_s3,
     get_job_metadata_from_s3,
     get_personalisation_from_s3,
     get_phone_number_from_s3,
@@ -36,7 +39,7 @@
     notification_with_template_schema,
     notifications_filter_schema,
 )
-from app.utils import check_suspicious_id, midnight_n_days_ago, pagination_links
+from app.utils import check_suspicious_id, hilite, midnight_n_days_ago, pagination_links
 
 job_blueprint = Blueprint("job", __name__, url_prefix="/service/<uuid:service_id>/job")
 
@@ -46,6 +49,7 @@
 
 @job_blueprint.route("/<job_id>", methods=["GET"])
 def get_job_by_service_and_job_id(service_id, job_id):
+    current_app.logger.info(hilite("ENTER get_job_by_service_and_job_id"))
     check_suspicious_id(service_id, job_id)
     job = dao_get_job_by_service_id_and_job_id(service_id, job_id)
     statistics = dao_get_notification_outcomes_for_job(service_id, job_id)
@@ -71,8 +75,12 @@ def cancel_job(service_id, job_id):
 
 @job_blueprint.route("/<job_id>/notifications", methods=["GET"])
 def get_all_notifications_for_service_job(service_id, job_id):
+
     check_suspicious_id(service_id, job_id)
 
+    job = get_job_from_s3(service_id, job_id)
+    phones = extract_phones(job, service_id, job_id)
+    personalisation = extract_personalisation(job)
     data = notifications_filter_schema.load(request.args)
     page = data["page"] if "page" in data else 1
     page_size = (
@@ -90,21 +98,13 @@ def get_all_notifications_for_service_job(service_id, job_id):
 
     for notification in paginated_notifications.items:
         if notification.job_id is not None:
-            recipient = get_phone_number_from_s3(
-                notification.service_id,
-                notification.job_id,
-                notification.job_row_number,
-            )
+            recipient = phones[notification.job_row_number]
             notification.to = recipient
             notification.normalised_to = recipient
 
     for notification in paginated_notifications.items:
         if notification.job_id is not None:
-            notification.personalisation = get_personalisation_from_s3(
-                notification.service_id,
-                notification.job_id,
-                notification.job_row_number,
-            )
+            notification.personalisation = personalisation[notification.job_row_number]
 
     notifications = None
     if data.get("format_for_csv"):
@@ -116,6 +116,7 @@ def get_all_notifications_for_service_job(service_id, job_id):
         notifications = notification_with_template_schema.dump(
             paginated_notifications.items, many=True
         )
+        current_app.logger.info(hilite("Got the dumped notifications and returning"))
 
     return (
         jsonify(
@@ -134,6 +135,8 @@ def get_all_notifications_for_service_job(service_id, job_id):
 
 @job_blueprint.route("/<job_id>/recent_notifications", methods=["GET"])
 def get_recent_notifications_for_service_job(service_id, job_id):
+
+    current_app.logger.info(hilite("ENTER get_recent_notifications_for_service_job"))
     check_suspicious_id(service_id, job_id)
 
     data = notifications_filter_schema.load(request.args)
@@ -220,7 +223,9 @@ def get_jobs_by_service(service_id):
     else:
         limit_days = None
 
-    use_processing_time = request.args.get("use_processing_time", "false").lower() == "true"
+    use_processing_time = (
+        request.args.get("use_processing_time", "false").lower() == "true"
+    )
 
     valid_statuses = set(JobStatus)
     statuses_arg = request.args.get("statuses", "")
@@ -332,6 +337,8 @@ def get_paginated_jobs(
     statuses,
     page,
 ):
+
+    current_app.logger.info(hilite("ENTER get_paginated_jobs"))
     pagination = dao_get_jobs_by_service_id(
         service_id,
         limit_days=limit_days,

app/service/rest.py

@@ -230,7 +230,7 @@ def get_service_notification_statistics(service_id):
         data=get_service_statistics(
             service_id,
             request.args.get("today_only") == "True",
-            int(request.args.get("limit_days", 7)),
+            int(request.args.get("limit_days", 8)),
         )
     )
 
@@ -794,7 +794,7 @@ def get_detailed_service(service_id, today_only=False):
     return detailed_service_schema.dump(service)
 
 
-def get_service_statistics(service_id, today_only, limit_days=7):
+def get_service_statistics(service_id, today_only, limit_days=8):
     check_suspicious_id(service_id)
     # today_only flag is used by the send page to work out if the service will exceed their daily usage by sending a job
     if today_only:

app/template_statistics/rest.py

@@ -20,17 +20,17 @@
 @template_statistics.route("")
 def get_template_statistics_for_service_by_day(service_id):
     check_suspicious_id(service_id)
-    whole_days = request.args.get("whole_days", request.args.get("limit_days", ""))
+    whole_days = request.args.get("whole_days", request.args.get("limit_days", "8"))
     try:
         whole_days = int(whole_days)
     except ValueError:
         error = f"{whole_days} is not an integer"
         message = {"whole_days": [error]}
         raise InvalidRequest(message, status_code=400)
 
-    if whole_days < 0 or whole_days > 7:
+    if whole_days < 0 or whole_days > 8:
         raise InvalidRequest(
-            {"whole_days": ["whole_days must be between 0 and 7"]}, status_code=400
+            {"whole_days": ["whole_days must be between 0 and 8"]}, status_code=400
         )
     data = fetch_notification_status_for_service_for_today_and_7_previous_days(
         service_id, by_template=True, limit_days=whole_days