From a8aa7a14c5fbd0a657d70d7b74c1406bbbbbbda5 Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Thu, 13 Jun 2019 22:22:12 +0200 Subject: [PATCH] fix(types): humidity and temperature with from and till date --- pkg/internal/temperature/temperature.go | 4 ++-- pkg/sensor/dht11.go | 18 ++++++++++-------- pkg/sensor/dht22.go | 18 ++++++++++-------- pkg/sensor/ds18b20.go | 9 +++++---- pkg/types/humidity.go | 11 ++++++----- pkg/types/temperature.go | 11 ++++++----- 6 files changed, 39 insertions(+), 32 deletions(-) diff --git a/pkg/internal/temperature/temperature.go b/pkg/internal/temperature/temperature.go index 0e6debb..cf4d7a6 100644 --- a/pkg/internal/temperature/temperature.go +++ b/pkg/internal/temperature/temperature.go @@ -52,12 +52,12 @@ func GetTemperaturesBetweenTimeRange(from time.Time, till *time.Time, temperatur cachedTemperatures := []*types.Temperature{} for _, temperature := range temperatures { - if till == nil && temperature.TemperatureDate.After(from) { + if temperature.TemperatureFromDate.After(from) && till == nil { cachedTemperatures = append(cachedTemperatures, temperature) continue } - if temperature.TemperatureDate.After(from) && temperature.TemperatureDate.Before(*till) { + if temperature.TemperatureFromDate.After(from) && temperature.TemperatureTillDate.Before(*till) { cachedTemperatures = append(cachedTemperatures, temperature) } } diff --git a/pkg/sensor/dht11.go b/pkg/sensor/dht11.go index c12bcd5..945f2e2 100644 --- a/pkg/sensor/dht11.go +++ b/pkg/sensor/dht11.go @@ -42,10 +42,11 @@ func (s *DHT11) ReadHumidity() (*types.Humidity, error) { } humidity := &types.Humidity{ - HumidityID: uuid.NewV4().String(), - HumidityValue: humidityValue, - HumidityDate: time.Now(), - SensorID: s.SensorID, + HumidityID: uuid.NewV4().String(), + HumidityValue: humidityValue, + HumidityFromDate: time.Now(), + HumidityTillDate: time.Now(), + SensorID: s.SensorID, } return humidity, nil @@ -74,10 +75,11 @@ func (s *DHT11) ReadTemperature() (*types.Temperature, error) { } temperature := &types.Temperature{ - TemperatureID: uuid.NewV4().String(), - TemperatureValue: temperatureValue, - TemperatureDate: time.Now(), - SensorID: s.SensorID, + TemperatureID: uuid.NewV4().String(), + TemperatureValue: temperatureValue, + TemperatureFromDate: time.Now(), + TemperatureTillDate: time.Now(), + SensorID: s.SensorID, } return temperature, nil diff --git a/pkg/sensor/dht22.go b/pkg/sensor/dht22.go index 20a191e..1740ee1 100644 --- a/pkg/sensor/dht22.go +++ b/pkg/sensor/dht22.go @@ -42,10 +42,11 @@ func (s *DHT22) ReadHumidity() (*types.Humidity, error) { } humidity := &types.Humidity{ - HumidityID: uuid.NewV4().String(), - HumidityValue: humidityValue, - HumidityDate: time.Now(), - SensorID: s.SensorID, + HumidityID: uuid.NewV4().String(), + HumidityValue: humidityValue, + HumidityFromDate: time.Now(), + HumidityTillDate: time.Now(), + SensorID: s.SensorID, } return humidity, nil @@ -74,10 +75,11 @@ func (s *DHT22) ReadTemperature() (*types.Temperature, error) { } temperature := &types.Temperature{ - TemperatureID: uuid.NewV4().String(), - TemperatureValue: temperatureValue, - TemperatureDate: time.Now(), - SensorID: s.SensorID, + TemperatureID: uuid.NewV4().String(), + TemperatureValue: temperatureValue, + TemperatureFromDate: time.Now(), + TemperatureTillDate: time.Now(), + SensorID: s.SensorID, } return temperature, nil diff --git a/pkg/sensor/ds18b20.go b/pkg/sensor/ds18b20.go index 9dad728..4aaae16 100644 --- a/pkg/sensor/ds18b20.go +++ b/pkg/sensor/ds18b20.go @@ -33,10 +33,11 @@ func (s *DS18B20) ReadTemperature() (*types.Temperature, error) { } temperature := &types.Temperature{ - TemperatureID: uuid.NewV4().String(), - TemperatureValue: t, - TemperatureDate: time.Now(), - SensorID: s.SensorID, + TemperatureID: uuid.NewV4().String(), + TemperatureValue: t, + TemperatureFromDate: time.Now(), + TemperatureTillDate: time.Now(), + SensorID: s.SensorID, } return temperature, nil diff --git a/pkg/types/humidity.go b/pkg/types/humidity.go index ff7ca25..edab41d 100644 --- a/pkg/types/humidity.go +++ b/pkg/types/humidity.go @@ -4,9 +4,10 @@ import "time" // Humidity ... type Humidity struct { - HumidityID string `json:"humidity_id"` - HumidityValue float64 `json:"humidity_value,string"` - HumidityDate time.Time `json:"humidity_date"` - SensorID string `json:"sensor_id"` - CreationDate time.Time `json:"creation_date"` + HumidityID string `json:"humidity_id"` + HumidityValue float64 `json:"humidity_value,string"` + HumidityFromDate time.Time `json:"humidity_from_date"` + HumidityTillDate time.Time `json:"humidity_till_date"` + SensorID string `json:"sensor_id"` + CreationDate time.Time `json:"creation_date"` } diff --git a/pkg/types/temperature.go b/pkg/types/temperature.go index 8bd797c..447a2a5 100644 --- a/pkg/types/temperature.go +++ b/pkg/types/temperature.go @@ -4,9 +4,10 @@ import "time" // Temperature ... type Temperature struct { - TemperatureID string `json:"temperature_id"` - TemperatureValue float64 `json:"temperature_value,string"` - TemperatureDate time.Time `json:"temperature_date"` - SensorID string `json:"sensor_id"` - CreationDate time.Time `json:"creation_date"` + TemperatureID string `json:"temperature_id"` + TemperatureValue float64 `json:"temperature_value,string"` + TemperatureFromDate time.Time `json:"temperature_from_date"` + TemperatureTillDate time.Time `json:"temperature_till_date"` + SensorID string `json:"sensor_id"` + CreationDate time.Time `json:"creation_date"` }