Skip to content

chore: add order field to serializers and update query ordering logic #7608

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
wxg0103 merged 1 commit into from
Nov 3, 2026
Merged

chore: add order field to serializers and update query ordering logic #7608

Show file tree
Hide file tree
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
8 changes: 7 additions & 1 deletion apps/tools/serializers/tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1470,6 +1470,7 @@ class ToolRecord(serializers.Serializer):
source_name = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("source name"))
source_type = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("source type"))
state = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("state"))
order = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("Order field"))

class Operate(serializers.Serializer):
id = serializers.UUIDField(required=False, allow_null=True, label=_("record id"))
Expand Down Expand Up @@ -1557,7 +1558,12 @@ def get_tool_records(self, current_page: int, page_size: int):
query_set = query_set.filter(Q(id=self.data.get("record_id")))
if self.data.get("workspace_id"):
query_set = query_set.filter(Q(workspace_id=self.data.get("workspace_id")))
query_set = query_set.order_by("-create_time")
order = str(self.data.get("order") or "").strip()
# 前端执行时间排序沿用触发器记录的 ett 别名协议，工具记录表无别名，需去掉前缀。
if order in ("ett.create_time", "-ett.create_time"):
query_set = query_set.order_by(order.replace("ett.", ""))
else:
query_set = query_set.order_by("-create_time")

return page_search(
current_page,
Expand Down
1 change: 1 addition & 0 deletions apps/tools/views/tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,7 @@ def get(self, request: Request, tool_id: str, workspace_id: str, current_page: i
"source_name": request.query_params.get("source_name"),
"source_type": request.query_params.get("source_type"),
"state": request.query_params.get("state"),
"order": request.query_params.get("order"),
}
).get_tool_records(current_page, page_size)
)
Expand Down
Loading