fix: add or update devices, sensors and measured values

Add additional functions to the repository to add or update devices,
sensors or measured values. Furthermore the test has been adapt to the
new functions.

pkg/repository/db/db.go

@@ -20,8 +20,11 @@ type Database interface {
 	DeleteDevices(ctx context.Context, deviceIDs ...string) error
 	DeleteSensors(ctx context.Context, sensorIDs ...string) error
 	InsertDevices(ctx context.Context, devices ...*types.Device) error
+	InsertOrUpdateDevices(ctx context.Context, devices ...*types.Device) error
 	InsertMeasuredValues(ctx context.Context, measuredValues ...*types.MeasuredValue) error
+	InsertOrUpdateMeasuredValues(ctx context.Context, measuredValues ...*types.MeasuredValue) error
 	InsertSensors(ctx context.Context, sensors ...*types.Sensor) error
+	InsertOrUpdateSensors(ctx context.Context, sensors ...*types.Sensor) error
 	Scheme(ctx context.Context) error
 	SelectDevice(ctx context.Context, deviceID string) (*types.Device, error)
 	SelectDevices(ctx context.Context) ([]*types.Device, error)

pkg/repository/db/postgres.go

@@ -85,17 +85,26 @@ func (postgres *Postgres) DeleteSensors(ctx context.Context, sensorIDs ...string
 
 // InsertDevices into the database
 func (postgres *Postgres) InsertDevices(ctx context.Context, devices ...*types.Device) error {
+	tx, err := postgres.dbo.BeginTx(ctx, &sql.TxOptions{ReadOnly: false})
+	if err != nil {
+		return fmt.Errorf("Failed to begin new transaction: %v", err)
+	}
+
+	err = postgres.insertDevices(tx, devices...)
+	if err != nil {
+		return err
+	}
+
+	return tx.Commit()
+}
+
+func (postgres *Postgres) insertDevices(tx *sql.Tx, devices ...*types.Device) error {
 	queryFile := "insertDevice.sql"
 	query, present := postgres.queries[queryFile]
 	if !present {
 		return fmt.Errorf("Postgres-Backend: File %v not found", queryFile)
 	}
 
-	tx, err := postgres.dbo.BeginTx(ctx, &sql.TxOptions{ReadOnly: false})
-	if err != nil {
-		return fmt.Errorf("Failed to begin new transaction: %v", err)
-	}
-
 	stmt, err := tx.Prepare(query)
 	if err != nil {
 		return fmt.Errorf("Failed to prepare statement: %v", err)
@@ -121,7 +130,7 @@ func (postgres *Postgres) InsertDevices(ctx context.Context, devices ...*types.D
 		}
 	}
 
-	return tx.Commit()
+	return nil
 }
 
 // InsertMeasuredValues into the database
@@ -201,6 +210,167 @@ func (postgres *Postgres) InsertMeasuredValues(ctx context.Context, measuredValu
 	return tx.Commit()
 }
 
+func (postgres *Postgres) InsertOrUpdateDevices(ctx context.Context, devices ...*types.Device) error {
+	queryFile := "insertOrUpdateDevice.sql"
+	query, present := postgres.queries[queryFile]
+	if !present {
+		return fmt.Errorf("Postgres-Backend: File %v not found", queryFile)
+	}
+
+	tx, err := postgres.dbo.BeginTx(ctx, &sql.TxOptions{ReadOnly: false})
+	if err != nil {
+		return fmt.Errorf("Failed to begin new transaction: %v", err)
+	}
+
+	for _, device := range devices {
+
+		if device.CreationDate.Equal(time.Time{}) {
+			device.CreationDate = time.Now()
+		}
+
+		_, err = tx.Exec(
+			query,
+			&device.ID,
+			&device.Name,
+			&device.Location,
+			&device.CreationDate,
+			&device.UpdateDate,
+		)
+		if err != nil {
+			tx.Rollback()
+			return fmt.Errorf("Failed to execute statement: %v", err)
+		}
+	}
+
+	return tx.Commit()
+}
+
+// InsertOrUpdateMeasuredValues into the database
+func (postgres *Postgres) InsertOrUpdateMeasuredValues(ctx context.Context, measuredValues ...*types.MeasuredValue) error {
+	splittedMeasuredValues := make(map[types.MeasuredValueType][]*types.MeasuredValue, 0)
+
+	for _, measuredValue := range measuredValues {
+		if _, ok := splittedMeasuredValues[measuredValue.ValueType]; !ok {
+			splittedMeasuredValues[measuredValue.ValueType] = make([]*types.MeasuredValue, 0)
+		}
+		splittedMeasuredValues[measuredValue.ValueType] = append(splittedMeasuredValues[measuredValue.ValueType], measuredValue)
+	}
+
+	tx, err := postgres.dbo.BeginTx(ctx, &sql.TxOptions{ReadOnly: false})
+	if err != nil {
+		return fmt.Errorf("Failed to begin new transaction: %v", err)
+	}
+
+	// General insert function
+	insert := func(tx *sql.Tx, queryFile string, measuredValues []*types.MeasuredValue) error {
+		query, present := postgres.queries[queryFile]
+		if !present {
+			return fmt.Errorf("Postgres-Backend: File %v not found", queryFile)
+		}
+
+		stmt, err := tx.Prepare(query)
+		if err != nil {
+			return fmt.Errorf("Failed to prepare statement: %v", err)
+		}
+		defer stmt.Close()
+
+		for _, measuredValue := range measuredValues {
+
+			if measuredValue.CreationDate.Equal(time.Time{}) {
+				measuredValue.CreationDate = time.Now()
+			}
+
+			_, err := stmt.Exec(
+				&measuredValue.ID,
+				&measuredValue.Value,
+				&measuredValue.Date,
+				&measuredValue.SensorID,
+				&measuredValue.CreationDate,
+				&measuredValue.UpdateDate,
+			)
+
+			if err != nil {
+				return fmt.Errorf("Failed to execute statement: %v", err)
+			}
+		}
+
+		return nil
+	}
+
+	for measuredValueType, measuredValues := range splittedMeasuredValues {
+		var queryFile string
+
+		switch measuredValueType {
+		case types.Humidity:
+			queryFile = "insertOrUpdateHumidity.sql"
+		case types.Pressure:
+			queryFile = "insertOrUpdatePressure.sql"
+		case types.Temperature:
+			queryFile = "insertOrUpdateTemperature.sql"
+		default:
+			tx.Rollback()
+			return fmt.Errorf("Measured value type %v not supported", measuredValueType)
+		}
+
+		err := insert(tx, queryFile, measuredValues)
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+
+	return tx.Commit()
+}
+
+// InsertOrUpdateSensors into the database
+func (postgres *Postgres) InsertOrUpdateSensors(ctx context.Context, sensors ...*types.Sensor) error {
+	queryFile := "insertOrUpdateSensor.sql"
+	query, present := postgres.queries[queryFile]
+	if !present {
+		return fmt.Errorf("Postgres-Backend: File %v not found", queryFile)
+	}
+
+	tx, err := postgres.dbo.BeginTx(ctx, &sql.TxOptions{ReadOnly: false})
+	if err != nil {
+		return fmt.Errorf("Failed to begin new transaction: %v", err)
+	}
+
+	stmt, err := tx.Prepare(query)
+	if err != nil {
+		return fmt.Errorf("Failed to prepare statement: %v", err)
+	}
+	defer stmt.Close()
+
+	for _, sensor := range sensors {
+
+		if sensor.CreationDate.Equal(time.Time{}) {
+			sensor.CreationDate = time.Now()
+		}
+
+		_, err = stmt.Exec(
+			&sensor.ID,
+			&sensor.Name,
+			&sensor.Location,
+			&sensor.WireID,
+			&sensor.I2CBus,
+			&sensor.I2CAddress,
+			&sensor.GPIONumber,
+			&sensor.Model,
+			&sensor.Enabled,
+			&sensor.TickDuration,
+			&sensor.DeviceID,
+			&sensor.CreationDate,
+			&sensor.UpdateDate,
+		)
+		if err != nil {
+			tx.Rollback()
+			return fmt.Errorf("Failed to execute statement: %v", err)
+		}
+	}
+
+	return tx.Commit()
+}
+
 // InsertSensors into the database
 func (postgres *Postgres) InsertSensors(ctx context.Context, sensors ...*types.Sensor) error {
 	queryFile := "insertSensor.sql"
@@ -438,8 +608,8 @@ func (postgres *Postgres) selectMeasuredValue(tx *sql.Tx, query string, args ...
 		err := rows.Scan(
 			&measuredValue.ID,
 			&measuredValue.Value,
-			&measuredValue.SensorID,
 			&measuredValue.Date,
+			&measuredValue.SensorID,
 			&measuredValue.CreationDate,
 			&measuredValue.UpdateDate,
 		)

pkg/repository/db/postgres/insertOrUpdateDevice.sql

@@ -0,0 +1,14 @@
+INSERT INTO devices (
+  device_id,
+  device_name,
+  device_location,
+  creation_date,
+  update_date
+)
+VALUES ($1, $2, $3, $4, $5)
+ON CONFLICT (device_id)
+DO
+  UPDATE SET
+    device_name = EXCLUDED.device_name,
+    device_location = EXCLUDED.device_location,
+    update_date = NOW();

pkg/repository/db/postgres/insertOrUpdateHumidity.sql

@@ -0,0 +1,16 @@
+INSERT INTO humidities (
+  id,
+  value,
+  date,
+  sensor_id,
+  creation_date,
+  update_date
+)
+VALUES ($1, $2, $3, $4, $5, $6)
+ON CONFLICT (id)
+DO
+  UPDATE SET
+    value = EXCLUDED.value,
+    date = EXCLUDED.date,
+    sensor_id = EXCLUDED.sensor_id,
+    update_date = NOW();

pkg/repository/db/postgres/insertOrUpdatePressure.sql

@@ -0,0 +1,16 @@
+INSERT INTO pressures (
+  id,
+  value,
+  date,
+  sensor_id,
+  creation_date,
+  update_date
+)
+VALUES ($1, $2, $3, $4, $5, $6)
+ON CONFLICT (id)
+DO
+  UPDATE SET
+    value = EXCLUDED.value,
+    date = EXCLUDED.date,
+    sensor_id = EXCLUDED.sensor_id,
+    update_date = NOW();

pkg/repository/db/postgres/insertOrUpdateSensor.sql

@@ -0,0 +1,31 @@
+INSERT INTO sensors (
+  sensor_id,
+  sensor_name,
+  sensor_location,
+  wire_id,
+  i2c_bus,
+  i2c_address,
+  gpio_number,
+  sensor_model,
+  sensor_enabled,
+  tick_duration,
+  device_id,
+  creation_date,
+  update_date
+)
+VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)
+ON CONFLICT (sensor_id)
+DO
+  UPDATE SET
+    sensor_name = EXCLUDED.sensor_name,
+    sensor_location = EXCLUDED.sensor_location,
+    wire_id = EXCLUDED.wire_id,
+    i2c_bus = EXCLUDED.i2c_bus,
+    i2c_address = EXCLUDED.i2c_address,
+    gpio_number = EXCLUDED.gpio_number,
+    sensor_model = EXCLUDED.sensor_model,
+    sensor_enabled = EXCLUDED.sensor_enabled,
+    tick_duration = EXCLUDED.tick_duration,
+    device_id = EXCLUDED.device_id,
+    creation_date = EXCLUDED.creation_date,
+    update_date = NOW();

pkg/repository/db/postgres/insertOrUpdateTemperature.sql

@@ -0,0 +1,16 @@
+INSERT INTO temperatures (
+  id,
+  value,
+  date,
+  sensor_id,
+  creation_date,
+  update_date
+)
+VALUES ($1, $2, $3, $4, $5, $6)
+ON CONFLICT (id)
+DO
+  UPDATE SET
+    value = EXCLUDED.value,
+    date = EXCLUDED.date,
+    sensor_id = EXCLUDED.sensor_id,
+    update_date = NOW();

pkg/repository/db/postgres/selectHumidity.sql

@@ -8,4 +8,4 @@ SELECT
 FROM
   humidities
 WHERE
-  humidity_id = $1
+  id = $1

pkg/repository/db/postgres/selectPressure.sql

@@ -8,4 +8,4 @@ SELECT
 FROM
   pressures
 WHERE
-  pressure_id = $1
+  id = $1

pkg/repository/db/postgres/selectTemperature.sql

@@ -8,4 +8,4 @@ SELECT
 FROM
   temperatures
 WHERE
-  temperature_id = $1
+  id = $1

pkg/repository/db/sqlite.go

@@ -82,6 +82,42 @@ func (sqlite *SQLite) DeleteSensors(ctx context.Context, sensorIDs ...string) er
 	return tx.Commit()
 }
 
+func (sqlite *SQLite) ExistDevice(ctx context.Context, deviceID string) (bool, error) {
+	queryFile := "existDevice.sql"
+	query, present := sqlite.queries[queryFile]
+	if !present {
+		return false, fmt.Errorf("SQLite-Backend: File %v not found", queryFile)
+	}
+
+	tx, err := sqlite.dbo.BeginTx(ctx, &sql.TxOptions{ReadOnly: false})
+	if err != nil {
+		return false, fmt.Errorf("Failed to begin new transaction: %v", err)
+	}
+
+	stmt, err := tx.Prepare(query)
+	if err != nil {
+		return false, fmt.Errorf("Failed to prepare statement: %v", err)
+	}
+	defer stmt.Close()
+
+	rows, err := stmt.Query()
+	if err != nil {
+		return false, fmt.Errorf("Failed to query statement: %v", err)
+	}
+	defer rows.Close()
+
+	var t bool
+	for rows.Next() {
+		rows.Scan(&t)
+	}
+
+	return t, nil
+}
+
+func (sqlite *SQLite) ExistDevices(ctx context.Context, deviceIDs ...string) (map[string]bool, error) {
+	return nil, nil
+}
+
 // InsertDevices into the database
 func (sqlite *SQLite) InsertDevices(ctx context.Context, devices ...*types.Device) error {
 	queryFile := "insertDevice.sql"
@@ -184,6 +220,152 @@ func (sqlite *SQLite) InsertMeasuredValues(ctx context.Context, measuredValues .
 	return tx.Commit()
 }
 
+// InsertOrUpdateMeasuredValues into the database
+func (sqlite *SQLite) InsertOrUpdateMeasuredValues(ctx context.Context, measuredValues ...*types.MeasuredValue) error {
+	splittedMeasuredValues := make(map[types.MeasuredValueType][]*types.MeasuredValue, 0)
+
+	for _, measuredValue := range measuredValues {
+		if _, ok := splittedMeasuredValues[measuredValue.ValueType]; !ok {
+			splittedMeasuredValues[measuredValue.ValueType] = make([]*types.MeasuredValue, 0)
+		}
+		splittedMeasuredValues[measuredValue.ValueType] = append(splittedMeasuredValues[measuredValue.ValueType], measuredValue)
+	}
+
+	tx, err := sqlite.dbo.BeginTx(ctx, &sql.TxOptions{ReadOnly: false})
+	if err != nil {
+		return fmt.Errorf("Failed to begin new transaction: %v", err)
+	}
+
+	// General insert function
+	insert := func(tx *sql.Tx, queryFile string, measuredValues []*types.MeasuredValue) error {
+		query, present := sqlite.queries[queryFile]
+		if !present {
+			return fmt.Errorf("SQLite-Backend: File %v not found", queryFile)
+		}
+
+		stmt, err := tx.Prepare(query)
+		if err != nil {
+			return fmt.Errorf("Failed to prepare statement: %v", err)
+		}
+		defer stmt.Close()
+
+		for _, measuredValue := range measuredValues {
+			_, err := stmt.Exec(
+				&measuredValue.ID,
+				&measuredValue.Value,
+				&measuredValue.Date,
+				&measuredValue.SensorID,
+				&measuredValue.CreationDate,
+				&measuredValue.UpdateDate,
+			)
+
+			if err != nil {
+				return fmt.Errorf("Failed to execute statement: %v", err)
+			}
+		}
+
+		return nil
+	}
+
+	for measuredValueType, measuredValues := range splittedMeasuredValues {
+		var queryFile string
+
+		switch measuredValueType {
+		case types.Humidity:
+			queryFile = "insertOrUpdateHumidity.sql"
+		case types.Pressure:
+			queryFile = "insertOrUpdatePressure.sql"
+		case types.Temperature:
+			queryFile = "insertOrUpdateTemperature.sql"
+		default:
+			tx.Rollback()
+			return fmt.Errorf("Measured value type %v not supported", measuredValueType)
+		}
+
+		err := insert(tx, queryFile, measuredValues)
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+
+	return tx.Commit()
+}
+
+// InsertOrUpdateDevices into the database
+func (sqlite *SQLite) InsertOrUpdateDevices(ctx context.Context, devices ...*types.Device) error {
+	queryFile := "insertOrUpdateDevice.sql"
+	query, present := sqlite.queries[queryFile]
+	if !present {
+		return fmt.Errorf("SQLite-Backend: File %v not found", queryFile)
+	}
+
+	tx, err := sqlite.dbo.BeginTx(ctx, &sql.TxOptions{ReadOnly: false})
+	if err != nil {
+		return fmt.Errorf("Failed to begin new transaction: %v", err)
+	}
+
+	stmt, err := tx.Prepare(query)
+	if err != nil {
+		return fmt.Errorf("Failed to prepare statement: %v", err)
+	}
+	defer stmt.Close()
+
+	for _, device := range devices {
+		_, err = stmt.Exec(&device.ID, &device.Name, &device.Location, &device.CreationDate, &device.UpdateDate)
+		if err != nil {
+			tx.Rollback()
+			return fmt.Errorf("Failed to execute statement: %v", err)
+		}
+	}
+
+	return tx.Commit()
+}
+
+// InsertOrUpdateSensors into the database
+func (sqlite *SQLite) InsertOrUpdateSensors(ctx context.Context, sensors ...*types.Sensor) error {
+	queryFile := "insertOrUpdateSensor.sql"
+	query, present := sqlite.queries[queryFile]
+	if !present {
+		return fmt.Errorf("SQLite-Backend: File %v not found", queryFile)
+	}
+
+	tx, err := sqlite.dbo.BeginTx(ctx, &sql.TxOptions{ReadOnly: false})
+	if err != nil {
+		return fmt.Errorf("Failed to begin new transaction: %v", err)
+	}
+
+	stmt, err := tx.Prepare(query)
+	if err != nil {
+		return fmt.Errorf("Failed to prepare statement: %v", err)
+	}
+	defer stmt.Close()
+
+	for _, sensor := range sensors {
+		_, err = stmt.Exec(
+			&sensor.ID,
+			&sensor.Name,
+			&sensor.Location,
+			&sensor.WireID,
+			&sensor.I2CBus,
+			&sensor.I2CAddress,
+			&sensor.GPIONumber,
+			&sensor.Model,
+			&sensor.Enabled,
+			&sensor.TickDuration,
+			&sensor.DeviceID,
+			&sensor.CreationDate,
+			&sensor.UpdateDate,
+		)
+		if err != nil {
+			tx.Rollback()
+			return fmt.Errorf("Failed to execute statement: %v", err)
+		}
+	}
+
+	return tx.Commit()
+}
+
 // InsertSensors into the database
 func (sqlite *SQLite) InsertSensors(ctx context.Context, sensors ...*types.Sensor) error {
 	queryFile := "insertSensor.sql"

pkg/repository/db/sqlite3/insertOrUpdateDevice.sql

@@ -0,0 +1,14 @@
+INSERT INTO devices (
+  device_id,
+  device_name,
+  device_location,
+  creation_date,
+  update_date
+)
+VALUES ($1, $2, $3, $4, $5)
+ON CONFLICT (device_id)
+DO
+  UPDATE SET
+    device_name = EXCLUDED.device_name,
+    device_location = EXCLUDED.device_location,
+    update_date = date('now');

pkg/repository/db/sqlite3/insertOrUpdateHumidity.sql

@@ -0,0 +1,16 @@
+INSERT INTO humidities (
+  id,
+  value,
+  date,
+  sensor_id,
+  creation_date,
+  update_date
+)
+VALUES ($1, $2, $3, $4, $5, $6)
+ON CONFLICT (id)
+DO
+  UPDATE SET
+    value = EXCLUDED.value,
+    date = EXCLUDED.date,
+    sensor_id = EXCLUDED.sensor_id,
+    update_date = date('now');

pkg/repository/db/sqlite3/insertOrUpdatePressure.sql

@@ -0,0 +1,16 @@
+INSERT INTO pressures (
+  id,
+  value,
+  date,
+  sensor_id,
+  creation_date,
+  update_date
+)
+VALUES ($1, $2, $3, $4, $5, $6)
+ON CONFLICT (id)
+DO
+  UPDATE SET
+    value = EXCLUDED.value,
+    date = EXCLUDED.date,
+    sensor_id = EXCLUDED.sensor_id,
+    update_date = date('now');

pkg/repository/db/sqlite3/insertOrUpdateSensor.sql

@@ -0,0 +1,31 @@
+INSERT INTO sensors (
+  sensor_id,
+  sensor_name,
+  sensor_location,
+  wire_id,
+  i2c_bus,
+  i2c_address,
+  gpio_number,
+  sensor_model,
+  sensor_enabled,
+  tick_duration,
+  device_id,
+  creation_date,
+  update_date
+)
+VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)
+ON CONFLICT (sensor_id)
+DO
+  UPDATE SET
+    sensor_name = EXCLUDED.sensor_name,
+    sensor_location = EXCLUDED.sensor_location,
+    wire_id = EXCLUDED.wire_id,
+    i2c_bus = EXCLUDED.i2c_bus,
+    i2c_address = EXCLUDED.i2c_address,
+    gpio_number = EXCLUDED.gpio_number,
+    sensor_model = EXCLUDED.sensor_model,
+    sensor_enabled = EXCLUDED.sensor_enabled,
+    tick_duration = EXCLUDED.tick_duration,
+    device_id = EXCLUDED.device_id,
+    creation_date = EXCLUDED.creation_date,
+    update_date = date('now');

pkg/repository/db/sqlite3/insertOrUpdateTemperature.sql

@@ -0,0 +1,16 @@
+INSERT INTO temperatures (
+  id,
+  value,
+  date,
+  sensor_id,
+  creation_date,
+  update_date
+)
+VALUES ($1, $2, $3, $4, $5, $6)
+ON CONFLICT (id)
+DO
+  UPDATE SET
+    value = EXCLUDED.value,
+    date = EXCLUDED.date,
+    sensor_id = EXCLUDED.sensor_id,
+    update_date = date('now');

pkg/repository/db/sqlite3/selectHumidity.sql

@@ -8,4 +8,4 @@ SELECT
 FROM
   humidities
 WHERE
-  humidity_id = $1
+  id = $1

pkg/repository/db/sqlite3/selectPressure.sql

@@ -8,4 +8,4 @@ SELECT
 FROM
   pressures
 WHERE
-  pressure_id = $1
+  id = $1

pkg/repository/db/sqlite3/selectTemperature.sql

@@ -8,4 +8,4 @@ SELECT
 FROM
   temperatures
 WHERE
-  temperature_id = $1
+  id = $1