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

refactor: Moved raw queries to frappe orm

Browse source
This commit is contained in:
Aradhya-Tripathi 2021-07-21 23:29:50 +05:30
parent dd2648b141
commit 79ccaa95f3
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.py
View file

@ -323,12 +323,18 @@ class PersonalDataDeletionRequest(Document):
def remove_unverified_record():
frappe.db.sql(
"""
DELETE FROM `tabPersonal Data Deletion Request`
WHERE `status` = 'Pending Verification'
AND `creation` < (NOW() - INTERVAL '7' DAY)"""
)
frappe.db.delete("Personal Data Deletion Request", {
"status": "Pending Verification",
"creation": ("<", ["Now()", "-", "INTERVAL 7 DAY"])
})
# frappe.db.sql(
# """
# DELETE FROM `tabPersonal Data Deletion Request`
# WHERE `status` = 'Pending Verification'
# AND `creation` < (NOW() - INTERVAL '7' DAY)"""
# )
@frappe.whitelist(allow_guest=True)

12
frappe/workflow/doctype/workflow_action/workflow_action.py
View file

@ -133,9 +133,15 @@ def return_link_expired_page(doc, doc_workflow_state):
def clear_old_workflow_actions(doc, user=None):
user = user if user else frappe.session.user
frappe.db.sql("""DELETE FROM `tabWorkflow Action`
WHERE `reference_doctype`=%s AND `reference_name`=%s AND `user`!=%s AND `status`='Open'""",
(doc.get('doctype'), doc.get('name'), user))
frappe.db.delete("Workflow Action", {
"reference_doctype": doc.get("doctype"),
"reference_name": doc.get("name"),
"user": ("!=", user),
"status": "Open"
})
# frappe.db.sql("""DELETE FROM `tabWorkflow Action`
# WHERE `reference_doctype`=%s AND `reference_name`=%s AND `user`!=%s AND `status`='Open'""",
# (doc.get('doctype'), doc.get('name'), user))
def update_completed_workflow_actions(doc, user=None):
user = user if user else frappe.session.user