From 9802aec881ba8952e00faef9d65fa53b70317b6a Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Mon, 8 May 2023 16:59:47 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E8=87=AA=E5=8A=A8=E5=8C=96=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E8=AF=A6=E6=83=85=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/api/asset/asset.py              | 12 ++++++++++--
 apps/assets/serializers/automations/base.py | 11 +++++++----
 apps/assets/urls/api_urls.py                |  1 +
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/apps/assets/api/asset/asset.py b/apps/assets/api/asset/asset.py
index ba048e236..96d55cae9 100644
--- a/apps/assets/api/asset/asset.py
+++ b/apps/assets/api/asset/asset.py
@@ -12,10 +12,11 @@ from accounts.tasks import push_accounts_to_assets_task, verify_accounts_connect
 from assets import serializers
 from assets.exceptions import NotSupportedTemporarilyError
 from assets.filters import IpInFilterBackend, LabelFilterBackend, NodeFilterBackend
-from assets.models import Asset, Gateway, Platform
+from assets.models import Asset, Gateway, Platform, AutomationExecution
 from assets.tasks import test_assets_connectivity_manual, update_assets_hardware_info_manual
 from common.api import SuggestionMixin
 from common.drf.filters import BaseFilterSet
+from common.permissions import IsValidUser
 from common.utils import get_logger, is_uuid
 from orgs.mixins import generics
 from orgs.mixins.api import OrgBulkModelViewSet
@@ -25,7 +26,8 @@ from ...notifications import BulkUpdatePlatformSkipAssetUserMsg
 logger = get_logger(__file__)
 __all__ = [
     "AssetViewSet", "AssetTaskCreateApi",
-    "AssetsTaskCreateApi", 'AssetFilterSet'
+    "AssetsTaskCreateApi", 'AssetFilterSet',
+    "AutomationExecutionRetrieveApi",
 ]
 
 
@@ -258,3 +260,9 @@ class AssetsTaskCreateApi(AssetsTaskMixin, generics.CreateAPIView):
         has = self.request.user.has_perm(perm_required)
         if not has:
             self.permission_denied(request)
+
+
+class AutomationExecutionRetrieveApi(generics.RetrieveAPIView):
+    permission_classes = (IsValidUser,)
+    model = AutomationExecution
+    serializer_class = serializers.AutomationExecutionSerializer
diff --git a/apps/assets/serializers/automations/base.py b/apps/assets/serializers/automations/base.py
index 804bcabc9..527f71628 100644
--- a/apps/assets/serializers/automations/base.py
+++ b/apps/assets/serializers/automations/base.py
@@ -1,12 +1,12 @@
 from django.utils.translation import ugettext as _
 from rest_framework import serializers
 
-from ops.mixin import PeriodTaskSerializerMixin
 from assets.models import Asset, Node, BaseAutomation, AutomationExecution
-from orgs.mixins.serializers import BulkOrgResourceModelSerializer
-from common.utils import get_logger
 from common.const.choices import Trigger
 from common.serializers.fields import ObjectRelatedField, LabeledChoiceField
+from common.utils import get_logger
+from ops.mixin import PeriodTaskSerializerMixin
+from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 
 logger = get_logger(__file__)
 
@@ -48,9 +48,12 @@ class AutomationExecutionSerializer(serializers.ModelSerializer):
 
     @staticmethod
     def get_snapshot(obj):
+        from assets.const import AutomationTypes as AssetTypes
+        from accounts.const import AutomationTypes as AccountTypes
+        tp_dict = dict(AssetTypes.choices) | dict(AccountTypes.choices)
         tp = obj.snapshot['type']
         snapshot = {
-            'type': tp,
+            'type': {'value': tp, 'label': tp_dict.get(tp, tp)},
             'name': obj.snapshot['name'],
             'comment': obj.snapshot['comment'],
             'accounts': obj.snapshot['accounts'],
diff --git a/apps/assets/urls/api_urls.py b/apps/assets/urls/api_urls.py
index 6b5f469d0..38924f333 100644
--- a/apps/assets/urls/api_urls.py
+++ b/apps/assets/urls/api_urls.py
@@ -47,6 +47,7 @@ urlpatterns = [
 
     path('gateways/<uuid:pk>/test-connective/', api.GatewayTestConnectionApi.as_view(), name='test-gateway-connective'),
     path('platform-automation-methods/', api.PlatformAutomationMethodsApi.as_view(), name='platform-automation-methods'),
+    path('automations-execution/<uuid:pk>/', api.AutomationExecutionRetrieveApi.as_view(), name='automation-execution'),
 ]
 
 urlpatterns += router.urls