From c2fa43a5ac7f0cd889269b1fb4508e9812e9190d Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Fri, 26 Dec 2025 14:58:24 +0800
Subject: [PATCH] refactor: UserPermTreeAPI support return favorite and ungroup
 node - Luna Page

---
 apps/perms/api/user_permission/tree.py | 90 ++++++++++++++++++++++++--
 1 file changed, 86 insertions(+), 4 deletions(-)

diff --git a/apps/perms/api/user_permission/tree.py b/apps/perms/api/user_permission/tree.py
index c8d923e54..c77a0c143 100644
--- a/apps/perms/api/user_permission/tree.py
+++ b/apps/perms/api/user_permission/tree.py
@@ -1,4 +1,6 @@
 from django.db.models import Q
+from django.utils.translation import gettext_lazy as _
+from django.conf import settings
 
 from rest_framework.generics import ListAPIView
 from rest_framework.response import Response
@@ -7,8 +9,10 @@ from rest_framework.generics import get_object_or_404
 from common.utils import get_logger, timeit
 from orgs.utils import current_org
 from assets.api import SerializeToTreeNodeMixin
-from assets.models import Node
+from assets.models import Node, FavoriteAsset, Asset
+from assets.tree.asset_tree import AssetTreeNodeAsset
 from perms.tree import UserPermTree, PermTreeNode
+from perms.utils.utils import UserPermUtil
 
 from .mixin import SelfOrPKUserMixin
 
@@ -41,19 +45,40 @@ class UserPermNodeChildrenAsTreeApi(SelfOrPKUserMixin, SerializeToTreeNodeMixin,
         返回收藏节点和资产
         返回未分组节点和资产 (如果需要)
         '''
+
         if current_org.is_root():
             orgs = self.user.orgs.all()
             nodes_level = [1]
             with_assets_node_levels = None
             expand_level = 0
         else:
-            orgs = [current_org]
+            orgs = self.user.orgs.filter(id=current_org.id)
             nodes_level = [1, 2]
             with_assets_node_levels = [1]
             expand_level = 1
         
+        if not orgs.exists():
+            return Response(data=[])
+        
+        # 收藏节点和资产
+        f_node, f_assets = self.get_favorite_node_with_assets()
+        f_nodes = []
+        if f_node:
+            f_nodes = self.serialize_nodes(
+                [f_node], with_asset_amount=True, expand_level=0, with_assets=True
+            )
+        
+        # 未分组节点和资产
+        u_node, u_assets = self.get_ungrouped_node_with_assets_if_need()
+        u_nodes = []
+        if u_node:
+            u_nodes = self.serialize_nodes(
+                [u_node], with_asset_amount=True, expand_level=0, with_assets=True
+            )
+        
         nodes = []
         assets = []
+
         for org in orgs:
             tree = UserPermTree(
                 user=self.user, org=org, with_assets_node_levels=with_assets_node_levels
@@ -66,8 +91,9 @@ class UserPermNodeChildrenAsTreeApi(SelfOrPKUserMixin, SerializeToTreeNodeMixin,
         nodes = self.serialize_nodes(
             nodes, with_asset_amount=True, expand_level=expand_level, with_assets=True
         )
+        assets = [*f_assets, *u_assets, *assets]
         assets = self.serialize_assets(assets)
-        data = [*nodes, *assets]
+        data = [*f_nodes, *u_nodes, *nodes, *assets]
         return Response(data)
     
     def expand_tree_node_with_assets(self, key):
@@ -77,6 +103,10 @@ class UserPermNodeChildrenAsTreeApi(SelfOrPKUserMixin, SerializeToTreeNodeMixin,
         '''
         expand_level = 0
         node = get_object_or_404(Node, key=key)
+        org = self.user.orgs.filter(id=node.org_id).first()
+        if not org:
+            return Response(data=[])
+
         tree = UserPermTree(
             user=self.user, org=node.org, with_assets_node_id=node.id
         )
@@ -105,7 +135,11 @@ class UserPermNodeChildrenAsTreeApi(SelfOrPKUserMixin, SerializeToTreeNodeMixin,
             orgs = self.user.orgs.all()
             with_assets_limit = max(100, with_assets_limit // max(1, orgs.count()))
         else:
-            orgs = [current_org]
+            orgs = self.user.orgs.filter(id=current_org.id)
+
+        if not orgs.exists():
+            return Response(data=[])
+
         assets_q_object = Q(name__icontains=search) | Q(address__icontains=search)
         nodes = []
         assets = []
@@ -126,3 +160,51 @@ class UserPermNodeChildrenAsTreeApi(SelfOrPKUserMixin, SerializeToTreeNodeMixin,
         assets = self.serialize_assets(assets)
         data = [*nodes, *assets]
         return Response(data=data)
+    
+    def get_favorite_node_with_assets(self):
+        asset_ids = FavoriteAsset.get_user_favorite_asset_ids(self.user)
+        assets_amount = len(asset_ids)
+        node = PermTreeNode(
+            _id='favorite',
+            key='favorite',
+            value=_('Favorite'),
+            assets_amount=assets_amount
+        )
+        node.assets_amount_total = assets_amount
+
+        if not asset_ids:
+            return node, []
+        
+        assets = Asset.objects.filter(id__in=asset_ids).values(*AssetTreeNodeAsset.model_values)
+        assets = list(assets)
+        node.init_assets(assets)
+        assets = node.get_assets()
+        return node, assets
+
+    def get_ungrouped_node_with_assets_if_need(self):
+        if not settings.PERM_SINGLE_ASSET_TO_UNGROUP_NODE:
+            return None, []
+
+        if current_org.is_root():
+            return None, []
+
+        org = self.user.orgs.filter(id=current_org.id).first()
+        if not org:
+            return None, []
+
+        _util = UserPermUtil(user=self.user, org=org)
+        direct_asset_ids = _util._user_direct_asset_ids
+        assets_amount = len(direct_asset_ids)
+        node = PermTreeNode(
+            _id='ungrouped',
+            key='ungrouped',
+            value=_('Ungrouped'),
+            assets_amount=assets_amount
+        )
+        node.assets_amount_total = assets_amount
+        if not direct_asset_ids:
+            return node, []
+        assets = Asset.objects.filter(id__in=direct_asset_ids).values(*AssetTreeNodeAsset.model_values)
+        node.init_assets(list(assets))
+        assets = node.get_assets()
+        return node, assets