revert fname gen

Author: nhsdevws

e2e_batch/utils.py

@@ -27,10 +27,7 @@
 )
 
 
-def generate_csv(fore_name, dose_amount, action_flag,
-                 vax_type="RSV", ods="YGM41",
-                 headers="NHS_NUMBER", same_id=False, file_key=False
-                 ):
+def generate_csv(fore_name, dose_amount, action_flag, headers="NHS_NUMBER", same_id=False, file_key=False):
     """
     Generate a CSV file with 2 or 3 rows depending on the action_flag.
 
@@ -88,8 +85,13 @@ def generate_csv(fore_name, dose_amount, action_flag,
         data.append(create_row(unique_id, "fore_name", dose_amount, "UPDATE", headers))
 
     df = pd.DataFrame(data)
-
-    file_name = get_file_name(vax_type, ods, "4" if file_key else "5")
+    timestamp = datetime.now(timezone.utc).strftime("%Y%m%dT%H%M%S%f")[:-3]
+    file_name = (
+        f"COVID19_Vaccinations_v4_YGM41_{timestamp}.csv"
+        if file_key
+        else f"COVID19_Vaccinations_v5_YGM41_{timestamp}.csv"
+    )
+    # file_name = get_file_name(vax_type, ods, "4" if file_key else "5")
     df.to_csv(file_name, index=False, sep="|", quoting=csv.QUOTE_MINIMAL)
     return file_name
 
@@ -98,8 +100,6 @@ def upload_file_to_s3(file_name, bucket, prefix):
     """Upload the given file to the specified bucket under the provided prefix.
     Returns the S3 key if successful, or raises an exception."""
 
-    response = s3_client.list_buckets()
-
     key = f"{prefix}{file_name}"
     try:
         with open(file_name, "rb") as f:
@@ -444,7 +444,9 @@ def generate_csv_with_ordered_100000_rows(file_name=None):
 
     # Convert to DataFrame and save as CSV
     df = pd.DataFrame(full_data)
-    file_name = get_file_name("RSV", "YGM41", "5") if not file_name else file_name
+    timestamp = datetime.now(timezone.utc).strftime("%Y%m%dT%H%M%S%f")[:-3]
+    file_name = f"RSV_Vaccinations_v5_YGM41_{timestamp}.csv" if not file_name else file_name
+    # file_name = get_file_name("RSV", "YGM41", "5") if not file_name else file_name
     df.to_csv(file_name, index=False, sep="|", quoting=csv.QUOTE_MINIMAL)
     return file_name