From 4690b1e5953cce6da1938509b03e01d22b9d0935 Mon Sep 17 00:00:00 2001 From: fipwmaqzufheoxq92ebc <29818044+fipwmaqzufheoxq92ebc@users.noreply.github.com> Date: Tue, 1 Sep 2020 14:01:40 +0200 Subject: [PATCH] Use FilteredApiResponse for Recipe-Fullfillment --- controllers/RecipesApiController.php | 2 +- services/RecipesService.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/controllers/RecipesApiController.php b/controllers/RecipesApiController.php index 1825f3a6..804e2791 100644 --- a/controllers/RecipesApiController.php +++ b/controllers/RecipesApiController.php @@ -44,7 +44,7 @@ class RecipesApiController extends BaseApiController { if (!isset($args['recipeId'])) { - return $this->ApiResponse($response, $this->getRecipesService()->GetRecipesResolved()); + return $this->FilteredApiResponse($response, $this->getRecipesService()->GetRecipesResolved(), $request->getQueryParams()); } $recipeResolved = FindObjectInArrayByPropertyValue($this->getRecipesService()->GetRecipesResolved(), 'recipe_id', $args['recipeId']); diff --git a/services/RecipesService.php b/services/RecipesService.php index 12f74cbf..3e188c2f 100644 --- a/services/RecipesService.php +++ b/services/RecipesService.php @@ -4,6 +4,8 @@ namespace Grocy\Services; #use \Grocy\Services\StockService; +use LessQL\Result; + class RecipesService extends BaseService { const RECIPE_TYPE_MEALPLAN_DAY = 'mealplan-day'; @@ -82,10 +84,9 @@ class RecipesService extends BaseService return $this->getDataBaseService()->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_OBJ); } - public function GetRecipesResolved() + public function GetRecipesResolved(): Result { - $sql = 'SELECT * FROM recipes_resolved'; - return $this->getDataBaseService()->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_OBJ); + return $this->getDatabase()->recipes_resolved(); } public function __construct()