Use FilteredApiResponse for current Tasks

This commit is contained in:
fipwmaqzufheoxq92ebc 2020-09-01 15:26:41 +02:00
parent 039126a6e9
commit c99c7c3859
No known key found for this signature in database
GPG Key ID: F4DF989490C2ADB7
2 changed files with 3 additions and 4 deletions

View File

@ -8,7 +8,7 @@ class TasksApiController extends BaseApiController
{ {
public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) 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) public function MarkTaskAsCompleted(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)

View File

@ -4,10 +4,9 @@ namespace Grocy\Services;
class TasksService extends BaseService class TasksService extends BaseService
{ {
public function GetCurrent() public function GetCurrent(): \LessQL\Result
{ {
$sql = 'SELECT * from tasks_current'; return $this->getDatabase()->tasks_current();
return $this->getDatabaseService()->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_OBJ);
} }
public function MarkTaskAsCompleted($taskId, $doneTime) public function MarkTaskAsCompleted($taskId, $doneTime)