fix: reorder deletion of TriggerTask to ensure triggers are deployed correctly

Author: liuruibin

apps/tools/serializers/tool.py

@@ -535,6 +535,7 @@ def edit(self, instance, with_valid=True):
         @transaction.atomic
         def delete(self):
             from trigger.handler.simple_tools import deploy
+            from trigger.serializers.trigger import TriggerModelSerializer
 
             self.is_valid(raise_exception=True)
             tool = QuerySet(Tool).filter(id=self.data.get('id')).first()
@@ -547,11 +548,11 @@ def delete(self):
             trigger_ids = QuerySet(TriggerTask).filter(
                 source_type="TOOL", source_id=self.data.get('id')
             ).values('trigger_id')
-            QuerySet(TriggerTask).filter(source_type="TOOL", source_id=self.data.get('id')).delete()
             for trigger_id in trigger_ids:
                 trigger = Trigger.objects.filter(id=trigger_id['trigger_id']).first()
                 if trigger and trigger.is_active:
-                    deploy(trigger, **{})
+                    deploy(TriggerModelSerializer(trigger).data, **{})
+            QuerySet(TriggerTask).filter(source_type="TOOL", source_id=self.data.get('id')).delete()
 
 
         def one(self):