feat: Task source trigger crud

Author: zhanweizhang7

apps/trigger/models/trigger.py

@@ -52,3 +52,4 @@ class TriggerTask(AppModelMixin):
 
     class Meta:
         db_table = "event_trigger_task"
+        unique_together = [('trigger', 'source_id', 'source_type')]

apps/trigger/serializers/task_source_trigger.py

@@ -30,6 +30,20 @@
     ToolTriggerTaskSerializer, TriggerTaskModelSerializer
 
 
+class TaskSourceTriggerTaskEditRequest(serializers.Serializer):
+    meta = serializers.DictField(default=dict, required=False)
+    parameter = serializers.DictField(default=dict, required=False)
+
+
+class TaskSourceTriggerEditRequest(serializers.Serializer):
+    name = serializers.CharField(required=False, label=_('trigger name'))
+    desc = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('trigger description'))
+    trigger_type = serializers.ChoiceField(required=False, choices=TriggerTypeChoices)
+    trigger_setting = serializers.DictField(required=False, label=_("trigger setting"))
+    meta = serializers.DictField(default=dict, required=False)
+    trigger_task = TaskSourceTriggerTaskEditRequest(many=True, required=False)
+
+
 class TaskSourceTriggerSerializer(serializers.Serializer):
     workspace_id = serializers.CharField(required=True, label=_('workspace id'))
     user_id = serializers.UUIDField(required=True, label=_("User ID"))
@@ -42,7 +56,6 @@ def insert(self, instance, with_valid=True):
 
 class TaskSourceTriggerOperateSerializer(serializers.Serializer):
     trigger_id = serializers.UUIDField(required=True, label=_('trigger id'))
-    user_id = serializers.UUIDField(required=True, label=_("User ID"))
     workspace_id = serializers.CharField(required=True, label=_('workspace id'))
     source_type = serializers.CharField(required=True, label=_('source type'))
     source_id = serializers.CharField(required=True, label=_('source id'))
@@ -85,14 +98,49 @@ def one(self, with_valid=True):
                 'application_task': tool_task,
             }
 
-    def edit(self, instance: Dict, with_valid = True):
+    @transaction.atomic
+    def edit(self, instance: Dict, with_valid=True):
         if with_valid:
             self.is_valid(raise_exception=True)
+        serializer = TaskSourceTriggerEditRequest(data=instance)
+        serializer.is_valid(raise_exception=True)
+        valid_data = serializer.validated_data
+        trigger_id = self.data.get('trigger_id')
+        workspace_id = self.data.get('workspace_id')
 
+        trigger = Trigger.objects.filter(workspace_id=workspace_id, id=trigger_id).first()
+        if not trigger:
+            raise serializers.ValidationError(_('Trigger not found'))
+        task_source_trigger_edit_field_list = ['name', 'desc', 'trigger_type', 'trigger_setting', 'meta']
 
+        for field in task_source_trigger_edit_field_list:
+            if field in valid_data:
+                setattr(trigger, field, valid_data.get(field))
+        trigger.save()
 
+        return self.one()
 
+    # 删除的是当前trigger_id+source_id+source_type对应的task
+    @transaction.atomic
+    def delete(self):
+        self.is_valid(raise_exception=True)
+        trigger_id = self.data.get('trigger_id')
+        workspace_id = self.data.get('workspace_id')
+        source_id = self.data.get('source_id')
+        source_type = self.data.get('source_type')
 
+        trigger = Trigger.objects.filter(workspace_id=workspace_id,id=trigger_id).first()
+        if not trigger:
+            raise AppApiException(404, _('Trigger not found'))
+        delete_count = TriggerTask.objects.filter(trigger_id=trigger_id, source_id=source_id,
+                                                     source_type=source_type).delete()[0]
+        if delete_count == 0:
+            raise AppApiException(404, _('Task not found'))
+        has_other_tasks = TriggerTask.objects.filter(trigger_id=trigger_id).exists()
+
+        if not has_other_tasks:
+            trigger.delete()
+        return True
 
 class TaskSourceTriggerListSerializer(serializers.Serializer):
     workspace_id = serializers.CharField(required=True, label=_('workspace id'))

apps/trigger/serializers/trigger.py

@@ -18,7 +18,7 @@
 from rest_framework import serializers
 
 from application.models import Application
