SH/PHP_SMART_HOME_V3
SH/PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Automation API #FIX

Browse Source
This commit is contained in:
Václav Španinger 2021-02-17 08:37:08 +01:00
parent 7ea4a90980
commit 8b32ecc619
2 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/api/AutomationsApi.php
View File

@ -7,15 +7,7 @@ class AutomationsApi extends ApiController
{ {
//$this->requireAuth(); //$this->requireAuth();
$response = []; $response = [];
$automationsData = AutomationManager::getAll(); $response = AutomationManager::getAll(["automation_id","name","enabled"]);
foreach ($automationsData as $automationKey => $automation) {
$response[] = [
"automation_id" => $automation['automation_id'],
"name" => $automation['name'],
"enabled" => $automation['enabled'],
];
}
$this->response($response); $this->response($response);
} }
@ -23,19 +15,9 @@ class AutomationsApi extends ApiController
public function detail($automationId) public function detail($automationId)
{ {
//$this->requireAuth(); //$this->requireAuth();
$response = [];
$response = null; $response = AutomationManager::getById($automationId, ["automation_id", "last_execution_time", "owner_id", "conditions", "tasks"]);
$automationData = AutomationManager::getById($automationId);
$response = [
'automation_id' => $automationData['automation_id'],
'last_execution_time' => $automationData['last_execution_time'],
'owner' => $automationData['owner_id'],
'conditions' => $automationData['conditions'],
'tasks' => $automationData['tasks'],
];
$this->response($response); $this->response($response);
} }
} }

15
app/models/managers/AutomationManager.php
View File

@ -8,9 +8,9 @@ class AutomationManager{
} }
public static function deactive($automationId) { public static function deactive($automationId) {
$automation = Db::loadOne ("SELECT * FROM automation WHERE automation_id=?" , array ($automationId)); $automation = self::getById($automationId,["enabled"]);
$flipedValue = ($automation['active'] == 1 ? 0 : 1); $flipedValue = ($automation['enabled'] == 1 ? 0 : 1);
return Db::command ('UPDATE automation SET active = ? WHERE automation_id=?', array ($flipedValue,$automationId)); return Db::command ('UPDATE automation SET enabled = ? WHERE automation_id=?', array ($flipedValue,$automationId));
} }
public static function restart($automationId) { public static function restart($automationId) {
@ -38,13 +38,12 @@ class AutomationManager{
} }
} }
public static function getAll(){ public static function getAll($collums = ['*']){
return Db::loadAll ("SELECT * FROM automation"); return Db::loadAll ("SELECT ". implode("," , $collums)." FROM automation");
} }
public static function getById($automationId){ public static function getById($automationId, $collums = ['*']){
return Db::loadOne("SELECT * FROM automation WHERE automation_id = ?", [$automationId]); return Db::loadOne("SELECT ". implode("," , $collums)." FROM automation WHERE automation_id = ?", [$automationId]);
} }