From 99adb6ab7a0ff39ebd0e9b5f6504d29daad818b2 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Thu, 27 Jul 2023 14:04:29 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=94=B9=E9=80=A0username=5Fsuggestion?= =?UTF-8?q?s=20api=20=E6=94=B9=E4=B8=BApost=E8=AF=B7=E6=B1=82=20(#11110)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng <1304903146@qq.com> --- apps/accounts/api/account/account.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/accounts/api/account/account.py b/apps/accounts/api/account/account.py index ddf88e0c7..94ee9086b 100644 --- a/apps/accounts/api/account/account.py +++ b/apps/accounts/api/account/account.py @@ -52,20 +52,21 @@ class AccountViewSet(OrgBulkModelViewSet): return Response(data=serializer.data) @action( - methods=['get'], detail=False, url_path='username-suggestions', + methods=['post'], detail=False, url_path='username-suggestions', permission_classes=[IsValidUser] ) def username_suggestions(self, request, *args, **kwargs): - asset_ids = request.query_params.get('assets') - node_keys = request.query_params.get('keys') - username = request.query_params.get('username') + asset_ids = request.data.get('assets') + node_ids = request.data.get('nodes') + username = request.data.get('username') assets = Asset.objects.all() if asset_ids: - assets = assets.filter(id__in=asset_ids.split(',')) - if node_keys: - patten = Node.get_node_all_children_key_pattern(node_keys.split(',')) - assets = assets.filter(nodes__key__regex=patten) + assets = assets.filter(id__in=asset_ids) + if node_ids: + nodes = Node.objects.filter(id__in=node_ids) + node_asset_ids = Node.get_nodes_all_assets(*nodes).values_list('id', flat=True) + assets = assets.filter(id__in=set(list(asset_ids) + list(node_asset_ids))) accounts = Account.objects.filter(asset__in=assets) if username: