diff --git a/frappe/config/integrations.py b/frappe/config/integrations.py index f76167b00f..563dc94eb4 100644 --- a/frappe/config/integrations.py +++ b/frappe/config/integrations.py @@ -90,7 +90,7 @@ def get_data(): }, { "type": "doctype", - "name": "Update Log", + "name": "Event Update Log", "description": _("Maintains a Log of all inserts, updates and deletions on Event Producer site for documents that have consumers.") }, { diff --git a/frappe/events_streaming/doctype/event_consumer/event_consumer.py b/frappe/events_streaming/doctype/event_consumer/event_consumer.py index 9aab2be2a7..b2aaf50929 100644 --- a/frappe/events_streaming/doctype/event_consumer/event_consumer.py +++ b/frappe/events_streaming/doctype/event_consumer/event_consumer.py @@ -87,7 +87,7 @@ def get_consumer_site(consumer_url): return consumer_site def get_last_update(): - updates = frappe.get_list('Update Log', 'creation', ignore_permissions=True, limit = 1, order_by = 'creation desc') + updates = frappe.get_list('Event Update Log', 'creation', ignore_permissions=True, limit = 1, order_by = 'creation desc') if updates: return updates[0].creation return frappe.utils.now_datetime() diff --git a/frappe/events_streaming/doctype/event_producer/event_producer.py b/frappe/events_streaming/doctype/event_producer/event_producer.py index dc0b735895..82a373427d 100644 --- a/frappe/events_streaming/doctype/event_producer/event_producer.py +++ b/frappe/events_streaming/doctype/event_producer/event_producer.py @@ -260,7 +260,7 @@ def set_delete(update): def get_updates(producer_site, last_update, doctypes): docs = producer_site.get_list( - doctype = 'Update Log', + doctype = 'Event Update Log', filters = {'ref_doctype': ('in', doctypes), 'creation': ('>', last_update)}, fields = ['update_type', 'ref_doctype', 'docname', 'data', 'name', 'creation'] ) diff --git a/frappe/events_streaming/doctype/event_producer/test_event_producer.py b/frappe/events_streaming/doctype/event_producer/test_event_producer.py index 72b4510790..8566c591a1 100644 --- a/frappe/events_streaming/doctype/event_producer/test_event_producer.py +++ b/frappe/events_streaming/doctype/event_producer/test_event_producer.py @@ -175,7 +175,7 @@ class TestEventProducer(unittest.TestCase): def test_update_log(self): producer = self.get_remote_site() producer_doc = insert_into_producer(producer, 'test update log') - update_log_doc = producer.get_value('Update Log', 'docname', {'docname': producer_doc.get('name')}) + update_log_doc = producer.get_value('Event Update Log', 'docname', {'docname': producer_doc.get('name')}) self.assertEqual(update_log_doc.get('docname'), producer_doc.get('name')) def test_event_sync_log(self): diff --git a/frappe/events_streaming/doctype/update_log/__init__.py b/frappe/events_streaming/doctype/event_update_log/__init__.py similarity index 100% rename from frappe/events_streaming/doctype/update_log/__init__.py rename to frappe/events_streaming/doctype/event_update_log/__init__.py diff --git a/frappe/events_streaming/doctype/update_log/update_log.js b/frappe/events_streaming/doctype/event_update_log/event_update_log.js similarity index 80% rename from frappe/events_streaming/doctype/update_log/update_log.js rename to frappe/events_streaming/doctype/event_update_log/event_update_log.js index 41bd9e2762..c5e8ed5915 100644 --- a/frappe/events_streaming/doctype/update_log/update_log.js +++ b/frappe/events_streaming/doctype/event_update_log/event_update_log.js @@ -1,7 +1,7 @@ // Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors // For license information, please see license.txt -frappe.ui.form.on('Update Log', { +frappe.ui.form.on('Event Update Log', { // refresh: function(frm) { // } diff --git a/frappe/events_streaming/doctype/update_log/update_log.json b/frappe/events_streaming/doctype/event_update_log/event_update_log.json similarity index 97% rename from frappe/events_streaming/doctype/update_log/update_log.json rename to frappe/events_streaming/doctype/event_update_log/event_update_log.json index ff89f63503..3b627db2a0 100644 --- a/frappe/events_streaming/doctype/update_log/update_log.json +++ b/frappe/events_streaming/doctype/event_update_log/event_update_log.json @@ -45,7 +45,7 @@ "modified": "2019-09-24 23:16:07.207707", "modified_by": "Administrator", "module": "Events Streaming", - "name": "Update Log", + "name": "Event Update Log", "owner": "Administrator", "permissions": [ { diff --git a/frappe/events_streaming/doctype/update_log/update_log.py b/frappe/events_streaming/doctype/event_update_log/event_update_log.py similarity index 99% rename from frappe/events_streaming/doctype/update_log/update_log.py rename to frappe/events_streaming/doctype/event_update_log/event_update_log.py index 517d13b3bc..16be6d772a 100644 --- a/frappe/events_streaming/doctype/update_log/update_log.py +++ b/frappe/events_streaming/doctype/event_update_log/event_update_log.py @@ -8,7 +8,7 @@ from frappe.model.document import Document from frappe.utils.background_jobs import get_jobs from frappe.model import no_value_fields, table_fields -class UpdateLog(Document): +class EventUpdateLog(Document): pass def notify_consumers(doc, method=None): diff --git a/frappe/events_streaming/doctype/update_log/test_update_log.py b/frappe/events_streaming/doctype/event_update_log/test_event_update_log.py similarity index 80% rename from frappe/events_streaming/doctype/update_log/test_update_log.py rename to frappe/events_streaming/doctype/event_update_log/test_event_update_log.py index f9388e939f..e00fc767d9 100644 --- a/frappe/events_streaming/doctype/update_log/test_update_log.py +++ b/frappe/events_streaming/doctype/event_update_log/test_event_update_log.py @@ -6,5 +6,5 @@ from __future__ import unicode_literals # import frappe import unittest -class TestUpdateLog(unittest.TestCase): +class TestEventUpdateLog(unittest.TestCase): pass diff --git a/frappe/hooks.py b/frappe/hooks.py index 5ea22e9b04..288369ff3e 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -155,8 +155,8 @@ doc_events = { "Page": { "after_save": "frappe.cache_manager.build_domain_restriced_page_cache", }, - "Update Log": { - "after_insert": "frappe.events_streaming.doctype.update_log.update_log.notify_consumers" + "Event Update Log": { + "after_insert": "frappe.events_streaming.doctype.event_update_log.event_update_log.notify_consumers" } } diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index 5a155d2792..b609011053 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -18,7 +18,7 @@ from frappe.model.naming import revert_series_if_last from frappe.utils.global_search import delete_for_document from frappe.desk.doctype.tag.tag import delete_tags_for_document from frappe.exceptions import FileNotFoundError -from frappe.model.document import make_update_log, check_doctype_has_consumers +from frappe.model.document import make_event_update_log, check_doctype_has_consumers doctypes_to_skip = ("Communication", "ToDo", "DocShare", "Email Unsubscribe", "Activity Log", "File", "Version", "Document Follow", "Comment" , "View Log", "Tag Link", "Notification Log") @@ -123,7 +123,7 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa # update log if doctype has event consumers if not frappe.flags.in_install and not frappe.flags.in_migrate and check_doctype_has_consumers(doc.doctype): - make_update_log(doc, update_type = 'Delete') + make_event_update_log(doc, update_type = 'Delete') if doc and not for_reload: add_to_deleted_document(doc) diff --git a/frappe/model/document.py b/frappe/model/document.py index c68c90c75e..32090b145d 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -256,7 +256,7 @@ class Document(BaseDocument): if self.get("amended_from"): self.copy_attachments_from_amended_from() - #flag to prevent creation of update log for create and update both, during document creation + #flag to prevent creation of event update log for create and update both, during document creation self.flags.update_log_for_doc_creation = True self.run_post_save_methods() self.flags.in_insert = False @@ -946,18 +946,18 @@ class Document(BaseDocument): if (self.doctype, self.name) in frappe.flags.currently_saving: frappe.flags.currently_saving.remove((self.doctype, self.name)) - # make update log for doctypes having event consumers + # make event update log for doctypes having event consumers if not frappe.flags.in_install and not frappe.flags.in_migrate and check_doctype_has_consumers(self.doctype): if self.flags.update_log_for_doc_creation: - make_update_log(self, update_type = 'Create') + make_event_update_log(self, update_type = 'Create') self.flags.update_log_for_doc_creation = False else: - from frappe.events_streaming.doctype.update_log.update_log import get_update + from frappe.events_streaming.doctype.event_update_log.event_update_log import get_update diff = get_update(self._doc_before_save, self) if diff: doc = self doc.diff = diff - make_update_log(doc, update_type = 'Update') + make_event_update_log(doc, update_type = 'Update') self.latest = None @@ -1284,7 +1284,7 @@ def execute_action(doctype, name, action, **kwargs): doc.add_comment('Comment', _('Action Failed') + '

' + msg) doc.notify_update() -def make_update_log(doc, update_type): +def make_event_update_log(doc, update_type): '''Save update info for doctypes that have event consumers''' if update_type != 'Delete': #diff for update type, doc for create type @@ -1292,7 +1292,7 @@ def make_update_log(doc, update_type): else: data = None log_doc = frappe.get_doc({ - 'doctype': 'Update Log', + 'doctype': 'Event Update Log', 'update_type': update_type, 'ref_doctype': doc.doctype, 'docname': doc.name,