NRL-1798 Remove output file param

Author: sandyforresternhs

scripts/delete_pointers_by_id.py

@@ -59,6 +59,21 @@ def _load_pointers_from_file(pointers_file: str) -> list[str]:
     return [line.strip() for line in content.splitlines() if line.strip()]
 
 
+def _write_result_file(result: Dict[str, Any], output_file: str) -> None:
+    """
+    Atomically write result dict to output_file as JSON.
+    Raises on failure.
+    """
+    out_dir = os.path.dirname(os.path.abspath(output_file)) or "."
+    with tempfile.NamedTemporaryFile(
+        "w", delete=False, dir=out_dir, prefix=".tmp_delete_results_", suffix=".json"
+    ) as tf:
+        json.dump(result, tf, indent=2)
+        tf.flush()
+        os.fsync(tf.fileno())
+    os.replace(tf.name, output_file)
+
+
 def _check_pointers_match_ods_code(
     ods_code: str, pointer_ids: List[str]
 ) -> tuple[List[str], List[str]]:
@@ -158,21 +173,6 @@ def _batch_delete_pointers(
     return pointers_deleted, sorted(failed_deletes_set)
 
 
-def _write_result_file(result: Dict[str, Any], output_file: str) -> None:
-    """
-    Atomically write result dict to output_file as JSON.
-    Raises on failure.
-    """
-    out_dir = os.path.dirname(os.path.abspath(output_file)) or "."
-    with tempfile.NamedTemporaryFile(
-        "w", delete=False, dir=out_dir, prefix=".tmp_delete_results_", suffix=".json"
-    ) as tf:
-        json.dump(result, tf, indent=2)
-        tf.flush()
-        os.fsync(tf.fileno())
-    os.replace(tf.name, output_file)
-
-
 def _print_summary(result: Dict[str, Any]) -> None:
     """
     Print a concise summary of the result to stdout.
@@ -204,7 +204,6 @@ def _delete_pointers_by_id(
     ods_code: str,
     pointers_to_delete: List[str] | None = None,
     pointers_file: str | None = None,
-    output_file: str | None = None,
 ) -> Dict[str, Any]:
     """
     Delete pointers from DynamoDB table.
@@ -219,7 +218,6 @@ def _delete_pointers_by_id(
     - ods_code: ODS code of the organisation that the pointers belong to
     - pointers_to_delete: list of pointer ids to delete
     - pointers_file: path to JSON file (array of objects with "id" field) or text file (one id per line)
-    - output_file: optional path to write the result JSON to (atomic replace)
     """
     if pointers_to_delete is None and pointers_file is None:
         raise ValueError("Provide either pointers_to_delete or pointers_file")
@@ -231,6 +229,14 @@ def _delete_pointers_by_id(
     if pointers_file:
         pointers_to_delete = _load_pointers_from_file(pointers_file)
 
+    # establish start_time early so any early-return can use it for filename
+    start_time = datetime.now(tz=timezone.utc)
+    stamp = start_time.strftime("%Y%m%dT%H%M%SZ")
+    script_dir = os.path.dirname(os.path.abspath(__file__)) or "."
+    output_file_path = os.path.join(
+        script_dir, f"delete_results_{ods_code}_{stamp}.json"
+    )
+
     if len(pointers_to_delete) == 0:
         result = {
             "pointers_to_delete": 0,
@@ -242,18 +248,15 @@ def _delete_pointers_by_id(
             "failed_deletes": {"count": 0, "ids": []},
             "deletes-took-secs": 0,
         }
-        if output_file:
-            try:
-                _write_result_file(result, output_file)
-            except Exception as exc:
-                result["_output_error"] = (
-                    f"Failed to write output_file {output_file}: {exc}"
-                )
+        try:
+            _write_result_file(result, output_file_path)
+        except Exception as exc:
+            result["_output_error"] = (
+                f"Failed to write result file {output_file_path}: {exc}"
+            )
         _print_summary(result)
         return result
 
-    start_time = datetime.now(tz=timezone.utc)
-
     print(
         f"Validating {len(pointers_to_delete)} pointers against ODS code {ods_code}..."
     )
@@ -284,13 +287,12 @@ def _delete_pointers_by_id(
             "failed_deletes": {"count": 0, "ids": []},
             "deletes-took-secs": timedelta.total_seconds(end_time - start_time),
         }
-        if output_file:
-            try:
-                _write_result_file(result, output_file)
-            except Exception as exc:
-                result["_output_error"] = (
-                    f"Failed to write output_file {output_file}: {exc}"
-                )
+        try:
+            _write_result_file(result, output_file_path)
+        except Exception as exc:
+            result["_output_error"] = (
+                f"Failed to write result file {output_file_path}: {exc}"
+            )
         _print_summary(result)
         return result
 
@@ -325,13 +327,12 @@ def _delete_pointers_by_id(
             "failed_deletes": {"count": 0, "ids": []},
             "deletes-took-secs": timedelta.total_seconds(end_time - start_time),
         }
-        if output_file:
-            try:
-                _write_result_file(result, output_file)
-            except Exception as exc:
-                result["_output_error"] = (
-                    f"Failed to write output_file {output_file}: {exc}"
-                )
+        try:
+            _write_result_file(result, output_file_path)
+        except Exception as exc:
+            result["_output_error"] = (
+                f"Failed to write result file {output_file_path}: {exc}"
+            )
         _print_summary(result)
         return result
 
@@ -359,13 +360,12 @@ def _delete_pointers_by_id(
         "deletes-took-secs": timedelta.total_seconds(end_time - start_time),
     }
 
-    if output_file:
-        try:
-            _write_result_file(result, output_file)
-        except Exception as exc:
-            result["_output_error"] = (
-                f"Failed to write output_file {output_file}: {exc}"
-            )
+    try:
+        _write_result_file(result, output_file_path)
+    except Exception as exc:
+        result["_output_error"] = (
+            f"Failed to write result file {output_file_path}: {exc}"
+        )
 
     _print_summary(result)
     print(" Done")