Cutlery/beestat
1
0
Fork 0
mirror of https://github.com/beestat/app.git synced 2025-05-31 20:26:32 -04:00
Code Actions Packages Releases Activity

Fixed an issue where sensors were not inactivating if none were found.

Browse Source
This commit is contained in:
Jon Ziebell 2023-08-25 08:05:36 -04:00
parent ef9b172ae6
commit ca8ff3d4b4
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/ecobee_sensor.php
View File

@ -218,8 +218,12 @@ class ecobee_sensor extends cora\crud {
] ]
] ]
); );
} else {
throw new cora\exception($e->getMessage(), $e->getCode(), $e->getReportable(), $e->getExtraInfo(), $e->getRollback()); /**
* At this point, $response will either be populated with results,
* or have an empty thermostatList attribute. The code can continue
* on as it will inactivate any thermostats that were not found.
*/
} }
} else { } else {
throw new cora\exception($e->getMessage(), $e->getCode(), $e->getReportable(), $e->getExtraInfo(), $e->getRollback()); throw new cora\exception($e->getMessage(), $e->getCode(), $e->getReportable(), $e->getExtraInfo(), $e->getRollback());
@ -357,14 +361,14 @@ class ecobee_sensor extends cora\crud {
} }
// Inactivate any sensors that were no longer returned. // Inactivate any sensors that were no longer returned.
$sensors = $this->api('sensor', 'read'); $sensors = $this->api('sensor', 'read', ['attributes' => ['inactive' => false]]);
$ecobee_sensor_ids_to_return = []; $ecobee_sensor_ids_to_return = [];
foreach($sensors as $sensor) { foreach($sensors as $sensor) {
if(in_array($sensor['sensor_id'], $sensor_ids_to_keep) === false) { if(in_array($sensor['sensor_id'], $sensor_ids_to_keep) === false) {
$this->update( $this->update(
[ [
'ecobee_sensor_id' => $sensor['ecobee_sensor_id'], 'ecobee_sensor_id' => $sensor['ecobee_sensor_id'],
'inactive' => 1 'inactive' => true
] ]
); );
@ -374,7 +378,7 @@ class ecobee_sensor extends cora\crud {
[ [
'attributes' => [ 'attributes' => [
'sensor_id' => $sensor['sensor_id'], 'sensor_id' => $sensor['sensor_id'],
'inactive' => 1 'inactive' => true
] ]
] ]
); );
@ -383,7 +387,11 @@ class ecobee_sensor extends cora\crud {
} }
} }
return $this->read_id(['ecobee_sensor_id' => $ecobee_sensor_ids_to_return]); if (count($ecobee_sensor_ids_to_return) === 0) {
return [];
} else {
return $this->read_id(['ecobee_sensor_id' => $ecobee_sensor_ids_to_return]);
}
} }
} }