From dbe4871d32b45385437d5cfc0738ddaef566cec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20T=C3=B3th?=
 <4157749+tothandras@users.noreply.github.com>
Date: Tue, 28 Nov 2023 02:47:23 +0100
Subject: [PATCH] fix(api)!: if total value is queried for a period, replace
 the window start and end with the period for each row (#450)

---
 internal/server/router/router.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/internal/server/router/router.go b/internal/server/router/router.go
index 70ff21a5c..ea3d291ff 100644
--- a/internal/server/router/router.go
+++ b/internal/server/router/router.go
@@ -208,6 +208,18 @@ func (a *Router) QueryMeterWithMeter(w http.ResponseWriter, r *http.Request, log
 		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 == "" {