From c99c7c3859abdb4ccb336c4b4ac18c55466a1852 Mon Sep 17 00:00:00 2001 From: fipwmaqzufheoxq92ebc <29818044+fipwmaqzufheoxq92ebc@users.noreply.github.com> Date: Tue, 1 Sep 2020 15:26:41 +0200 Subject: [PATCH] Use FilteredApiResponse for current Tasks --- controllers/TasksApiController.php | 2 +- services/TasksService.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/controllers/TasksApiController.php b/controllers/TasksApiController.php index 6d0d6f39..e57cf8f3 100644 --- a/controllers/TasksApiController.php +++ b/controllers/TasksApiController.php @@ -8,7 +8,7 @@ class TasksApiController extends BaseApiController { public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) { - return $this->ApiResponse($response, $this->getTasksService()->GetCurrent()); + return $this->FilteredApiResponse($response, $this->getTasksService()->GetCurrent(), $request->getQueryParams()); } public function MarkTaskAsCompleted(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) diff --git a/services/TasksService.php b/services/TasksService.php index 2a4f870f..bb95281b 100644 --- a/services/TasksService.php +++ b/services/TasksService.php @@ -4,10 +4,9 @@ namespace Grocy\Services; class TasksService extends BaseService { - public function GetCurrent() + public function GetCurrent(): \LessQL\Result { - $sql = 'SELECT * from tasks_current'; - return $this->getDatabaseService()->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_OBJ); + return $this->getDatabase()->tasks_current(); } public function MarkTaskAsCompleted($taskId, $doneTime)