Optimize checking for existing role by name

ahmedhamidawan · Oct 5, 2023 · 316afb0 · 316afb0
1 parent ce9cdc9
commit 316afb0
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/tool_shed/util/admin_util.py b/lib/tool_shed/util/admin_util.py
@@ -100,7 +100,7 @@ def create_role(self, trans, **kwd):
                 message = "Enter a valid name and a description."
                 status = "error"
                 ok = False
-            elif get_role_by_name(trans.sa_session, trans.app.model.Role, name):
+            elif get_role_id(trans.sa_session, trans.app.model.Role, name):
                 message = "Role names must be unique and a role with that name already exists, so choose another name."
                 status = "error"
                 ok = False
@@ -179,8 +179,7 @@ def rename_role(self, trans, **kwd):
                 message = "Enter a valid name"
                 status = "error"
             else:
-                existing_role = get_role_by_name(trans.sa_session, trans.app.model.Role, new_name)
-                if existing_role and existing_role.id != role.id:
+                if get_role_id(trans.sa_session, trans.app.model.Role, new_name) != role.id:
                     message = "A role with that name already exists"
                     status = "error"
                 else:
@@ -1013,8 +1012,8 @@ def get_group(trans, id):
     return group
 
 
-def get_role_by_name(session, role_model, name):
-    stmt = select(role_model).where(role_model.name == name).limit(1)
+def get_role_id(session, role_model, name):
+    stmt = select(role_model.id).where(role_model.name == name).limit(1)
     return session.scalars(stmt).first()