From fe72cae360ad4abb65e218530aee40df93ad9473 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Mon, 7 Oct 2019 13:30:46 +0530 Subject: [PATCH] fix: show event configurations in event sync log --- .../doctype/event_producer/event_producer.py | 11 +++++-- .../event_sync_log/event_sync_log.json | 31 +++++++++++++++++-- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/frappe/events_streaming/doctype/event_producer/event_producer.py b/frappe/events_streaming/doctype/event_producer/event_producer.py index d5233db5ac..5a98826480 100644 --- a/frappe/events_streaming/doctype/event_producer/event_producer.py +++ b/frappe/events_streaming/doctype/event_producer/event_producer.py @@ -111,6 +111,7 @@ def pull_from_node(event_producer): mapping = mapping_config.get(update.ref_doctype) if mapping: update = get_mapped_update(mapping, update) + update.mapping = mapping if not update.update_type == 'Delete': update.data = json.loads(update.data) @@ -257,12 +258,18 @@ def log_event_sync(update, event_producer, sync_status, error=None): doc = frappe.new_doc('Event Sync Log') doc.update_type = update.update_type doc.ref_doctype = update.ref_doctype - doc.docname = update.docname doc.status = sync_status doc.event_producer = event_producer doc.producer_doc = update.docname doc.data = frappe.as_json(update.data) - if error: + doc.use_same_name = 'Yes' if update.use_same_name else 'No' + doc.mapping = update.mapping if update.mapping else None + if sync_status == 'Synced': + if update.use_same_name: + doc.docname = update.docname + else: + doc.docname = frappe.db.get_value(update.ref_doctype, {'remote_docname': update.docname}, 'name') + else: doc.error = error doc.insert() diff --git a/frappe/events_streaming/doctype/event_sync_log/event_sync_log.json b/frappe/events_streaming/doctype/event_sync_log/event_sync_log.json index c7b3d63c52..6fe71260a6 100644 --- a/frappe/events_streaming/doctype/event_sync_log/event_sync_log.json +++ b/frappe/events_streaming/doctype/event_sync_log/event_sync_log.json @@ -11,6 +11,10 @@ "status", "event_producer", "producer_doc", + "event_configurations_section", + "use_same_name", + "column_break_9", + "mapping", "section_break_8", "data", "error" @@ -61,7 +65,8 @@ }, { "fieldname": "section_break_8", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Data" }, { "fieldname": "data", @@ -81,10 +86,32 @@ "fieldtype": "Code", "label": "Error", "read_only": 1 + }, + { + "fieldname": "event_configurations_section", + "fieldtype": "Section Break", + "label": "Event Configurations" + }, + { + "default": "0", + "fieldname": "use_same_name", + "fieldtype": "Data", + "label": "Use Same Name", + "read_only": 1 + }, + { + "fieldname": "column_break_9", + "fieldtype": "Column Break" + }, + { + "fieldname": "mapping", + "fieldtype": "Data", + "label": "Mapping", + "read_only": 1 } ], "in_create": 1, - "modified": "2019-10-03 21:29:43.036851", + "modified": "2019-10-07 13:22:10.401479", "modified_by": "Administrator", "module": "Events Streaming", "name": "Event Sync Log",