perf(perms): 修改变量名

apps/perms/api/asset/user_permission/user_permission_nodes_with_assets.py

@@ -63,14 +63,14 @@ class UserGrantedNodeChildrenWithAssetsAsTreeForAdminApi(ForAdminMixin, UserNode
 
     def get_data_on_node_indirect_granted(self, key):
         user = self.user
-        asset_perm_ids = get_user_all_assetpermissions_id(user)
+        asset_perms_id = get_user_all_assetpermissions_id(user)
 
         nodes = get_indirect_granted_node_children(user, key)
 
         assets = Asset.org_objects.filter(
             nodes__key=key,
         ).filter(
-            granted_by_permissions__id__in=asset_perm_ids
+            granted_by_permissions__id__in=asset_perms_id
         ).distinct()
         assets = assets.prefetch_related('platform')
         return nodes, assets

apps/perms/tasks.py

@@ -65,10 +65,10 @@ def check_asset_permission_expired():
 
 
 @shared_task(queue='node_tree')
-def dispatch_process_expired_asset_permission(asset_perm_ids):
+def dispatch_process_expired_asset_permission(asset_perms_id):
     user_ids = User.objects.filter(
-        Q(assetpermissions__id__in=asset_perm_ids) |
-        Q(groups__assetpermissions__id__in=asset_perm_ids)
+        Q(assetpermissions__id__in=asset_perms_id) |
+        Q(groups__assetpermissions__id__in=asset_perms_id)
     ).distinct().values_list('id', flat=True)
     RebuildUserTreeTask.objects.bulk_create(
         [RebuildUserTreeTask(user_id=user_id) for user_id in user_ids]
@@ -95,13 +95,13 @@ def create_rebuild_user_tree_task_by_related_nodes_or_assets(node_ids, asset_ids
         Node.objects.filter(key__in=node_keys).values_list('id', flat=True)
     )
 
-    asset_perm_ids = set()
-    asset_perm_ids.update(
+    asset_perms_id = set()
+    asset_perms_id.update(
         AssetPermission.objects.filter(
             assets__id__in=asset_ids
         ).values_list('id', flat=True).distinct()
     )
-    asset_perm_ids.update(
+    asset_perms_id.update(
         AssetPermission.objects.filter(
             nodes__id__in=node_ids
         ).values_list('id', flat=True).distinct()
@@ -110,12 +110,12 @@ def create_rebuild_user_tree_task_by_related_nodes_or_assets(node_ids, asset_ids
     user_ids = set()
     user_ids.update(
         User.objects.filter(
-            assetpermissions__id__in=asset_perm_ids
+            assetpermissions__id__in=asset_perms_id
         ).distinct().values_list('id', flat=True)
     )
     user_ids.update(
         User.objects.filter(
-            groups__assetpermissions__id__in=asset_perm_ids
+            groups__assetpermissions__id__in=asset_perms_id
         ).distinct().values_list('id', flat=True)
     )
 

apps/perms/utils/asset/user_permission.py

@@ -305,14 +305,14 @@ def get_user_granted_nodes_list_via_mapping_node(user):
 
 
 def get_user_granted_all_assets(user, via_mapping_node=True):
-    asset_perm_ids = get_user_all_assetpermissions_id(user)
+    asset_perms_id = get_user_all_assetpermissions_id(user)
     if via_mapping_node:
         granted_node_keys = UserGrantedMappingNode.objects.filter(
             user=user, granted=True,
         ).values_list('key', flat=True).distinct()
     else:
         granted_node_keys = Node.objects.filter(
-            granted_by_permissions__id__in=asset_perm_ids
+            granted_by_permissions__id__in=asset_perms_id
         ).distinct().values_list('key', flat=True)
     granted_node_keys = Node.clean_children_keys(granted_node_keys)
 
@@ -321,7 +321,7 @@ def get_user_granted_all_assets(user, via_mapping_node=True):
         granted_node_q |= Q(nodes__key__startswith=f'{_key}:')
         granted_node_q |= Q(nodes__key=_key)
 
-    assets__id = get_user_direct_granted_assets(user, asset_perm_ids).values_list('id', flat=True)
+    assets__id = get_user_direct_granted_assets(user, asset_perms_id).values_list('id', flat=True)
 
     q = granted_node_q | Q(id__in=list(assets__id))
     return Asset.org_objects.filter(q).distinct()