From 76d24d91baf9d01240d191e93e1a9a6205017338 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 4 Mar 2021 11:38:43 +0000 Subject: [PATCH] Bug 27855: (QA follow-up) Merge extended_attribute.json into patron.json As the extended_attribute object is only ever returned inline with patrons,this patch merges the specification into the patron definition to clarify it usage. Signed-off-by: Martin Renvoize --- .../definitions/extended_attribute.json | 24 ------------------- api/v1/swagger/definitions/patron.json | 23 +++++++++++++++++- 2 files changed, 22 insertions(+), 25 deletions(-) delete mode 100644 api/v1/swagger/definitions/extended_attribute.json diff --git a/api/v1/swagger/definitions/extended_attribute.json b/api/v1/swagger/definitions/extended_attribute.json deleted file mode 100644 index c21ae1ee84..0000000000 --- a/api/v1/swagger/definitions/extended_attribute.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "object", - "properties": { - "extended_attribute_id": { - "description": "Internal ID for the extended attribute", - "type": "integer" - }, - "type": { - "description": "Extended attribute type", - "type": "string" - }, - "value": { - "description": "Extended attribute value", - "type": [ - "string" - ] - } - }, - "additionalProperties": false, - "required": [ - "type", - "value" - ] -} diff --git a/api/v1/swagger/definitions/patron.json b/api/v1/swagger/definitions/patron.json index 2b4c9ceea2..6f346e1e46 100644 --- a/api/v1/swagger/definitions/patron.json +++ b/api/v1/swagger/definitions/patron.json @@ -286,7 +286,28 @@ "type": "array", "description": "patron's extended attributes", "items": { - "$ref": "extended_attribute.json" + "type": "object", + "properties": { + "extended_attribute_id": { + "description": "Internal ID for the extended attribute", + "type": "integer" + }, + "type": { + "description": "Extended attribute type", + "type": "string" + }, + "value": { + "description": "Extended attribute value", + "type": [ + "string" + ] + } + }, + "additionalProperties": false, + "required": [ + "type", + "value" + ] } } }, -- 2.20.1