From 8b32ecc619a9720612bf3710c3ae2feb825cda7c Mon Sep 17 00:00:00 2001
From: JonatanRek <vasek@steelants.cz>
Date: Wed, 17 Feb 2021 08:37:08 +0100
Subject: [PATCH] Automation API #FIX

---
 app/api/AutomationsApi.php                | 24 +++--------------------
 app/models/managers/AutomationManager.php | 15 +++++++-------
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/app/api/AutomationsApi.php b/app/api/AutomationsApi.php
index 4f72108..498d54e 100644
--- a/app/api/AutomationsApi.php
+++ b/app/api/AutomationsApi.php
@@ -7,15 +7,7 @@ class AutomationsApi extends ApiController
 	{
 		//$this->requireAuth();
 		$response = [];
-		$automationsData = AutomationManager::getAll();
-
-		foreach ($automationsData as $automationKey => $automation) {
-			$response[] = [
-				"automation_id" => $automation['automation_id'],
-				"name" => $automation['name'],
-				"enabled" => $automation['enabled'],
-			];
-		}
+		$response = AutomationManager::getAll(["automation_id","name","enabled"]);
 
 		$this->response($response);
 	}
@@ -23,19 +15,9 @@ class AutomationsApi extends ApiController
 	public function detail($automationId)
 	{
 		//$this->requireAuth();
-
-		$response = null;
-		$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'],
-		];
+		$response = [];
+		$response = AutomationManager::getById($automationId, ["automation_id", "last_execution_time", "owner_id", "conditions", "tasks"]);
 
 		$this->response($response);
 	}
-
 }
diff --git a/app/models/managers/AutomationManager.php b/app/models/managers/AutomationManager.php
index 2873c9d..b191032 100644
--- a/app/models/managers/AutomationManager.php
+++ b/app/models/managers/AutomationManager.php
@@ -8,9 +8,9 @@ class AutomationManager{
 	}
 
 	public static function deactive($automationId) {
-		$automation = Db::loadOne ("SELECT * FROM automation WHERE automation_id=?" , array ($automationId));
-		$flipedValue = ($automation['active'] == 1 ? 0 : 1);
-		return Db::command ('UPDATE automation SET active = ? WHERE automation_id=?', array ($flipedValue,$automationId));
+		$automation = self::getById($automationId,["enabled"]);
+		$flipedValue = ($automation['enabled'] == 1 ? 0 : 1);
+		return Db::command ('UPDATE automation SET enabled = ? WHERE automation_id=?', array ($flipedValue,$automationId));
 	}
 
 	public static function restart($automationId) {
@@ -38,13 +38,12 @@ class AutomationManager{
 		}
 	}
 
-	public static function getAll(){
-		return Db::loadAll ("SELECT * FROM automation");
-
+	public static function getAll($collums = ['*']){
+		return Db::loadAll ("SELECT ". implode("," , $collums)." FROM automation");
 	}
 
-	public static function getById($automationId){
-		return Db::loadOne("SELECT * FROM automation WHERE automation_id = ?", [$automationId]);
+	public static function getById($automationId, $collums = ['*']){
+		return Db::loadOne("SELECT ". implode("," , $collums)." FROM automation WHERE automation_id = ?", [$automationId]);
 
 	}