projects/weather-api
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix flux query

Browse source
This commit is contained in:
Joel Schmid 2021-03-20 21:24:55 +01:00
parent 877a46b9bf
commit 3d261df142
2 changed files with 1 additions and 4 deletions

2
api/rest-api.go
View file

@ -66,8 +66,6 @@ func (api *weatherRestApi) getData(w http.ResponseWriter, r *http.Request) {
return return
} }
fmt.Println(query)
data, err := api.weaterStorage.GetData(query) data, err := api.weaterStorage.GetData(query)
if err != nil { if err != nil {
http.Error(w, "", http.StatusBadRequest) http.Error(w, "", http.StatusBadRequest)

3
storage/influxdb-storage.go
View file

@ -80,8 +80,7 @@ func (storage *influxStorage) GetData(query *WeatherQuery) ([]*WeatherData, erro
fields = fmt.Sprintf(" and ( %v )", fields) fields = fmt.Sprintf(" and ( %v )", fields)
fluxQuery := fmt.Sprintf("from(bucket:\"%v\")|> range(start: %v, stop: %v) |> filter(fn: (r) => r._measurement == \"%v\" %v)", storage.bucket, query.Start.Format(time.RFC3339), query.End.Format(time.RFC3339), storage.measurement, fields) fluxQuery := fmt.Sprintf("from(bucket:\"%v\")|> range(start: %v, stop: %v) |> filter(fn: (r) => r._measurement == \"%v\" and r.sensorId == \"%v\" %v)", storage.bucket, query.Start.Format(time.RFC3339), query.End.Format(time.RFC3339), storage.measurement, query.SensorId, fields)
fmt.Println(fluxQuery)
res, err := storage.executeFluxQuery(fluxQuery) res, err := storage.executeFluxQuery(fluxQuery)
return res, err return res, err