Skip to content

fix: Trigger record list #4731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shaohuzhang1 merged 1 commit into from
Jan 29, 2026
+31 −4
Merged

fix: Trigger record list #4731

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 31 additions & 4 deletions apps/trigger/serializers/trigger_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from common.exception.app_exception import AppApiException
from common.utils.common import get_file_content
from maxkb.conf import PROJECT_DIR
from trigger.models import TriggerTask, TaskRecord
from trigger.models import TriggerTask, TaskRecord, Trigger


class ChatRecordSerializerModel(serializers.ModelSerializer):
Expand All @@ -38,7 +38,16 @@ class Meta:

class TriggerTaskQuerySerializer(serializers.Serializer):
trigger_id = serializers.CharField(required=True, label=_("Trigger ID"))
workspace_id = serializers.CharField(required=True, label=_('workspace id'))
workspace_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("Workspace ID"))

def is_valid(self, *, raise_exception=False):
super().is_valid(raise_exception=True)
workspace_id = self.data.get('workspace_id')
query_set = QuerySet(Trigger).filter(id=self.data.get('trigger_id'))
if workspace_id:
query_set = query_set.filter(workspace_id=workspace_id)
if not query_set.exists():
raise AppApiException(500, _('Trigger id does not exist'))

def get_query_set(self):
query_set = QuerySet(TriggerTask).filter(workspace_id=self.data.get("workspace_id")).filter(
Expand All @@ -53,10 +62,19 @@ def list(self, with_valid=True):

class TriggerTaskRecordOperateSerializer(serializers.Serializer):
trigger_id = serializers.CharField(required=True, label=_("Trigger ID"))
workspace_id = serializers.CharField(required=True, label=_('workspace id'))
workspace_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("Workspace ID"))
trigger_task_id = serializers.CharField(required=True, label=_("Trigger task ID"))
trigger_task_record_id = serializers.CharField(required=True, label=_("Trigger task record ID"))

def is_valid(self, *, raise_exception=False):
super().is_valid(raise_exception=True)
workspace_id = self.data.get('workspace_id')
query_set = QuerySet(Trigger).filter(id=self.data.get('trigger_id'))
if workspace_id:
query_set = query_set.filter(workspace_id=workspace_id)
if not query_set.exists():
raise AppApiException(500, _('Trigger id does not exist'))

def get_execution_details(self, is_valid=True):
if is_valid:
self.is_valid(raise_exception=True)
Expand All @@ -75,11 +93,20 @@ def get_execution_details(self, is_valid=True):

class TriggerTaskRecordQuerySerializer(serializers.Serializer):
trigger_id = serializers.CharField(required=True, label=_("Trigger ID"))
workspace_id = serializers.CharField(required=True, label=_('workspace id'))
workspace_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("Workspace ID"))
state = serializers.CharField(required=False, allow_blank=True, allow_null=True, label=_('Trigger state'))
name = serializers.CharField(required=False, allow_blank=True, allow_null=True, label=_('Trigger name'))
order = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_('Order field'))

def is_valid(self, *, raise_exception=False):
super().is_valid(raise_exception=True)
workspace_id = self.data.get('workspace_id')
query_set = QuerySet(Trigger).filter(id=self.data.get('trigger_id'))
if workspace_id:
query_set = query_set.filter(workspace_id=workspace_id)
if not query_set.exists():
raise AppApiException(500, _('Trigger id does not exist'))

def get_query_set(self):
trigger_query_set = QuerySet(
model=get_dynamics_model({
Expand Down