From 8f057ef04a1214c6cc0fc194d552f1eeb2a4ad7d Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Sat, 29 Oct 2022 12:25:19 +0000
Subject: [PATCH] perf: ensure cache works for `non_standard_user_types` when
 empty (#18665)

---
 frappe/core/doctype/user_type/user_type.py | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/frappe/core/doctype/user_type/user_type.py b/frappe/core/doctype/user_type/user_type.py
index 369e70bf56cf..5917ba27561c 100644
--- a/frappe/core/doctype/user_type/user_type.py
+++ b/frappe/core/doctype/user_type/user_type.py
@@ -14,6 +14,12 @@ def validate(self):
 		self.set_modules()
 		self.add_select_perm_doctypes()
 
+	def clear_cache(self):
+		super().clear_cache()
+
+		if not self.is_standard:
+			frappe.cache().delete_value("non_standard_user_types")
+
 	def on_update(self):
 		if self.is_standard:
 			return
@@ -24,7 +30,6 @@ def on_update(self):
 		self.add_role_permissions_for_select_doctypes()
 		self.add_role_permissions_for_file()
 		self.update_users()
-		get_non_standard_user_type_details()
 		self.remove_permission_for_deleted_doctypes()
 
 	def on_trash(self):
@@ -184,19 +189,14 @@ def add_role_permissions(doctype, role):
 	return name
 
 
-def get_non_standard_user_type_details():
+def get_non_standard_user_types():
 	user_types = frappe.get_all(
 		"User Type",
 		fields=["apply_user_permission_on", "name", "user_id_field"],
 		filters={"is_standard": 0},
 	)
 
-	if user_types:
-		user_type_details = {d.name: [d.apply_user_permission_on, d.user_id_field] for d in user_types}
-
-		frappe.cache().set_value("non_standard_user_types", user_type_details)
-
-		return user_type_details
+	return {d.name: [d.apply_user_permission_on, d.user_id_field] for d in user_types}
 
 
 @frappe.whitelist()
@@ -290,10 +290,10 @@ def apply_permissions_for_non_standard_user_type(doc, method=None):
 	if not frappe.db.table_exists("User Type"):
 		return
 
-	user_types = frappe.cache().get_value("non_standard_user_types")
-
-	if not user_types:
-		user_types = get_non_standard_user_type_details()
+	user_types = frappe.cache().get_value(
+		"non_standard_user_types",
+		get_non_standard_user_types,
+	)
 
 	if not user_types:
 		return