refactor(query): move window size setter to connector (#798)

internal/server/router/meter_query.go

@@ -139,18 +139,6 @@ func (a *Router) QueryMeterWithMeter(ctx context.Context, w http.ResponseWriter,
 		Data:       data,
 	}
 
-	// If total data is queried for a period, replace the window start and end with the period for each row
-	if params.WindowSize == nil {
-		for i := range resp.Data {
-			if params.From != nil {
-				resp.Data[i].WindowStart = *params.From
-			}
-			if params.To != nil {
-				resp.Data[i].WindowEnd = *params.To
-			}
-		}
-	}
-
 	// Parse media type
 	accept := r.Header.Get("Accept")
 	if accept == "" {

internal/streaming/clickhouse_connector/connector.go

@@ -108,6 +108,20 @@ func (c *ClickhouseConnector) QueryMeter(ctx context.Context, namespace string,
 		return nil, fmt.Errorf("get values: %w", err)
 	}
 
+	// If the total usage is queried for a single period (no window size),
+	// replace the window start and end with the period for each row.
+	// We can still have multiple rows for a single period due to group bys.
+	if params.WindowSize == nil {
+		for i := range values {
+			if params.From != nil {
+				values[i].WindowStart = *params.From
+			}
+			if params.To != nil {
+				values[i].WindowEnd = *params.To
+			}
+		}
+	}
+
 	return values, nil
 }