From 36c083f67457c97658bb17ad67936447877239e4 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Tue, 16 Mar 2021 19:42:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=9A=E8=AF=9D=E9=87=8C=E6=9F=A5?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E5=91=BD=E4=BB=A4=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/api/command.py         | 27 +++++++++++++++++++++++++++
 apps/terminal/backends/command/es.py | 18 ++++++++++++++----
 apps/terminal/filters.py             |  5 +----
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/apps/terminal/api/command.py b/apps/terminal/api/command.py
index e75ce491e..4d7aea9c5 100644
--- a/apps/terminal/api/command.py
+++ b/apps/terminal/api/command.py
@@ -111,6 +111,33 @@ class CommandViewSet(viewsets.ModelViewSet):
     filterset_class = CommandFilter
     ordering_fields = ('timestamp', )
 
+    def merge_all_storage_list(self, request, *args, **kwargs):
+        merged_commands = []
+
+        storages = CommandStorage.objects.all()
+        for storage in storages:
+            qs = storage.get_command_queryset()
+            commands = self.filter_queryset(qs)
+            merged_commands.extend(commands)
+
+        merged_commands.sort(key=lambda command: command.timestamp, reverse=True)
+        page = self.paginate_queryset(merged_commands)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)
+
+    def list(self, request, *args, **kwargs):
+        command_storage_id = self.request.query_params.get('command_storage_id')
+        session_id = self.request.query_params.get('session_id')
+
+        if session_id and not command_storage_id:
+            # 会话里的命令列表肯定会提供 session_id，这里防止 merge 的时候取全量的数据
+            return self.merge_all_storage_list(request, *args, **kwargs)
+        return super().list(request, *args, **kwargs)
+
     def get_queryset(self):
         command_storage_id = self.request.query_params.get('command_storage_id')
         storage = CommandStorage.objects.get(id=command_storage_id)
diff --git a/apps/terminal/backends/command/es.py b/apps/terminal/backends/command/es.py
index 1137f6ec8..da51c44e2 100644
--- a/apps/terminal/backends/command/es.py
+++ b/apps/terminal/backends/command/es.py
@@ -117,11 +117,21 @@ class CommandStore():
             timestamp_range['lte'] = timestamp__lte
 
         # 处理组织
-        must_not = []
+        should = []
         org_id = match.get('org_id')
-        if org_id == '':
+
+        real_default_org_id = '00000000-0000-0000-0000-000000000002'
+        if org_id in (real_default_org_id, ''):
             match.pop('org_id')
-            must_not.append({'wildcard': {'org_id': '*'}})
+            should.append({
+                'bool':{
+                    'must_not': [
+                        {
+                            'wildcard': {'org_id': '*'}
+                        }
+                    ]}
+            })
+            should.append({'match': {'org_id': real_default_org_id}})
 
         # 构建 body
         body = {
@@ -130,7 +140,7 @@ class CommandStore():
                     'must': [
                         {'match': {k: v}} for k, v in match.items()
                     ],
-                    'must_not': must_not,
+                    'should': should,
                     'filter': [
                         {
                             'term': {k: v}
diff --git a/apps/terminal/filters.py b/apps/terminal/filters.py
index caed19a9c..a102c149c 100644
--- a/apps/terminal/filters.py
+++ b/apps/terminal/filters.py
@@ -48,10 +48,7 @@ class CommandFilter(filters.FilterSet):
 
     @staticmethod
     def get_org_id():
-        if current_org.is_default():
-            org_id = ''
-        else:
-            org_id = current_org.id
+        org_id = current_org.id
         return org_id