feat: better error return types

fabiankachlock · Jul 12, 2024 · 2fb0ea4 · 2fb0ea4
1 parent 6dd8db0
commit 2fb0ea4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pkg/devices/energy_monitoring.go b/pkg/devices/energy_monitoring.go
@@ -49,7 +49,7 @@ func (t *TapoEnergyMonitoringPlug) GetDeviceInfo() (response.DeviceInfoPlug, err
 	if err != nil {
 		return response.DeviceInfoPlug{}, err
 	}
-	return data.Result, nil
+	return data.Result, data.GetError()
 }
 
 // On turns the device on.
@@ -97,7 +97,7 @@ func (t *TapoEnergyMonitoringPlug) GetDeviceUsage() (response.DeviceUsageEnergyM
 	if err != nil {
 		return response.DeviceUsageEnergyMonitor{}, err
 	}
-	return data.Result, nil
+	return data.Result, data.GetError()
 }
 
 // GetEnergyUsage returns the energy usage of the device.
@@ -111,7 +111,7 @@ func (t *TapoEnergyMonitoringPlug) GetEnergyUsage(params request.GetEnergyDataPa
 	if err != nil {
 		return response.EnergyUsage{}, err
 	}
-	return data.Result, nil
+	return data.Result, data.GetError()
 }
 
 // GetCurrentPower returns the current power usage of the device.
@@ -125,5 +125,5 @@ func (t *TapoEnergyMonitoringPlug) GetCurrentPower() (response.CurrentPower, err
 	if err != nil {
 		return response.CurrentPower{}, err
 	}
-	return data.Result, nil
+	return data.Result, data.GetError()
 }
diff --git a/pkg/devices/hub.go b/pkg/devices/hub.go
@@ -52,7 +52,7 @@ func (t *TapoHub) GetDeviceInfo() (response.DeviceInfoHub, error) {
 	if err != nil {
 		return response.DeviceInfoHub{}, err
 	}
-	return data.Result, nil
+	return data.Result, data.GetError()
 }
 
 func (t *TapoHub) GetChildDeviceList() (ChildDeviceList, error) {
@@ -89,7 +89,7 @@ func (t *TapoHub) GetChildDeviceComponentList() (response.ChildDeviceComponentLi
 	if err != nil {
 		return response.ChildDeviceComponentList{}, err
 	}
-	return data.Result, nil
+	return data.Result, data.GetError()
 }
 
 func getChild(by func(ChildDeviceWrapper) (bool, error), devices []ChildDeviceWrapper) (bool, ChildDeviceWrapper, error) {
@@ -194,7 +194,7 @@ func (t *TapoHub) GetSupportedAlarms() (response.AlarmsList, error) {
 	if err != nil {
 		return response.AlarmsList{}, err
 	}
-	return data.Result, nil
+	return data.Result, data.GetError()
 }
 
 func (t *TapoHub) PlayAlarm(alarmType string, volume request.AlarmVolume, duration int) error {