-from common.db.search import page_search, get_dynamics_model, native_page_search, native_search
+from common.db.search import get_dynamics_model, native_page_search, native_search
 from common.exception.app_exception import AppApiException
 from common.field.common import ObjectField
 from common.utils.common import get_file_content
@@ -327,24 +327,26 @@ class TriggerSerializer(serializers.Serializer):
     def insert(self, instance, with_valid=True):
         if with_valid:
             self.is_valid(raise_exception=True)
-            TriggerCreateRequest(data=instance).is_valid(raise_exception=True)
+        serializer = TriggerCreateRequest(data=instance)
+        serializer.is_valid(raise_exception=True)
+        valid_data = serializer.validated_data
 
-        trigger_id = instance.get('id') if instance.get('id') else uuid.uuid7()
+        trigger_id = valid_data.get('id') if valid_data.get('id') else uuid.uuid7()
 
         trigger_model = Trigger(
             id=trigger_id,
-            name=instance.get('name'),
+            name=valid_data.get('name'),
             workspace_id=self.data.get('workspace_id'),
-            desc=instance.get('desc') or '',
-            trigger_type=instance.get('trigger_type'),
-            trigger_setting=instance.get('trigger_setting'),
-            meta=instance.get('meta', {}),
+            desc=valid_data.get('desc') or '',
+            trigger_type=valid_data.get('trigger_type'),
+            trigger_setting=valid_data.get('trigger_setting'),
+            meta=valid_data.get('meta', {}),
             is_active=False,
             user_id=self.data.get('user_id'),
         )
         trigger_model.save()
 
-        trigger_tasks = instance.get('trigger_task')
+        trigger_tasks = valid_data.get('trigger_task')
         if trigger_tasks:
             trigger_task_models = [
                 self.to_trigger_task_model(trigger_id, task) for task in
@@ -420,7 +422,7 @@ def edit(self, instance: Dict, with_valid=True):
             self.is_valid()
             TriggerEditRequest(data=instance).is_valid(raise_exception=True)
         trigger_id = self.data.get('trigger_id')
-        trigger = Trigger.objects.filter(id=trigger_id).first()
+        trigger = Trigger.objects.filter(workspace_id=self.data.get('workspace_id') ,id=trigger_id).first()
         if not trigger:
             raise serializers.ValidationError(_('Trigger not found'))
 

apps/trigger/views/trigger.py

@@ -216,7 +216,7 @@ class Operate(APIView):
         )
         def get(self, request: Request, workspace_id: str, source_type: str, source_id: str, trigger_id: str):
             return result.success(TaskSourceTriggerOperateSerializer(
-                data={'trigger_id': trigger_id, 'workspace_id': workspace_id, 'user_id': request.user.id,
+                data={'trigger_id': trigger_id, 'workspace_id': workspace_id,
                       'source_id': source_id, 'source_type': source_type}
             ).one())
 
@@ -231,12 +231,27 @@ def get(self, request: Request, workspace_id: str, source_type: str, source_id:
             responses=result.DefaultResultSerializer,
             tags=[_('Trigger')]  # type: ignore
         )
-        def get(self, request: Request, workspace_id: str, source_type: str, source_id: str, trigger_id: str):
+        def put(self, request: Request, workspace_id: str, source_type: str, source_id: str, trigger_id: str):
             return result.success(TaskSourceTriggerOperateSerializer(
-                data={'trigger_id': trigger_id, 'workspace_id': workspace_id, 'user_id': request.user.id,
+                data={'trigger_id': trigger_id, 'workspace_id': workspace_id,
                       'source_id': source_id, 'source_type': source_type}
             ).edit(request.data))
 
+        @extend_schema(
+            methods=['DELETE'],
+            description=_('Delete the task source trigger'),
+            summary=_('Delete the task source trigger'),
+            operation_id=_('Delete the task source trigger'),  # type: ignore
+            parameters=TaskSourceTriggerOperateAPI.get_parameters(),
+            responses=result.DefaultResultSerializer,
+            tags=[_('Trigger')]  # type: ignore
+        )
+        def delete(self, request: Request, workspace_id: str, source_type: str, source_id: str, trigger_id: str):
+            return result.success(TaskSourceTriggerOperateSerializer(
+                data={'trigger_id': trigger_id, 'workspace_id': workspace_id,
+                      'source_id': source_id, 'source_type': source_type}
+            ).delete())
+