From 055b986145f3080df563a575e51265bd1e95c2e5 Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@ip-172-31-46-3.ap-south-1.compute.internal>
Date: Fri, 24 May 2024 06:10:17 +0000
Subject: [PATCH] Conversion blockchain error resolved

---
 .../translation/external_conversion.py        | 57 ++++++++++---------
 .../conversion/translation/newconversion.py   |  7 ++-
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/kitchen_counter/conversion/translation/external_conversion.py b/kitchen_counter/conversion/translation/external_conversion.py
index 430f1fc..ed52218 100644
--- a/kitchen_counter/conversion/translation/external_conversion.py
+++ b/kitchen_counter/conversion/translation/external_conversion.py
@@ -577,35 +577,36 @@ class Conversion:
                     scriptconversion["translated_scriptFile_path"] = translated_scripttt
                     print("blockchain script conversion 5")
 
-                    print("audit blockchain")
-                    print("blockchain script conversion 5.1")
-                    # blockchain upload of csv-json data
-                    adit_id = obj.converted_audit_id
+                    if obj.converted_audit_id:
+                        print("audit blockchain")
+                        print("blockchain script conversion 5.1")
+                        # blockchain upload of csv-json data
+                        adit_id = obj.converted_audit_id
 
-                    file_to_audit = File.objects.get(
-                        script=adit_id,
-                        type="script-csv"
-                    )
-                    csv_script_path = file_to_audit.file.path
-                    df = pd.read_csv(csv_script_path)
-                    df = df.loc[:, ["content", "script_element"]]
-                    script_json: dict = json.loads(utilities.csv_to_json(df))
-                    with tempfile.TemporaryDirectory() as temp_dir:
-                        print("Temporary directory created:", temp_dir)
-                        temp_filename = os.path.join(temp_dir, 'script_json_file.json')
-                        print(temp_filename)
-                        with open(temp_filename, 'w') as json_file:
-                            json.dump(script_json, json_file, indent=4)
-                        script_json = {}
-                        script_path1 = temp_filename
-                        # script_size = file_to_audit_docx.file.size
-                        with open(script_path1, 'rb') as _file:
-                            hash2 = uploadDataToIPFSNode(_file)
-                        script_json["script_file_path"] = script_path1
-                        script_json["script_file"] = hash2
-                        script_json["type"] = "script-json"
-                        scriptconversion["script-json"] = script_json
-                    print("blockchain script conversion 5.2")
+                        file_to_audit = File.objects.get(
+                            script=adit_id,
+                            type="script-csv"
+                        )
+                        csv_script_path = file_to_audit.file.path
+                        df = pd.read_csv(csv_script_path)
+                        df = df.loc[:, ["content", "script_element"]]
+                        script_json: dict = json.loads(utilities.csv_to_json(df))
+                        with tempfile.TemporaryDirectory() as temp_dir:
+                            print("Temporary directory created:", temp_dir)
+                            temp_filename = os.path.join(temp_dir, 'script_json_file.json')
+                            print(temp_filename)
+                            with open(temp_filename, 'w') as json_file:
+                                json.dump(script_json, json_file, indent=4)
+                            script_json = {}
+                            script_path1 = temp_filename
+                            # script_size = file_to_audit_docx.file.size
+                            with open(script_path1, 'rb') as _file:
+                                hash2 = uploadDataToIPFSNode(_file)
+                            script_json["script_file_path"] = script_path1
+                            script_json["script_file"] = hash2
+                            script_json["type"] = "script-json"
+                            scriptconversion["script-json"] = script_json
+                        print("blockchain script conversion 5.2")
 
                     blockchain_obj = UserCredentialsForBlockchain.objects.get(user=self.user)
                     UserId = blockchain_obj.user_id
diff --git a/kitchen_counter/conversion/translation/newconversion.py b/kitchen_counter/conversion/translation/newconversion.py
index eb541b2..d2d467a 100755
--- a/kitchen_counter/conversion/translation/newconversion.py
+++ b/kitchen_counter/conversion/translation/newconversion.py
@@ -632,12 +632,13 @@ def ScriptTranslation(*args, **kwargs):
                 audit.audit()
                 status.status = "SUCCESS"
                 status.save()
+                print("----> Script id from conv-aud is here=", audit_id)
+                translation_instance.converted_audit_id = audit_id
+                translation_instance.save()
             except:
                 status.status = "FAILURE"
                 status.save()
             
-            print("----> Script id from conv-aud is here=", audit_id)
-            translation_instance.converted_audit_id = audit_id
-            translation_instance.save()
+            
         sys.stdout = original_stdout
         return saveFile
\ No newline at end of file