From 9b52168b94f9b5d1b39bf975a12aba64be7de97b Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sun, 14 Aug 2022 23:09:27 +0200 Subject: [PATCH] Fixed `/userfields/{entity}*` endpoints OpenAPI definition (fixes #1967) --- controllers/OpenApiController.php | 3 ++- grocy.openapi.json | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/controllers/OpenApiController.php b/controllers/OpenApiController.php index a39f6ee8..1e05f3cd 100644 --- a/controllers/OpenApiController.php +++ b/controllers/OpenApiController.php @@ -36,7 +36,7 @@ class OpenApiController extends BaseApiController $spec->info->description = str_replace('PlaceHolderManageApiKeysUrl', $this->AppContainer->get('UrlManager')->ConstructUrl('/manageapikeys'), $spec->info->description); $spec->servers[0]->url = $this->AppContainer->get('UrlManager')->ConstructUrl('/api'); - $spec->components->schemas->ExposedEntity_IncludingUserEntities = clone $spec->components->schemas->ExposedEntity; + $spec->components->schemas->ExposedEntity_IncludingUserEntities = clone $spec->components->schemas->StringEnumTemplate;; foreach ($this->getUserfieldsService()->GetEntities() as $userEntity) { array_push($spec->components->schemas->ExposedEntity_IncludingUserEntities->enum, $userEntity); @@ -61,6 +61,7 @@ class OpenApiController extends BaseApiController array_push($spec->components->schemas->ExposedEntity_IncludingUserEntities_NotIncludingNotEditable->enum, $value); } } + array_push($spec->components->schemas->ExposedEntity_IncludingUserEntities_NotIncludingNotEditable->enum, 'stock'); // TODO: Don't hardcode this here - stock entries are normally not editable, but the corresponding Userfields are sort($spec->components->schemas->ExposedEntity_IncludingUserEntities_NotIncludingNotEditable->enum); $spec->components->schemas->ExposedEntity_NotIncludingNotDeletable = clone $spec->components->schemas->StringEnumTemplate; diff --git a/grocy.openapi.json b/grocy.openapi.json index f5f5bf41..a9274a20 100644 --- a/grocy.openapi.json +++ b/grocy.openapi.json @@ -638,7 +638,7 @@ "required": true, "description": "A valid object id of the given entity", "schema": { - "type": "integer" + "type": "string" } } ], @@ -687,7 +687,7 @@ "required": true, "description": "A valid object id of the given entity", "schema": { - "type": "integer" + "type": "string" } } ],