Klagarge/MSE-PI-E2EEDA-Plein-de-eeeeeeeeeee
Archived
1
0
Fork 0
Code Releases 1 Activity

fix(db): return time in RFC3339 to avoid breakchange

Browse Source 
Assisted-by: Junie:claude-opus-4.8
Signed-off-by: Klagarge <remi@heredero.ch>
This commit is contained in:
Rémi Heredero
2026-05-30 02:11:28 +02:00
parent fab79aa6b6
commit 2f57e886c0
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
db/src/rest/rest.go
View File

@@ -13,6 +13,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/apache/arrow-go/v18/arrow"
"github.com/gin-contrib/cors" "github.com/gin-contrib/cors"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
swaggerFiles "github.com/swaggo/files" swaggerFiles "github.com/swaggo/files"
@@ -298,6 +299,20 @@ func formatField(v any) string {
} }
} }
// formatTime normalizes a time value (possibly a nanosecond int64) into an RFC3339 UTC string.
func formatTime(v any) any {
switch t := v.(type) {
case time.Time:
return t.UTC().Format(time.RFC3339)
case arrow.Timestamp:
return time.Unix(0, int64(t)).UTC().Format(time.RFC3339)
case int64:
return time.Unix(0, t).UTC().Format(time.RFC3339)
default:
return v
}
}
func (g *RestGateway) Run(addr string) error { func (g *RestGateway) Run(addr string) error {
return g.engine.Run(addr) return g.engine.Run(addr)
} }
@@ -343,7 +358,7 @@ func (g *RestGateway) getRoomCurrent(c *gin.Context) {
// Get the last record for the specific room by matching node IDs, aggregated by 5m intervals // Get the last record for the specific room by matching node IDs, aggregated by 5m intervals
query := fmt.Sprintf(` query := fmt.Sprintf(`
SELECT SELECT
date_bin(INTERVAL '5 minutes', time) AS time, date_bin(INTERVAL '5 minutes', time)::TIMESTAMP AS time,
ROUND(AVG(co2_ppm)) AS co2_ppm, ROUND(AVG(co2_ppm)) AS co2_ppm,
ROUND(AVG(temp), 2) AS temp, ROUND(AVG(temp), 2) AS temp,
ROUND(AVG(humidity), 2) AS humidity, ROUND(AVG(humidity), 2) AS humidity,
@@ -367,6 +382,9 @@ func (g *RestGateway) getRoomCurrent(c *gin.Context) {
if it.Next() { if it.Next() {
val := it.Value() val := it.Value()
val["room"] = roomID val["room"] = roomID
if t, ok := val["time"]; ok {
val["time"] = formatTime(t)
}
c.JSON(http.StatusOK, val) c.JSON(http.StatusOK, val)
return return
} }
@@ -404,7 +422,7 @@ func (g *RestGateway) getRoomHistory(c *gin.Context) {
query := fmt.Sprintf(` query := fmt.Sprintf(`
SELECT SELECT
date_bin(INTERVAL '5 minutes', time) AS time, date_bin(INTERVAL '5 minutes', time)::TIMESTAMP AS time,
ROUND(AVG(co2_ppm)) AS co2_ppm, ROUND(AVG(co2_ppm)) AS co2_ppm,
ROUND(AVG(temp), 2) AS temp, ROUND(AVG(temp), 2) AS temp,
ROUND(AVG(humidity), 2) AS humidity, ROUND(AVG(humidity), 2) AS humidity,
@@ -428,6 +446,9 @@ func (g *RestGateway) getRoomHistory(c *gin.Context) {
for it.Next() { for it.Next() {
val := it.Value() val := it.Value()
val["room"] = roomID val["room"] = roomID
if t, ok := val["time"]; ok {
val["time"] = formatTime(t)
}
history = append(history, val) history = append(history, val)
} }