OpenAPI: Fix dual responses and parameter definitions

Signed-off-by: Olle E. Johansson <[email protected]>

Author: oej

spec/openapi.json

@@ -60,7 +60,7 @@
                 "operationId": "listTeaProducts",
                 "parameters": [
                     {
-                        "$ref": "#/components/parameters/standard_pagination"
+                        "$ref": "#/components/stdparameters/standard_pagination"
                     }
                 ],
                 "responses": {
@@ -84,7 +84,7 @@
                 "operationId": "getTeaLeaf",
                 "parameters": [
                     {
-                        "$ref": "#/components/parameters/tea_leaf_identifier"
+                        "$ref": "#/components/stdparameters/tea_leaf_identifier"
                     }
                 ],
                 "responses": {
@@ -113,7 +113,7 @@
                 "operationId": "getTeaCollection",
                 "parameters": [
                     {
-                        "$ref": "#/components/parameters/tea_collection_identifier"
+                        "$ref": "#/components/stdparameters/tea_collection_identifier"
                     }
                 ],
                 "responses": {
@@ -140,27 +140,42 @@
     "webhooks": {},
     "components": {
         "schemas": {
+            "type_identifier" : {
+                "type": "object",
+                "description": "Declaration of an identifier",
+                "properties": {
+                    "idtype": {
+                        "description": "Identifier types",
+                        "enum": [
+                            "tei",
+                            "purl",
+                            "cpe"
+                        ],
+                        "default": "tei"
+                    },
+                    "idvalue": {
+                        "description": "Value of the identifier",
+                        "type": "string"
+                    }
+                }
+            },
             "base_product_fields": {
                 "type": "object",
                 "properties": {
                     "product_name": {
-                        "type": "string"
-                    },
-                    "barcode": {
-                        "type": "string",
-                        "description": "Barcode"
-                    },
-                    "sku": {
                         "type": "string",
-                        "description": "Product SKU"
+                        "description": "Product name in free text."
                     },
-                    "vendor_uuid": {
+                    "uuid": {
                         "$ref": "#/components/schemas/type_uuid",
-                        "description": "Vendor UUID"
+                        "description": "UUID"
                     },
-                    "purl": {
-                        "type": "string",
-                        "description": "Package URL (PURL)"
+                    "identifiers": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/components/schemas/type_identifier"
+                        },
+                        "description": "Array of identifiers for this product (tei, cpe, purl)"
                     }
                 }
             },
@@ -230,9 +245,6 @@
                     {
                         "type": "object",
                         "properties": {
-                            "identifier": {
-                                "$ref": "#/components/schemas/type_uuid"
-                            },
                             "leaf_references": {
                                 "type": "array",
                                 "items": {
@@ -591,6 +603,25 @@
                 "content": {
                     "application/json": {}
                 }
+            },
+            "standard_errors": {
+                "400": {
+                    "description": "Invalid request body",
+                    "content": {
+                        "application/json": {}
+                    }
+                },
+                "401": {
+                    "$ref": "#/components/responses/401-unauthorized"
+                },
+                "404": {
+                    "$ref": "#/components/responses/404-object-by-id-not-found"
+                }
+            },
+            "standard_delete": {
+                "204": {
+                    "description": "Resource successfully deleted"
+                }
             }
         },
         "parameters": {
@@ -718,37 +749,6 @@
                 }
             ]
         },
-        "responses": {
-            "standard_errors": {
-                "400": {
-                    "description": "Invalid request body",
-                    "content": {
-                        "application/json": {}
-                    }
-                },
-                "401": {
-                    "$ref": "#/components/responses/401-unauthorized"
-                },
-                "404": {
-                    "$ref": "#/components/responses/404-object-by-id-not-found"
-                }
-            },
-            "standard_delete": {
-                "204": {
-                    "description": "Resource successfully deleted"
-                }
-            }
-        },
-        "parameters": {
-            "standard_pagination": {
-                "page_offset": {
-                    "$ref": "#/components/parameters/page-offset"
-                },
-                "page_size": {
-                    "$ref": "#/components/parameters/page-size"
-                }
-            }
-        },
         "operations": {
             "standard_delete": {
                 "responses": {