From eedb360e8c4e1175de5db0af9195601ccd1b8551 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 25 Mar 2025 06:44:23 +0000 Subject: [PATCH] scriptAuditViews --- kitchen_counter/scriptAudit/views.py | 69 ++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 19 deletions(-) diff --git a/kitchen_counter/scriptAudit/views.py b/kitchen_counter/scriptAudit/views.py index c9c27a7..06dca05 100755 --- a/kitchen_counter/scriptAudit/views.py +++ b/kitchen_counter/scriptAudit/views.py @@ -128,7 +128,7 @@ class Get_Counter(LoginRequiredMixin,APIView): "script_ext": script_ext, "script_file_name": script_file_name } - key_value = {"script_name" : screenplay_name} + key_value = {"Script Audit URL": f"{settings.SITE_DOMAIN}/audit/counter_run"} to_email = [request.user.email] email_code = 'SB14' sendmail(to_email=to_email, email_code=email_code ,key_value = key_value) @@ -210,7 +210,8 @@ def run_audit_in_counter(msg): ScriptAuditModel.objects.update_or_create(script = Script.objects.get(id = script_id), defaults={"status" : "FAILURE", "results" : exp}) - key_value = {"script_name" : screenplay_name,} + key_value = {"script_name" : screenplay_name, + } to_email = [user.email] email_code = 'SB2' sendmail(to_email=to_email, email_code=email_code ,key_value = key_value) @@ -338,6 +339,7 @@ def run_audit_in_counter(msg): script_json["script_file_path"] = script_path1 script_json["script_file"] = hash2 script_json["type"] = "script-json" + script_json["screenplay_name"] = str(screenplay_name) audit_data["script-json"] = script_json print("data_uploaded") except Exception as exp: @@ -362,7 +364,9 @@ def run_audit_in_counter(msg): status.save() to_email = [user.email] print("####### #### to_email",to_email) - key_value_aud = { "script_name" : str(screenplay_name) } + key_value_aud = { "Script Name" : str(screenplay_name), + "Audited script url" : f"{settings.SITE_DOMAIN}/audit/audits1", + "User's profile url": f"{settings.SITE_DOMAIN}/memberpage/#/user/{user.id}/personaldetails",} email_code = 'SB1' sendmail(to_email=to_email , email_code=email_code, key_value = key_value_aud ) print("$$$$### after sendmail") @@ -373,11 +377,17 @@ def run_audit_in_counter(msg): certificate = certificateGenrate(user.username,"script audit",tx_id,projectname=script_file_name,matic=gasprice) to_email = [user.email] email_code = 'BL1' + # key_value = { + # "service":"Audited Script", + # "hash": hash2_docx, + # "public key":blockchain_obj.publicKey, + # "Transaction Hash": tx_id, + # } key_value = { - "service":"Audited Script", - "hash": hash2_docx, - "public key":blockchain_obj.publicKey, - "Transaction Hash": tx_id, + "Product Name": "Audited Script", + "Profile url": f"{settings.SITE_DOMAIN}/memberpage/#/personaldetails", + "User url": f"{settings.SITE_DOMAIN}/memberpage/#/user/{user.id}/personaldetails", + "Product output card url": f"{settings.SITE_DOMAIN}/audit/audits1", } print("userkey = ", userkey) sendmail(to_email=to_email , email_code=email_code, key_value=key_value, filePath=certificate) @@ -488,6 +498,7 @@ def run_audit_in_counter(msg): script_json["script_file_path"] = script_path1 script_json["script_file"] = hash2 script_json["type"] = "script-json" + script_json["screenplay_name"] = str(screenplay_name) audit_data["script-json"] = script_json print("data_uploaded") except Exception as exp: @@ -524,7 +535,9 @@ def run_audit_in_counter(msg): to_email = [user.email] email_code = 'SB1' - key_value_aud = { "script_name" : str(screenplay_name)} + key_value_aud = { "Script Name" : str(screenplay_name), + "Audited script url" : f"{settings.SITE_DOMAIN}/audit/audits1", + "User's profile url": f"{settings.SITE_DOMAIN}/memberpage/#/user/{user.id}/personaldetails",} sendmail(to_email=to_email , email_code=email_code, key_value = key_value_aud) # user_infos = user_info(tx_hash=Response,service="Script Audit",gas_fee=gasprice) @@ -534,11 +547,17 @@ def run_audit_in_counter(msg): certificate = certificateGenrate(user.username,"script audit",tx_id,projectname=script_file_name,matic=gasprice) to_email = [user.email] email_code = 'BL1' + # key_value = { + # "service":"Audited Script", + # "hash": hash2_docx, + # "public key":blockchain_obj.publicKey, + # "Transaction Hash": tx_id, + # } key_value = { - "service":"Audited Script", - "hash": hash2_docx, - "public key":blockchain_obj.publicKey, - "Transaction Hash": tx_id, + "Product Name": "Audited Script", + "Profile url": f"{settings.SITE_DOMAIN}/memberpage/#/personaldetails", + "User url": f"{settings.SITE_DOMAIN}/memberpage/#/user/{user.id}/personaldetails", + "Product output card url": f"{settings.SITE_DOMAIN}/audit/audits1", } print("userkey = ", userkey) sendmail(to_email=to_email , email_code=email_code, key_value=key_value, filePath=certificate) @@ -576,7 +595,8 @@ def run_audit_in_counter(msg): to_email = [user.email] email_code = 'SB2' - key_value_aud = { "script_name" : str(screenplay_name)} + key_value_aud = { "Script Name" : str(screenplay_name), + "Audited script url" : f"{settings.SITE_DOMAIN}/audit/audits1",} sendmail(to_email=to_email , email_code=email_code, key_value = key_value_aud ) Response = UploadScriptAuditData(OWNER_KEY,blockchain_obj.publicKey,blockchain_obj.user_id,script_id,str(audit_data)) @@ -584,17 +604,28 @@ def run_audit_in_counter(msg): hash = hash_decrypation(hash) #certificate = certificateGenrate(request.user.username,"script audit",hash) tx_id = Response - + + to_email = [user.email] + email_code = "SB11" + key_value_aud = { "Script Name" : str(screenplay_name), + "Audited script url" : f"{settings.SITE_DOMAIN}/audit/counter_run",} + sendmail(to_email=to_email , email_code=email_code, key_value = key_value_aud ) # certificate = certificateGenrate(request.user.username,"script audit",tx_id,projectname=script_file_name,matic=gasprice) to_email = [user.email] email_code = 'BL1' + # key_value = { + # "service":"Orginal Script Audit", + # "hash": hash, + # "public key":blockchain_obj.publicKey, + # "private key":userkey, + # "Transaction Hash": tx_id, + # } key_value = { - "service":"Orginal Script Audit", - "hash": hash, - "public key":blockchain_obj.publicKey, - "private key":userkey, - "Transaction Hash": tx_id, + "Product Name": "Audited Script", + "Profile url": f"{settings.SITE_DOMAIN}/memberpage/#/personaldetails", + "User url": f"{settings.SITE_DOMAIN}/memberpage/#/user/{user.id}/personaldetails", + "Product output card url": f"{settings.SITE_DOMAIN}/audit/audits1", } certificate = certificateGenrate(user.username,"script audit",tx_id,projectname=script_file_name,matic=gasprice) sendmail(to_email=to_email , email_code=email_code, key_value=key_value, filePath=certificate)