vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #17700 from resilient-tech/perf-doc-follow

Browse source 
perf(Document Follow): specify reference doctype in filters
This commit is contained in:
Ankush Menat 2022-08-02 14:58:34 +05:30 • committed by GitHub
commit bbb6451636
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
frappe/desk/form/document_follow.py
View file

@ -161,9 +161,14 @@ def get_document_followed_by_user(user):
def get_version(doctype, doc_name, frequency, user):
timeline = []
filters = get_filters("docname", doc_name, frequency, user)
version = frappe.get_all(
"Version", filters=filters, fields=["ref_doctype", "data", "modified", "modified_by"]
"Version",
filters=[
["ref_doctype", "=", doctype],
["docname", "=", doc_name],
*_get_filters(frequency, user),
],
fields=["data", "modified", "modified_by"],
)
if version:
for v in version:
@ -186,9 +191,14 @@ def get_comments(doctype, doc_name, frequency, user):
from frappe.core.utils import html2text
timeline = []
filters = get_filters("reference_name", doc_name, frequency, user)
comments = frappe.get_all(
"Comment", filters=filters, fields=["content", "modified", "modified_by", "comment_type"]
"Comment",
filters=[
["reference_doctype", "=", doctype],
["reference_name", "=", doc_name],
*_get_filters(frequency, user),
],
fields=["content", "modified", "modified_by", "comment_type"],
)
for comment in comments:
if comment.comment_type == "Like":
@ -306,29 +316,27 @@ def send_weekly_updates():
send_document_follow_mails("Weekly")
def get_filters(search_by, name, frequency, user):
filters = []
def _get_filters(frequency, user):
filters = [
["modified_by", "!=", user],
]
if frequency == "Weekly":
filters = [
[search_by, "=", name],
filters += [
["modified", ">", frappe.utils.add_days(frappe.utils.nowdate(), -7)],
["modified", "<", frappe.utils.nowdate()],
["modified_by", "!=", user],
]
elif frequency == "Daily":
filters = [
[search_by, "=", name],
filters += [
["modified", ">", frappe.utils.add_days(frappe.utils.nowdate(), -1)],
["modified", "<", frappe.utils.nowdate()],
["modified_by", "!=", user],
]
elif frequency == "Hourly":
filters = [
[search_by, "=", name],
filters += [
["modified", ">", frappe.utils.add_to_date(frappe.utils.now_datetime(), hours=-1)],
["modified", "<", frappe.utils.now_datetime()],
["modified_by", "!=", user],
]
return filters