Upd: Remove data attribute extras from data attribute object and keep…

… it in listing Signed-off-by: George J Padayatti <[email protected]>
decentralised-dataexchange · Oct 23, 2023 · 3aab1fa · 3aab1fa
1 parent d3012b8
commit 3aab1fa
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/openapi/v2023.8.2/bundled.yaml b/openapi/v2023.8.2/bundled.yaml
@@ -1069,15 +1069,6 @@ paths:
                         format: ''
                         example: ''
                         description: Version of the data attribute
-                      agreements:
-                        type: array
-                        items:
-                          type: object
-                          properties:
-                            id:
-                              type: string
-                            purpose:
-                              type: string
                       agreementIds:
                         type: array
                         items:
@@ -1235,7 +1226,19 @@ paths:
                 properties:
                   dataAttributes:
                     items:
-                      $ref: '#/paths/~1config~1data-agreements~1data-attribute/post/responses/200/content/application~1json/schema/properties/dataAttribute'
+                      allOf:
+                        - $ref: '#/paths/~1config~1data-agreements~1data-attribute/post/responses/200/content/application~1json/schema/properties/dataAttribute'
+                        - type: object
+                          properties:
+                            dataAgreements:
+                              type: array
+                              items:
+                                type: object
+                                properties:
+                                  id:
+                                    type: string
+                                  purpose:
+                                    type: string
                     type: array
                   pagination:
                     $ref: '#/components/schemas/Pagination'

diff --git a/openapi/v2023.8.2/definitions/DataAttribute.yaml b/openapi/v2023.8.2/definitions/DataAttribute.yaml
@@ -18,9 +18,6 @@ properties:
     example: ""
     description: "Version of the data attribute"
 
-  agreements:
-    $ref: "./DataAttributeExtras.yaml"
-
   agreementIds:
     type: array
     items:

diff --git a/openapi/v2023.8.2/paths/configListDataAttribute.yaml b/openapi/v2023.8.2/paths/configListDataAttribute.yaml
@@ -14,7 +14,12 @@ responses:
           properties:
             dataAttributes:
               items:
-                $ref: ../definitions/DataAttribute.yaml
+                allOf:
+                  - $ref: ../definitions/DataAttribute.yaml
+                  - type: object
+                    properties:
+                      dataAgreements:
+                        $ref: ../definitions/DataAttributeExtras.yaml
               type: array
             pagination:
               $ref: "../definitions/Pagination.yaml"