fix: schema_name updated

Author: mmarifat

main.py

@@ -1,6 +1,5 @@
 import glob
 import io
-import json
 import os
 import shutil
 import time
@@ -72,7 +71,7 @@ def polytabular(cursor, path, concept_name):
 def run(trud_s3_key: str):
     start_time = time.time()
 
-    schema_name = trud_s3_key.split("/").pop()[7:-6].replace(".", "_")
+    schema_name = str.format(trud_s3_key.split("/").pop().split(".zip").pop(0))
 
     logger.info(f"Processing => {schema_name}")
     if not schema_name:
@@ -81,8 +80,8 @@ def run(trud_s3_key: str):
     else:
         trud_s3_zip_content = get_trud_s3_object(trud_s3_key)
         if not trud_s3_zip_content:
-            logger.info(f"Skipping as no data found in storage => {schema_name}.")
-            return f"No trud data found for schema {schema_name}.", 400
+            logger.info(f"Skipping as no data found in storage => {schema_name}")
+            return f"No trud data found for schema {schema_name}", 400
         else:
             logger.info(f"Extracting zip content => {schema_name}")
             zip_extract_dir = f"./extracts/{schema_name}"
@@ -94,8 +93,8 @@ def run(trud_s3_key: str):
             cursor = cnx.cursor()
 
             logger.info(f"Creating schema => {schema_name}")
-            cursor.execute('CREATE SCHEMA IF NOT EXISTS "{}";'.format(schema_name))
-            cursor.execute('SET search_path TO "{}";'.format(schema_name))
+            cursor.execute(f'CREATE SCHEMA IF NOT EXISTS "{schema_name}";')
+            cursor.execute(f'SET search_path TO "{schema_name}";')
 
             logger.info("Importing table structure...")
             with open(dmd_structure_path, "r") as f:
@@ -112,8 +111,7 @@ def run(trud_s3_key: str):
                 "Appending nhs queue list into 'medicine.nhs_medicine_api_data_process' table..."
             )
             insert_command = "INSERT INTO medicine.nhs_medicine_api_data_process (schema_name, status) VALUES (%s, %s);"
-            data = (format(schema_name), 1)
-            cursor.execute(insert_command, data)
+            cursor.execute(insert_command, (schema_name, 1))
 
             cnx.commit()
             os.chdir("../../")

services/trud_s3.py

@@ -21,3 +21,4 @@ def get_trud_s3_object(key: str):
         logger.error(pce)
     except Exception as e:
         logger.exception(f"An error occurred: {e}")
+    return None