From 70fcac8acf5e8e1dc0708f1794e676e75e9529e2 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 12 Oct 2021 17:10:14 +0530 Subject: [PATCH] refactor: change _delete_modules for testability --- frappe/installer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index c38ee55e65..9df2019f1b 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -233,7 +233,9 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) frappe.flags.in_uninstall = True - drop_doctypes = _delete_modules(app_name, dry_run=dry_run) + modules = frappe.get_all("Module Def", filters={"app_name": app_name}, pluck="name") + + drop_doctypes = _delete_modules(modules, dry_run=dry_run) _delete_doctypes(drop_doctypes, dry_run=dry_run) if not dry_run: @@ -244,7 +246,7 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) frappe.flags.in_uninstall = False -def _delete_modules(app_name: str, dry_run: bool) -> List[str]: +def _delete_modules(modules: List[str], dry_run: bool) -> List[str]: """ Delete modules belonging to the app and all related doctypes. Note: All record linked linked to Module Def are also deleted. @@ -252,8 +254,6 @@ def _delete_modules(app_name: str, dry_run: bool) -> List[str]: Returns: list of deleted doctypes.""" drop_doctypes = [] - modules = frappe.get_all("Module Def", filters={"app_name": app_name}, pluck="name") - doctype_link_field_map = _get_module_linked_doctype_field_map() for module_name in modules: print(f"Deleting Module '{module_name}'")