diff --git a/cameleer3-server-core/src/main/java/com/cameleer3/server/core/search/SearchRequest.java b/cameleer3-server-core/src/main/java/com/cameleer3/server/core/search/SearchRequest.java index 78911ecb..1c9a9351 100644 --- a/cameleer3-server-core/src/main/java/com/cameleer3/server/core/search/SearchRequest.java +++ b/cameleer3-server-core/src/main/java/com/cameleer3/server/core/search/SearchRequest.java @@ -55,16 +55,8 @@ public record SearchRequest( private static final int MAX_LIMIT = 500; private static final java.util.Set ALLOWED_SORT_FIELDS = java.util.Set.of( - "startTime", "status", "agentId", "routeId", "correlationId", "durationMs" - ); - - private static final java.util.Map SORT_FIELD_TO_COLUMN = java.util.Map.of( - "startTime", "start_time", - "status", "status", - "agentId", "agent_id", - "routeId", "route_id", - "correlationId", "correlation_id", - "durationMs", "duration_ms" + "startTime", "status", "agentId", "routeId", "correlationId", + "durationMs", "executionId", "applicationName" ); public SearchRequest { @@ -75,9 +67,12 @@ public record SearchRequest( if (!"asc".equalsIgnoreCase(sortDir)) sortDir = "desc"; } - /** Returns the validated database column name for ORDER BY. */ + /** + * Returns the validated sort field name for OpenSearch ORDER BY. + * Field names match the ExecutionDocument record fields (camelCase). + */ public String sortColumn() { - return SORT_FIELD_TO_COLUMN.getOrDefault(sortField, "start_time"); + return sortField; } /** Create a copy with resolved agentIds (from application name lookup). */