Skip to content
Merged
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions src/spaceone/core/model/mongo_model/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,12 @@ def _stat_with_pipeline(
)

if sort:
aggregate.append({"sort": sort})
# Add id as default sort if not already specified
sort_with_id = sort.copy()
has_id_sort = any(s.get("key") == "id" for s in sort_with_id)
if not has_id_sort:
sort_with_id.append({"key": "id", "desc": False})
aggregate.append({"sort": sort_with_id})

response = cls.stat(
aggregate=aggregate,
Expand Down Expand Up @@ -724,7 +729,7 @@ def query(
_order_by.append(f'{sort_option["key"]}')

if sort:
_order_by.append("_id")
_order_by.append("id")

try:
vos = cls._get_target_objects(target).filter(_filter)
Expand Down
Loading