From ce22efcb9677343dceca50ece00fa592b929d031 Mon Sep 17 00:00:00 2001
From: Joel Schmid <joelschmidwitt@gmail.com>
Date: Sat, 20 Mar 2021 21:31:20 +0100
Subject: [PATCH] create flux query

---
 storage/influxdb-storage.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/storage/influxdb-storage.go b/storage/influxdb-storage.go
index fca5c1c..99eb9a5 100644
--- a/storage/influxdb-storage.go
+++ b/storage/influxdb-storage.go
@@ -54,7 +54,12 @@ func (storage *influxStorage) Save(data WeatherData) error {
 
 //GetData datapoints from InfluxDB
 func (storage *influxStorage) GetData(query *WeatherQuery) ([]*WeatherData, error) {
+	fluxQuery := storage.createFluxQuery(query)
+	res, err := storage.executeFluxQuery(fluxQuery)
+	return res, err
+}
 
+func (storage *influxStorage) createFluxQuery(query *WeatherQuery) string {
 	fields := ""
 	concat := ""
 
@@ -81,9 +86,7 @@ func (storage *influxStorage) GetData(query *WeatherQuery) ([]*WeatherData, erro
 	fields = fmt.Sprintf(" and ( %v )", 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)
-
-	res, err := storage.executeFluxQuery(fluxQuery)
-	return res, err
+	return fluxQuery
 }
 
 func (storage *influxStorage) executeFluxQuery(query string) ([]*WeatherData, error) {