Attachment 117689 Details for Bug 27855 – Bug 27855: (QA follow-up) Merge extended_attribute.json into patron.json

[patch] Bug 27855: (QA follow-up) Merge extended_attribute.json into patron.json

Bug-27855-QA-follow-up-Merge-extendedattributejson.patch (text/plain), 2.44 KB, created by Martin Renvoize (ashimema) on 2021-03-04 11:41:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-03-04 11:41:50 UTC

Size: 2.44 KB

patch

obsolete

>From 48fb4a3b0a7472ff3e3a86a14ce5d2c168f4ba8f Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>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 <martin.renvoize@ptfs-europe.com>
>---
> .../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

Actions: View | Diff | Splinter Review

Attachments on bug 27855: 117660 | 117661 | 117662 | 117663 | 117681 | 117682 | 117683 | 117684 | 117685 | 117686 | 117687 | 117688 | 117689 | 117690 | 117691 | 117692 | 117693 | 117694 | 117695