Klagarge/MSE-SoftwEng
1
0
Fork 0
Code Issues Pull Requests Releases Activity

feat(gateway): small adaption for softweng project

Browse Source 
Signed-off-by: Klagarge <remi@heredero.ch>
This commit is contained in:
Rémi Heredero
2025-04-15 01:03:57 +02:00
parent 0b57f26688
commit f4d088decd
7 changed files with 100 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
gateway/src/RequestInflux.go
View File

@@ -11,37 +11,27 @@ import (
"os"
)
// swagger:model
// @Description Example response for Garage Door status
type GarageDoorExample struct {
// example: true
IsClosed bool `json:"IsClosed"`
// example: false
IsDownButtonPressed bool `json:"IsDownButtonPressed"`
// example: false
IsIRSensor bool `json:"IsIRSensor"`
// example: false
IsOpen bool `json:"IsOpen"`
// example: false
IsUpButtonPressed bool `json:"IsUpButtonPressed"`
}
// @Summary Request Influx data
// @Description Request data from InfluxDB for a specific device in a room
// @Tags request
// @Accept json
// @Produce json
// @Security BasicAuth
// @Param room query string true "Room name" example(Garage)
// @Param device query string true "Device name" example(Door)
// @Success 200 {object} GarageDoorExample "Returns a map of field names to their latest values."
// @Param user query string true "User name" example(remi)
// @Param room query string true "Room name" example(Bedroom)
// @Param device query string true "Device name" example(DoorSensor)
// @Success 200 {object} map[string]interface{} "Returns a map of field names to their latest values."
// @Failure 500 {object} gin.H
// @Router /raclette [get]
func (gh *Gateway) requestInflux(c *gin.Context) error {
// Get the user from the authenticated context
user := c.MustGet(gin.AuthUserKey).(string)
//userId := c.MustGet(gin.AuthUserKey).(string)
// Get room and device from the query parameters
user, ret := c.GetQuery("user")
if !ret {
return errors.New("no user found")
}
room, ret := c.GetQuery("room")
if !ret {
return errors.New(`no room found`)
@@ -51,24 +41,35 @@ func (gh *Gateway) requestInflux(c *gin.Context) error {
return errors.New(`no device found`)
}
org := user
bucket := user
// Get env variables and set default values if not set
INFLUXDB_ORG, ok := os.LookupEnv("INFLUXDB_ORG")
if !ok {
log.Error("INFLUXDB_ORG not set, using default value: raclette")
INFLUXDB_ORG = "raclette"
}
queryAPI := gh.influx.QueryAPI(org)
INFLUXDB_BUCKET, ok := os.LookupEnv("INFLUXDB_BUCKET")
if !ok {
log.Error("INFLUXDB_BUCKET not set, using default value: raclette")
INFLUXDB_BUCKET = "raclette"
}
queryAPI := gh.influx.QueryAPI(INFLUXDB_ORG)
MEASUREMENT_NAME, ok := os.LookupEnv("MEASUREMENT_NAME")
if !ok {
log.Error("MEASUREMENT_NAME not set, using default value: softweng")
MEASUREMENT_NAME = "softweng"
MEASUREMENT_NAME = "THC"
}
// The Flux query uses a large range (-1000d) and aggregates the latest values.
// This ensures we always get the most recent data, even if the database contains old entries.
query := fmt.Sprintf(`from(bucket: %q)
|> range(start: -1000d)
|> filter(fn: (r) => r["_measurement"] == %q)
|> filter(fn: (r) => r["user"] == %q)
|> filter(fn: (r) => r["room"] == %q)
|> filter(fn: (r) => r["device"] == %q)
|> aggregateWindow(every: 1000d, fn: last, createEmpty: false)
`, bucket, MEASUREMENT_NAME, room, device)
//|> aggregateWindow(every: 1000d, fn: mean, createEmpty: false)
`, INFLUXDB_BUCKET, MEASUREMENT_NAME, user, room, device)
results, err := queryAPI.Query(context.Background(), query)
if err != nil {
log.Fatal(err)