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 sync failing for users with no sensors.

Browse Source
This commit is contained in:
Jon Ziebell 2020-01-14 21:21:03 -05:00
parent 21a5b860ae
commit 2e982faba1
1 changed files with 104 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

206
api/runtime.php
View File

@ -511,115 +511,117 @@ class runtime extends cora\api {
* actually returned just in case the returned data goes outside of what I * actually returned just in case the returned data goes outside of what I
* requested for some reason. * requested for some reason.
*/ */
$ecobee_columns = $response['sensorList'][0]['columns']; if (count($response['sensorList']) > 0) {
$columns_begin = $this->get_columns( $ecobee_columns = $response['sensorList'][0]['columns'];
$response['sensorList'][0]['data'][0], $columns_begin = $this->get_columns(
$response['sensorList'][0]['columns'] $response['sensorList'][0]['data'][0],
); $response['sensorList'][0]['columns']
$columns_end = $this->get_columns( );
$response['sensorList'][0]['data'][count($response['sensorList'][0]['data']) - 1], $columns_end = $this->get_columns(
$ecobee_columns $response['sensorList'][0]['data'][count($response['sensorList'][0]['data']) - 1],
);
// Get a list of sensors
$sensors = $this->api(
'sensor',
'read',
[
'attributes' => [
'thermostat_id' => $thermostat['thermostat_id']
]
]
);
// Get a list of sensors indexed by code
$sensors_by_identifier = [];
foreach($sensors as $sensor) {
$sensors_by_identifier[$sensor['identifier']] = $sensor;
}
$existing_rows = $this->database->read(
'runtime_sensor',
[
'sensor_id' => array_column($sensors, 'sensor_id'),
'timestamp' => [
'value' => [
$this->get_utc_datetime(
date(
'Y-m-d H:i:s',
strtotime($columns_begin['date'] . ' ' . $columns_begin['time'] . ' -1 hour')
),
$thermostat['time_zone']
),
$this->get_utc_datetime(
date(
'Y-m-d H:i:s',
strtotime($columns_end['date'] . ' ' . $columns_end['time'] . ' +1 hour')
),
$thermostat['time_zone']
)
],
'operator' => 'between'
]
]
);
$existing_timestamps = [];
foreach($existing_rows as $existing_row) {
if (isset($existing_timestamps[$existing_row['sensor_id']]) === false) {
$existing_timestamps[$existing_row['sensor_id']] = [];
}
$existing_timestamps[$existing_row['sensor_id']][$existing_row['timestamp']] = $existing_row['runtime_sensor_id'];
}
// Loop over the ecobee data. Ecobee if you're reading this please don't
// format your identifiers like this in the future.
foreach ($response['sensorList'][0]['data'] as $row) {
$columns = $this->get_columns(
$row,
$ecobee_columns $ecobee_columns
); );
$datas = [];
foreach ($columns as $key => $value) { // Get a list of sensors
if ($key === 'date' || $key === 'time') { $sensors = $this->api(
continue; 'sensor',
} 'read',
[
'attributes' => [
'thermostat_id' => $thermostat['thermostat_id']
]
]
);
$sensor_identifier = substr($key, 0, strrpos($key, ':')); // Get a list of sensors indexed by code
$capability_identifier = substr($key, strrpos($key, ':') + 1); $sensors_by_identifier = [];
foreach($sensors as $sensor) {
$sensor = $sensors_by_identifier[$sensor_identifier]; $sensors_by_identifier[$sensor['identifier']] = $sensor;
$sensor_id = $sensors_by_identifier[$sensor_identifier]['sensor_id'];
if (isset($datas[$sensor['sensor_id']]) === false) {
$datas[$sensor['sensor_id']] = [
'sensor_id' => $sensor['sensor_id'],
'timestamp' => $this->get_utc_datetime(
$columns['date'] . ' ' . $columns['time'],
$thermostat['time_zone']
)
];
}
foreach($sensor['capability'] as $capability) {
if(
$capability['id'] == $capability_identifier &&
in_array($capability['type'], ['temperature', 'occupancy']) === true
) {
$datas[$sensor['sensor_id']][$capability['type']] = ($capability['type'] === 'temperature') ? ($value * 10) : $value;
}
}
} }
// Create or update the database $existing_rows = $this->database->read(
foreach ($datas as $data) { 'runtime_sensor',
if(isset($existing_timestamps[$data['sensor_id']][$data['timestamp']]) === true) { [
$data['runtime_sensor_id'] = $existing_timestamps[$data['sensor_id']][$data['timestamp']]; 'sensor_id' => array_column($sensors, 'sensor_id'),
$this->database->update('runtime_sensor', $data, 'id'); 'timestamp' => [
'value' => [
$this->get_utc_datetime(
date(
'Y-m-d H:i:s',
strtotime($columns_begin['date'] . ' ' . $columns_begin['time'] . ' -1 hour')
),
$thermostat['time_zone']
),
$this->get_utc_datetime(
date(
'Y-m-d H:i:s',
strtotime($columns_end['date'] . ' ' . $columns_end['time'] . ' +1 hour')
),
$thermostat['time_zone']
)
],
'operator' => 'between'
]
]
);
$existing_timestamps = [];
foreach($existing_rows as $existing_row) {
if (isset($existing_timestamps[$existing_row['sensor_id']]) === false) {
$existing_timestamps[$existing_row['sensor_id']] = [];
} }
else { $existing_timestamps[$existing_row['sensor_id']][$existing_row['timestamp']] = $existing_row['runtime_sensor_id'];
$existing_timestamps[$data['sensor_id']][$data['timestamp']] = $this->database->create('runtime_sensor', $data, 'id'); }
// Loop over the ecobee data. Ecobee if you're reading this please don't
// format your identifiers like this in the future.
foreach ($response['sensorList'][0]['data'] as $row) {
$columns = $this->get_columns(
$row,
$ecobee_columns
);
$datas = [];
foreach ($columns as $key => $value) {
if ($key === 'date' || $key === 'time') {
continue;
}
$sensor_identifier = substr($key, 0, strrpos($key, ':'));
$capability_identifier = substr($key, strrpos($key, ':') + 1);
$sensor = $sensors_by_identifier[$sensor_identifier];
$sensor_id = $sensors_by_identifier[$sensor_identifier]['sensor_id'];
if (isset($datas[$sensor['sensor_id']]) === false) {
$datas[$sensor['sensor_id']] = [
'sensor_id' => $sensor['sensor_id'],
'timestamp' => $this->get_utc_datetime(
$columns['date'] . ' ' . $columns['time'],
$thermostat['time_zone']
)
];
}
foreach($sensor['capability'] as $capability) {
if(
$capability['id'] == $capability_identifier &&
in_array($capability['type'], ['temperature', 'occupancy']) === true
) {
$datas[$sensor['sensor_id']][$capability['type']] = ($capability['type'] === 'temperature') ? ($value * 10) : $value;
}
}
}
// Create or update the database
foreach ($datas as $data) {
if(isset($existing_timestamps[$data['sensor_id']][$data['timestamp']]) === true) {
$data['runtime_sensor_id'] = $existing_timestamps[$data['sensor_id']][$data['timestamp']];
$this->database->update('runtime_sensor', $data, 'id');
}
else {
$existing_timestamps[$data['sensor_id']][$data['timestamp']] = $this->database->create('runtime_sensor', $data, 'id');
}
} }
} }
} }