fix(database): add sort columns to select to avoid DISTINCT subquery error

[suvvvv]

What

Fixes a 500 error when querying a model by a sort column that was not explicitly listed in select, on models that load relations.

GET /api/incident-state-timeline/get-list (or alert-state-timeline) with sort: {"startsAt": "ASC"} currently fails with:

QueryFailedError: column "distinctAlias.AlertStateTimeline_startsAt" does not exist

Root cause

These models load relations (via @CanAccessIfCanReadOn), so TypeORM paginates with a DISTINCT subquery and references the sort columns in the outer ORDER BY:

SELECT DISTINCT "distinctAlias"."AlertStateTimeline__id",
                "distinctAlias"."AlertStateTimeline_startsAt"
FROM ( SELECT "AlertStateTimeline"."_id", "AlertStateTimeline"."alertStateId" ... ) "distinctAlias"
ORDER BY "distinctAlias"."AlertStateTimeline_startsAt" ASC

startsAt is in the outer ORDER BY but not in the inner SELECT, so Postgres cannot resolve it.

Fix

In DatabaseService._findBy, ensure every scalar sort column is present in the select map before calling repository.find(), and strip the auto-added columns from the returned items so callers only get back what they requested.

• Generalizes the existing createdAt-only handling — the default createdAt sort now flows through the same path.
• Skips nested/relation sorts.
• No change to the API contract: auto-added columns are removed from results.

- let automaticallyAddedCreatedAtInSelect: boolean = false;
+ const automaticallyAddedSortKeysInSelect: Array<string> = [];
  ...
- if (!(findBy.select as any)["createdAt"]) {
-   (findBy.select as any)["createdAt"] = true;
-   automaticallyAddedCreatedAtInSelect = true;
- }
+ for (const sortKey of Object.keys(findBy.sort)) {
+   if (typeof (findBy.sort as any)[sortKey] === Typeof.Object) { continue; }
+   if (!(findBy.select as any)[sortKey]) {
+     (findBy.select as any)[sortKey] = true;
+     automaticallyAddedSortKeysInSelect.push(sortKey);
+   }
+ }

Tests

New Common/Tests/Server/Services/DatabaseService.test.ts with 4 cases:

1. A sorted-but-unselected column is added to the select passed to the repository.
2. That auto-added column is stripped from returned items.
3. A sort column the caller explicitly selected is preserved.
4. The default createdAt sort is applied and stripped (no regression).

The two bug-specific tests fail without the source change, confirming they are real regression guards.

node node_modules/.bin/jest --runInBand ./Tests/Server/Services/DatabaseService.test.ts
# 4 passed

Prettier-clean and type-checks pass.

Fixes #2476

[simlarsen]

✅ Snyk checks have passed. No issues have been found so far.

Status	Scan Engine	Critical	High	Medium	Low	Total (0)
✅	Open Source Security	0	0	0	0	0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.