Merge pull request #137 from thirdweb-dev/01-28-allow_more_date_functions

allow more date functions and ordering for aggregations

Author: iuwqyir

internal/common/utils.go

@@ -170,7 +170,10 @@ var allowedFunctions = map[string]struct{}{
 	"length":               {},
 	"toUInt256":            {},
 	"if":                   {},
+	"toStartOfMonth":       {},
 	"toStartOfDay":         {},
+	"toStartOfHour":        {},
+	"toStartOfMinute":      {},
 	"toDate":               {},
 	"concat":               {},
 }

internal/storage/clickhouse.go

@@ -373,6 +373,11 @@ func (c *ClickHouseConnector) GetAggregations(table string, qf QueryFilter) (Que
 		query += fmt.Sprintf(" GROUP BY %s", groupByColumns)
 	}
 
+	// Add ORDER BY clause
+	if qf.SortBy != "" {
+		query += fmt.Sprintf(" ORDER BY %s %s", qf.SortBy, qf.SortOrder)
+	}
+
 	if err := common.ValidateQuery(query); err != nil {
 		return QueryResult[interface{}]{}, err
 	}