From a576ceb9dab1475bee97c45ea2d3f0b7c8883849 Mon Sep 17 00:00:00 2001 From: leiyre Date: Tue, 7 Jun 2022 11:27:26 +0200 Subject: [PATCH] fix(#1522): dates metadata fields accessible for sorting (#1529) (cherry picked from commit 3a52dd980aa0608011bf44483eb3c10968d518d2) --- src/rubrix/server/elasticseach/query_helpers.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/rubrix/server/elasticseach/query_helpers.py b/src/rubrix/server/elasticseach/query_helpers.py index 1227b8bd3d..f33889f9e8 100644 --- a/src/rubrix/server/elasticseach/query_helpers.py +++ b/src/rubrix/server/elasticseach/query_helpers.py @@ -413,14 +413,8 @@ def __resolve_aggregation_for_field_type( field_type: str, field_name: str ) -> Optional[Dict[str, Any]]: if field_type in ["keyword", "long", "integer", "boolean"]: - return { - "terms": { - "field": field_name, - "size": size or aggregations.DEFAULT_AGGREGATION_SIZE, - "order": {"_count": "desc"}, - } - } - if field_type in ["float", "long"]: + return aggregations.terms_aggregation(field_name=field_name, size=size) + if field_type in ["float", "date"]: # TODO: Revise boxplot (since elasticsearch version 7.11 and not sure for opensearch) return {"extended_stats": {"field": field_name}} return None # TODO: revise elasticsearch aggregations for API match