[v. small] Leftovers after minor changes to bucket aggr parsers (#1111)

Author: trzysiek

quesma/queryparser/filters_aggregation.go

@@ -10,6 +10,7 @@ import (
 	"quesma/logger"
 	"quesma/model"
 	"quesma/model/bucket_aggregations"
+	"sort"
 	"strconv"
 	"strings"
 )
@@ -52,7 +53,6 @@ func (cw *ClickhouseQueryTranslator) pancakeTryBucketAggregation(aggregation *pa
 	return nil
 }
 
-// paramsRaw - in a proper request should be of QueryMap type.
 func (cw *ClickhouseQueryTranslator) parseHistogram(aggregation *pancakeAggregationTreeNode, params QueryMap) (err error) {
 	const defaultInterval = 1.0
 	var interval float64
@@ -97,7 +97,6 @@ func (cw *ClickhouseQueryTranslator) parseHistogram(aggregation *pancakeAggregat
 	return nil
 }
 
-// paramsRaw - in a proper request should be of QueryMap type.
 func (cw *ClickhouseQueryTranslator) parseDateHistogram(aggregation *pancakeAggregationTreeNode, params QueryMap) (err error) {
 	field := cw.parseFieldField(params, "date_histogram")
 	dateTimeType := cw.Table.GetDateTimeTypeFromExpr(cw.Ctx, field)
@@ -146,7 +145,6 @@ func (cw *ClickhouseQueryTranslator) parseDateHistogram(aggregation *pancakeAggr
 	return nil
 }
 
-// paramsRaw - in a proper request should be of QueryMap type.
 // aggrName - "terms" or "significant_terms"
 func (cw *ClickhouseQueryTranslator) parseTermsAggregation(aggregation *pancakeAggregationTreeNode, params QueryMap, aggrName string) error {
 	field := cw.parseFieldField(params, aggrName)
@@ -169,6 +167,38 @@ func (cw *ClickhouseQueryTranslator) parseTermsAggregation(aggregation *pancakeA
 	return nil
 }
 
+func (cw *ClickhouseQueryTranslator) parseFilters(aggregation *pancakeAggregationTreeNode, params QueryMap) error {
+	filtersParamRaw, exists := params["filters"]
+	if !exists {
+		return fmt.Errorf("filters is not a map, but %T, value: %v", params, params)
+	}
+	filtersParam, ok := filtersParamRaw.(QueryMap)
+	if !ok {
+		return fmt.Errorf("filters is not a map, but %T, value: %v", filtersParamRaw, filtersParamRaw)
+	}
+
+	filters := make([]bucket_aggregations.Filter, 0, len(filtersParam))
+	for name, filterRaw := range filtersParam {
+		filterMap, ok := filterRaw.(QueryMap)
+		if !ok {
+			return fmt.Errorf("filter is not a map, but %T, value: %v", filterRaw, filterRaw)
+		}
+		filter := cw.parseQueryMap(filterMap)
+		if filter.WhereClause == nil {
+			filter.WhereClause = model.TrueExpr
+			filter.CanParse = true
+		}
+		filters = append(filters, bucket_aggregations.NewFilter(name, filter))
+	}
+
+	sort.Slice(filters, func(i, j int) bool {
+		return filters[i].Name < filters[j].Name
+	})
+	aggregation.queryType = bucket_aggregations.NewFilters(cw.Ctx, filters)
+	aggregation.isKeyed = true
+	return nil
+}
+
 func (cw *ClickhouseQueryTranslator) parseSampler(aggregation *pancakeAggregationTreeNode, params QueryMap) error {
 	const defaultSize = 100
 	aggregation.queryType = bucket_aggregations.NewSampler(cw.Ctx, cw.parseIntField(params, "shard_size", defaultSize))
@@ -199,14 +229,7 @@ func (cw *ClickhouseQueryTranslator) parseRangeAggregation(aggregation *pancakeA
 	}
 
 	const keyedDefault = false
-	keyed := keyedDefault
-	if keyedRaw, exists := params["keyed"]; exists {
-		var ok bool
-		if keyed, ok = keyedRaw.(bool); !ok {
-			logger.WarnWithCtx(cw.Ctx).Msgf("keyed is not a bool, but %T, value: %v", keyedRaw, keyedRaw)
-		}
-	}
-
+	keyed := cw.parseBoolField(params, "keyed", keyedDefault)
 	field := cw.parseFieldField(params, "range")
 	aggregation.queryType = bucket_aggregations.NewRange(cw.Ctx, field, intervals, keyed)
 	aggregation.isKeyed = keyed
@@ -305,7 +328,6 @@ func (cw *ClickhouseQueryTranslator) parseGeotileGrid(aggregation *pancakeAggreg
 	return nil
 }
 
-// compositeRaw - in a proper request should be of QueryMap type.
 // TODO: In geotile_grid, without order specidfied, Elastic returns sort by key (a/b/c earlier than x/y/z if a<x or (a=x && b<y), etc.)
 // Maybe add some ordering, but doesn't seem to be very important.
 func (cw *ClickhouseQueryTranslator) parseComposite(aggregation *pancakeAggregationTreeNode, params QueryMap) error {