refactor: 重构用户授权资产查询工具(重构中..) (#9225)

* refactor: 重构用户授权资产查询工具(重构中..)

* perf: 修改 get_perm_nodes_assets 名称

* refactor: 优化用户授权节点查询工具; 删除UnionQuerySet工具

Co-authored-by: Bai <baijiangjie@gmail.com>

apps/perms/api/user_permission/tree/node_with_asset.py

@@ -17,11 +17,8 @@ from common.utils import get_object_or_none, lazyproperty
 from common.utils.common import timeit
 from perms.hands import Node
 from perms.models import PermNode
-from perms.utils import PermAccountUtil
-from perms.utils.permission import AssetPermissionUtil
-from perms.utils.user_permission import (
-    UserGrantedNodesQueryUtils, UserGrantedAssetsQueryUtils,
-)
+from perms.utils import PermAccountUtil, UserPermNodeUtil, AssetPermissionUtil
+from perms.utils import UserPermAssetUtil
 from .mixin import RebuildTreeMixin
 from ..mixin import SelfOrPKUserMixin
 
@@ -54,13 +51,12 @@ class BaseUserNodeWithAssetAsTreeApi(
 
 
 class UserPermedNodesWithAssetsAsTreeApi(BaseUserNodeWithAssetAsTreeApi):
-    query_node_util: UserGrantedNodesQueryUtils
-    query_asset_util: UserGrantedAssetsQueryUtils
+    query_node_util: UserPermNodeUtil
+    query_asset_util: UserPermAssetUtil
 
     def get_nodes_assets(self):
-        perm_ids = AssetPermissionUtil().get_permissions_for_user(self.request.user, flat=True)
-        self.query_node_util = UserGrantedNodesQueryUtils(self.request.user, perm_ids)
-        self.query_asset_util = UserGrantedAssetsQueryUtils(self.request.user, perm_ids)
+        self.query_node_util = UserPermNodeUtil(self.request.user)
+        self.query_asset_util = UserPermAssetUtil(self.request.user)
         ung_nodes, ung_assets = self._get_nodes_assets_for_ungrouped()
         fav_nodes, fav_assets = self._get_nodes_assets_for_favorite()
         all_nodes, all_assets = self._get_nodes_assets_for_all()
@@ -89,9 +85,9 @@ class UserPermedNodesWithAssetsAsTreeApi(BaseUserNodeWithAssetAsTreeApi):
     def _get_nodes_assets_for_all(self):
         nodes = self.query_node_util.get_whole_tree_nodes(with_special=False)
         if settings.PERM_SINGLE_ASSET_TO_UNGROUP_NODE:
-            assets = self.query_asset_util.get_direct_granted_nodes_assets()
+            assets = self.query_asset_util.get_perm_nodes_assets()
         else:
-            assets = self.query_asset_util.get_all_granted_assets()
+            assets = self.query_asset_util.get_all_assets()
         assets = assets.annotate(parent_key=F('nodes__key')).prefetch_related('platform')
         return nodes, assets
 
@@ -102,8 +98,8 @@ class UserPermedNodeChildrenWithAssetsAsTreeApi(BaseUserNodeWithAssetAsTreeApi):
     def get_nodes_assets(self):
         nodes = PermNode.objects.none()
         assets = Asset.objects.none()
-        query_node_util = UserGrantedNodesQueryUtils(self.user)
-        query_asset_util = UserGrantedAssetsQueryUtils(self.user)
+        query_node_util = UserPermNodeUtil(self.user)
+        query_asset_util = UserPermAssetUtil(self.user)
         node_key = self.query_node_key
         if not node_key:
             nodes = query_node_util.get_top_level_nodes()
@@ -113,7 +109,7 @@ class UserPermedNodeChildrenWithAssetsAsTreeApi(BaseUserNodeWithAssetAsTreeApi):
             assets = query_asset_util.get_favorite_assets()
         else:
             nodes = query_node_util.get_node_children(node_key)
-            assets = query_asset_util.get_node_assets(node_key)
+            assets = query_asset_util.get_node_assets(key=node_key)
         assets = assets.prefetch_related('platform')
         return nodes, assets