@@ -340,7 +340,7 @@ def insert(self, instance, with_valid=True):
340340 trigger_type = valid_data .get ('trigger_type' ),
341341 trigger_setting = valid_data .get ('trigger_setting' ),
342342 meta = valid_data .get ('meta' , {}),
343- is_active = valid_data .get ('is_active' ) or False ,
343+ is_active = valid_data .get ('is_active' ) or False ,
344344 user_id = self .data .get ('user_id' ),
345345 )
346346 trigger_model .save ()
@@ -360,7 +360,7 @@ def insert(self, instance, with_valid=True):
360360 def to_trigger_task_model (self , trigger_id : str , task_data : dict ):
361361 source_type = task_data .get ('source_type' )
362362 source_id = task_data .get ('source_id' )
363- is_active = self .is_active_source (source_type ,source_id )
363+ is_active = self .is_active_source (source_type , source_id )
364364 return TriggerTask (
365365 id = uuid .uuid7 (),
366366 trigger_id = trigger_id ,
@@ -380,13 +380,12 @@ def is_active_source(source_type: str, source_id: str):
380380 }
381381 if source_type not in config :
382382 raise AppApiException (500 , _ ('Error source type' ))
383- source_model ,field = config .get (TriggerTaskTypeChoices (source_type ))
383+ source_model , field = config .get (TriggerTaskTypeChoices (source_type ))
384384 source = QuerySet (source_model ).filter (id = source_id ).first ()
385385 if not source :
386386 raise AppApiException (500 , _ (f'{ source_type } id does not exist' ))
387387
388- return getattr (source ,field )
389-
388+ return getattr (source , field )
390389
391390 class Batch (serializers .Serializer ):
392391 workspace_id = serializers .CharField (required = True , label = _ ('workspace id' ))
@@ -440,7 +439,7 @@ def edit(self, instance: Dict, with_valid=True):
440439 self .is_valid ()
441440 TriggerEditRequest (data = instance ).is_valid (raise_exception = True )
442441 trigger_id = self .data .get ('trigger_id' )
443- trigger = Trigger .objects .filter (workspace_id = self .data .get ('workspace_id' ) , id = trigger_id ).first ()
442+ trigger = Trigger .objects .filter (workspace_id = self .data .get ('workspace_id' ), id = trigger_id ).first ()
444443 if not trigger :
445444 raise serializers .ValidationError (_ ('Trigger not found' ))
446445
@@ -455,7 +454,7 @@ def edit(self, instance: Dict, with_valid=True):
455454 if trigger_tasks :
456455 TriggerTask .objects .filter (trigger_id = trigger_id ).delete ()
457456 trigger_task_model_list = [TriggerTask (
458- id = uuid .uuid7 (),
457+ id = task_data . get ( 'id' ) or uuid .uuid7 (),
459458 trigger_id = trigger_id ,
460459 source_type = task_data .get ('source_type' ),
461460 source_id = task_data .get ('source_id' ),
@@ -495,7 +494,7 @@ def one(self, with_valid=True):
495494
496495 application_task_list = []
497496 if application_ids :
498- applications = Application .objects .filter (workspace_id = workspace_id , id__in = application_ids )
497+ applications = Application .objects .filter (workspace_id = workspace_id , id__in = application_ids )
499498 application_task_list = ApplicationTriggerTaskSerializer (applications , many = True ).data
500499 tool_task_list = []
501500 if tool_ids :
0 commit comments