Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perf(Document Follow): specify reference doctype in filters (backport #17700) #17703

Merged
merged 1 commit into from
Aug 2, 2022
Merged

perf(Document Follow): specify reference doctype in filters (backport #17700) #17703

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 23 additions & 15 deletions frappe/desk/form/document_follow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,14 @@ def send_document_follow_mails(frequency):

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:
Expand All @@ -162,9 +167,14 @@ def get_comments(doctype, doc_name, frequency, user):
from html2text 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":
Expand Down Expand Up @@ -282,29 +292,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