Commit 0e4d82ed authored by Hugo Kreber's avatar Hugo Kreber
Browse files

fix schema pattern generation for restbed code

parent b82ae8ff

EtsiServerGen/patches/applyYamlPatch.sh

0 → 100755
+2 −0
Original line number Diff line number Diff line 
#!/bin/bash

cp ../arf005/API/worldstorage/worldstorageopenapi.yaml ../arf005/API/worldstorage/worldstorageopenapiPatched.yaml && patch -u ../arf005/API/worldstorage/worldstorageopenapiPatched.yaml -i patches/fixYAMLrestbedSchema.patch
 
 No newline at end of file

EtsiServerGen/patches/fixYAMLrestbedSchema.patch

0 → 100644
+36 −0
Original line number Diff line number Diff line 
--- arf005/API/worldstorage/worldstorageopenapi.yaml	2024-04-26 15:38:19.205331526 +0200

+++ arf005/API/worldstorage/worldstorageopenapiToPatch.yaml	2024-04-26 16:50:23.200217962 +0200

@@ -100,16 +100,8 @@

           required: true

           schema:

               type: array

-              uniqueItems: true

               items:

-                type: object

-                properties:

-                  uuid:

-                    type: string

-                    format: uuid

-                    example: "fa8bbe40-8052-11ec-a8a3-0242ac120002"

-                  mode:

-                    $ref: '../common/commonopenapi.yaml#/components/schemas/Mode_WorldStorage'

+                $ref: '#/components/schemas/relocalizationInformationParam'

 

         - in: query

           name: capabilities

@@ -650,6 +642,15 @@

     # Reusable schemas (data models)

     #-------------------------------

       schemas:

+        RelocalizationInformationParam:

+            properties:

+              uuid:

+                type: string

+                format: uuid

+                example: "fa8bbe40-8052-11ec-a8a3-0242ac120002"

+              mode:

+                $ref: '../common/commonopenapi.yaml#/components/schemas/Mode_WorldStorage'

+            

         RelocalizationInformation:

             description: An element representing all information needed in relation with a Trackable or a WorldAnchor.

             type: object

package.json

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
  "description": "ISG ARF World Storage Cpp Server",

  "main": "index.js",

  "scripts": {

    "generate": "cd EtsiServerGen && java -jar /usr/local/lib/node_modules/@openapitools/openapi-generator-cli/versions/6.6.0.jar generate -i ../arf005/API/worldstorage/worldstorageopenapi.yaml --skip-validate-spec  -g cpp-restbed-server -o . && cd patches  && ./applyPatches.sh",

    "generate": "cd EtsiServerGen && ./patches/applyYamlPatch.sh && java -jar /usr/local/lib/node_modules/@openapitools/openapi-generator-cli/versions/6.6.0.jar generate -i ../arf005/API/worldstorage/worldstorageopenapiPatched.yaml --skip-validate-spec  -g cpp-restbed-server -o . && cd patches  && ./applyPatches.sh && sudo rm ../../arf005/API/worldstorage/worldstorageopenapiPatched.yaml",

    "build": "cd EtsiServerGen && conan install . --build=missing -of build && cd build && cmake .. --preset conan-release && cmake --build . && sudo make install"

    

  },