mirror of
https://github.com/grocy/grocy.git
synced 2025-04-30 10:05:45 +00:00
Merge pull request #289 from Aerex/add-resolved-recipes-endpoint
Add requirement fulfillment recipes endpoint
This commit is contained in:
commit
ddef58e2a9
@ -40,4 +40,24 @@ class RecipesApiController extends BaseApiController
|
|||||||
return $this->GenericErrorResponse($response, $ex->getMessage());
|
return $this->GenericErrorResponse($response, $ex->getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function GetRecipeRequirements(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
if(!$args['recipeId']){
|
||||||
|
return $this->ApiResponse($this->RecipesService->GetRecipesResolved());
|
||||||
|
}
|
||||||
|
$recipeResolved = FindObjectInArrayByPropertyValue($this->RecipesService->GetRecipesResolved(), 'recipe_id', $args['recipeId']);
|
||||||
|
if(!$recipeResolved) {
|
||||||
|
$errorMsg ='Recipe requirments do not exist for recipe_id ' . $args['recipe_id'];
|
||||||
|
$GenericError = $this->GenericErrorResponse($response, $errorMsg);
|
||||||
|
return $GenericError;
|
||||||
|
}
|
||||||
|
return $this->ApiResponse($recipeResolved);
|
||||||
|
}
|
||||||
|
catch (\Exception $ex)
|
||||||
|
{
|
||||||
|
return $this->GenericErrorResponse($response, $ex->getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1686,6 +1686,84 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"/recipes/{recipeId}/requirements": {
|
||||||
|
"get": {
|
||||||
|
"summary": "Get requirements for recipe",
|
||||||
|
"tags": [
|
||||||
|
"Recipes"
|
||||||
|
],
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"in": "path",
|
||||||
|
"name": "recipeId",
|
||||||
|
"required": true,
|
||||||
|
"description": "A valid recipe id",
|
||||||
|
"schema": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "A requirements recipe object",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/RecipeRequirements"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "The operation was not successful",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/GenericErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"/recipes/requirements": {
|
||||||
|
"get": {
|
||||||
|
"summary": "Get all requirements for recipes",
|
||||||
|
"tags": [
|
||||||
|
"Recipes"
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "An array of requirements recipe objects",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"oneOf": [
|
||||||
|
{
|
||||||
|
"$ref": "#/components/schemas/RecipeRequirements"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"400": {
|
||||||
|
"description": "The operation was not successful",
|
||||||
|
"content": {
|
||||||
|
"application/json": {
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/components/schemas/GenericErrorResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"/chores": {
|
"/chores": {
|
||||||
"get": {
|
"get": {
|
||||||
@ -2374,6 +2452,34 @@
|
|||||||
"row_created_timestamp": "2019-05-03 18:24:04",
|
"row_created_timestamp": "2019-05-03 18:24:04",
|
||||||
"location_id": "4"
|
"location_id": "4"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"RecipeRequirements": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"recipe_id": {
|
||||||
|
"type": "integer"
|
||||||
|
},
|
||||||
|
"need_fulfilled": {
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"need_fulfilled_with_shopping_list": {
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"missing_products_count": {
|
||||||
|
"type": "integer"
|
||||||
|
},
|
||||||
|
"costs": {
|
||||||
|
"type": "number",
|
||||||
|
"format": "double"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"example": {
|
||||||
|
"recipe_id": "1",
|
||||||
|
"need_fulfilled": "0",
|
||||||
|
"need_fulfilled_with_shopping_list": "0",
|
||||||
|
"missing_products_count": "2",
|
||||||
|
"costs": "17.74"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"ProductDetailsResponse": {
|
"ProductDetailsResponse": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
|
@ -173,6 +173,8 @@ $app->group('/api', function()
|
|||||||
if (GROCY_FEATURE_FLAG_RECIPES)
|
if (GROCY_FEATURE_FLAG_RECIPES)
|
||||||
{
|
{
|
||||||
$this->post('/recipes/{recipeId}/add-not-fulfilled-products-to-shoppinglist', '\Grocy\Controllers\RecipesApiController:AddNotFulfilledProductsToShoppingList');
|
$this->post('/recipes/{recipeId}/add-not-fulfilled-products-to-shoppinglist', '\Grocy\Controllers\RecipesApiController:AddNotFulfilledProductsToShoppingList');
|
||||||
|
$this->get('/recipes/{recipeId}/requirements', '\Grocy\Controllers\RecipesApiController:GetRecipeRequirements');
|
||||||
|
$this->get('/recipes/requirements', '\Grocy\Controllers\RecipesApiController:GetRecipeRequirements');
|
||||||
$this->post('/recipes/{recipeId}/consume', '\Grocy\Controllers\RecipesApiController:ConsumeRecipe');
|
$this->post('/recipes/{recipeId}/consume', '\Grocy\Controllers\RecipesApiController:ConsumeRecipe');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user