Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: simplify logging logic bulk_transaction

Browse Source
This commit is contained in:
ruthra kumar 2023-11-09 16:38:34 +05:30
parent c4f8f3613f
commit ebd74a4e5b
1 changed files with 14 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
erpnext/utilities/bulk_transaction.py
View File

@ -3,6 +3,7 @@ from datetime import date, datetime
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import today
@frappe.whitelist() @frappe.whitelist()
@ -38,7 +39,7 @@ def job(deserialized_data, from_doctype, to_doctype):
except Exception as e: except Exception as e:
frappe.db.rollback(save_point="before_creation_state") frappe.db.rollback(save_point="before_creation_state")
fail_count += 1 fail_count += 1
update_logger( create_log(
doc_name, doc_name,
str(frappe.get_traceback()), str(frappe.get_traceback()),
from_doctype, from_doctype,
@ -47,7 +48,7 @@ def job(deserialized_data, from_doctype, to_doctype):
log_date=str(date.today()), log_date=str(date.today()),
) )
else: else:
update_logger( create_log(
doc_name, None, from_doctype, to_doctype, status="Success", log_date=str(date.today()) doc_name, None, from_doctype, to_doctype, status="Success", log_date=str(date.today())
) )
@ -108,45 +109,18 @@ def task(doc_name, from_doctype, to_doctype):
obj.insert(ignore_mandatory=True) obj.insert(ignore_mandatory=True)
def check_logger_doc_exists(log_date): def create_log(doc_name, e, from_doctype, to_doctype, status, log_date=None, restarted=0):
return frappe.db.exists("Bulk Transaction Log", log_date) transaction_log = frappe.new_doc("Bulk Transaction Log Detail")
transaction_log.transaction_name = doc_name
transaction_log.date = today()
def get_logger_doc(log_date):
return frappe.get_doc("Bulk Transaction Log", log_date)
def create_logger_doc():
log_doc = frappe.new_doc("Bulk Transaction Log")
log_doc.set_new_name(set_name=str(date.today()))
log_doc.log_date = date.today()
return log_doc
def append_data_to_logger(log_doc, doc_name, error, from_doctype, to_doctype, status, restarted):
row = log_doc.append("logger_data", {})
row.transaction_name = doc_name
row.date = date.today()
now = datetime.now() now = datetime.now()
row.time = now.strftime("%H:%M:%S") transaction_log.time = now.strftime("%H:%M:%S")
row.transaction_status = status transaction_log.transaction_status = status
row.error_description = str(error) transaction_log.error_description = str(e)
row.from_doctype = from_doctype transaction_log.from_doctype = from_doctype
row.to_doctype = to_doctype transaction_log.to_doctype = to_doctype
row.retried = restarted transaction_log.retried = restarted
transaction_log.save()
def update_logger(doc_name, e, from_doctype, to_doctype, status, log_date=None, restarted=0):
if not check_logger_doc_exists(log_date):
log_doc = create_logger_doc()
append_data_to_logger(log_doc, doc_name, e, from_doctype, to_doctype, status, restarted)
log_doc.insert()
else:
log_doc = get_logger_doc(log_date)
if record_exists(log_doc, doc_name, status):
append_data_to_logger(log_doc, doc_name, e, from_doctype, to_doctype, status, restarted)
log_doc.save()
def show_job_status(fail_count, deserialized_data_count, to_doctype): def show_job_status(fail_count, deserialized_data_count, to_doctype):
@ -176,23 +150,3 @@ def show_job_status(fail_count, deserialized_data_count, to_doctype):
title="Failed", title="Failed",
indicator="red", indicator="red",
) )
def record_exists(log_doc, doc_name, status):
record = mark_retrired_transaction(log_doc, doc_name)
if record and status == "Failed":
return False
elif record and status == "Success":
return True
else:
return True
def mark_retrired_transaction(log_doc, doc_name):
record = 0
for d in log_doc.get("logger_data"):
if d.transaction_name == doc_name and d.transaction_status == "Failed":
frappe.db.set_value("Bulk Transaction Log Detail", d.name, "retried", 1)
record = record + 1
return record