diff --git a/kitchen_counter/scriptAudit/views.py b/kitchen_counter/scriptAudit/views.py index 298f133..4f7dfcd 100755 --- a/kitchen_counter/scriptAudit/views.py +++ b/kitchen_counter/scriptAudit/views.py @@ -402,40 +402,42 @@ def run_audit_in_counter(msg): if status.User_preference != "MNF": Response,gasprice = UploadScriptAuditData(OWNER_KEY,blockchain_obj.publicKey,blockchain_obj.user_id,script_id,str(audit_data)) - print("tx_hash",Response) - transactioni_id = str(Response) - status.transaction_hash =str(transactioni_id) - status.save() - to_email = [user.email] - print("####### #### to_email",to_email) + email_code = 'SB1' 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") - # user_infos = user_info(tx_hash=Response,service="Script Audit",gas_fee=gasprice) - # addition_result = user_infos.update_info(request) - hash2_docx = hash_decrypation(hash2_docx) - tx_id = Response - 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 = { - "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) - print("mail send sucessfully:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::") + sendmail(to_email=to_email , email_code=email_code, key_value = key_value_aud) + if Response == False: + status.User_preference = "MNF" + status.save() + else: + print("tx_hash",Response) + transactioni_id = str(Response) + status.transaction_hash =str(transactioni_id) + status.save() + print("$$$$### after sendmail") + # user_infos = user_info(tx_hash=Response,service="Script Audit",gas_fee=gasprice) + # addition_result = user_infos.update_info(request) + hash2_docx = hash_decrypation(hash2_docx) + tx_id = Response + 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 = { + "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) + print("mail send sucessfully:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::") else: email_code = 'SB1' key_value_aud = { "Script Name" : str(screenplay_name), @@ -591,42 +593,44 @@ def run_audit_in_counter(msg): except: pass if status.User_preference != "MNF": - Response,gasprice = UploadScriptAuditData(OWNER_KEY,blockchain_obj.publicKey,blockchain_obj.user_id,script_id,str(audit_data)) - print("tx_hash",Response) - transactioni_id = str(Response) - status.transaction_hash =str(transactioni_id) - status.save() - to_email = [user.email] email_code = 'SB1' 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) + if Response== False: + status.User_preference = "MNF" + status.save() + else: + print("tx_hash",Response) + transactioni_id = str(Response) + status.transaction_hash =str(transactioni_id) + status.save() - # user_infos = user_info(tx_hash=Response,service="Script Audit",gas_fee=gasprice) - # addition_result = user_infos.update_info(request) - hash2_docx = hash_decrypation(hash2_docx) - tx_id = Response - 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 = { - "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) - print("mail send sucessfully:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::") + # user_infos = user_info(tx_hash=Response,service="Script Audit",gas_fee=gasprice) + # addition_result = user_infos.update_info(request) + hash2_docx = hash_decrypation(hash2_docx) + tx_id = Response + 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 = { + "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) + print("mail send sucessfully:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::") else: to_email = [user.email] email_code = 'SB1' @@ -672,39 +676,42 @@ def run_audit_in_counter(msg): "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)) - print("tx_hash",Response) - hash = hash_decrypation(hash) - #certificate = certificateGenrate(request.user.username,"script audit",hash) - tx_id = Response - + Response, gasprice = UploadScriptAuditData(OWNER_KEY,blockchain_obj.publicKey,blockchain_obj.user_id,script_id,str(audit_data)) 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",} + "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) + if Response== False: + status.User_preference = "MNF" + status.save() + else: + print("tx_hash",Response) + hash = hash_decrypation(hash) + #certificate = certificateGenrate(request.user.username,"script audit",hash) + tx_id = Response + # 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 = { - "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) + 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 = { + "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) - print("::::::::::::::",key_value) - print("userkey = ", userkey) + print("::::::::::::::",key_value) + print("userkey = ", userkey) """