fix: Re-introduce code erreneously taken out in previous commits

Due to bulk updations, some statements were missed out/got deleted. This
commit re-introduces them.
This commit is contained in:
Gavin D'souza 2021-07-28 18:59:18 +05:30
parent a836b2de0c
commit 7dac03cea0
3 changed files with 13 additions and 12 deletions

View file

@ -81,12 +81,12 @@ class TestReport(unittest.TestCase):
self.assertDictEqual({'name': 'Administrator', 'user_type': 'System User', 'email': 'admin@example.com'}, admin_dict)
def test_report_permissions(self):
frappe.set_user('test@example.com')
frappe.db.delete("Has Role", {
"parent": frappe.session.user,
"role": "Test Has Role"
})
frappe.db.commit()
if not frappe.db.exists('Role', 'Test Has Role'):
role = frappe.get_doc({
'doctype': 'Role',

View file

@ -9,13 +9,15 @@ import unittest
class TestUserPermission(unittest.TestCase):
def setUp(self):
test_users = (
"test_bulk_creation_update@example.com",
"test_user_perm1@example.com",
"nested_doc_user@example.com",
)
frappe.db.delete("User Permission", {
"user": ("in", ("test_bulk_creation_update@example.com",
"test_user_perm1@example.com",
"nested_doc_user@example.com"))
"user": ("in", test_users)
})
frappe.delete_doc_if_exists("DocType", "Person")
frappe.db.sql_ddl("DROP TABLE IF EXISTS `tabPerson`")
frappe.delete_doc_if_exists("DocType", "Doc A")
frappe.db.sql_ddl("DROP TABLE IF EXISTS `tabDoc A`")

View file

@ -24,15 +24,14 @@ def flush_old_route_records():
for user in users:
user = user[0]
last_record_to_keep = frappe.db.get_all('Route History',
filters={
'user': user,
},
filters={'user': user},
limit=1,
limit_start=500,
fields=['modified'],
order_by='modified desc')
order_by='modified desc'
)
frappe.db.delete("Route History", {
"modified": last_record_to_keep[0].modified,
"modified": ("<=", last_record_to_keep[0].modified),
"user": user
})
})