Merge pull request #63 from tuwilof/fix_request_json_schema

Fix request json schema

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+### 3.2.5 - 2024-12-02
+
+* bug fixes
+  * fix request json schema definitions for OpenAPI 3
+
 ### 3.2.4 - 2024-08-08
 
 * bug fixes

lib/tomograph/openapi/openapi2.rb

@@ -12,6 +12,7 @@ def to_tomogram
         @tomogram ||= @documentation['paths'].each_with_object([]) do |action, result|
           action[1].keys.each do |method|
             next result if method == 'parameters'
+
             result.push(Tomograph::Tomogram::Action.new(
                           path: "#{@prefix}#{action[0]}",
                           method: method.upcase,

lib/tomograph/openapi/openapi3.rb

@@ -11,18 +11,48 @@ def initialize(prefix, openapi3_yaml_path)
       def to_tomogram
         @tomogram ||= @documentation['paths'].each_with_object([]) do |(path, action_definition), result|
           action_definition.keys.each do |method|
+            ajj = valuekey(action_definition[method]['requestBody'], 'content')
+            aj = valuekey(ajj, 'application/json')
+
             result.push(Tomograph::Tomogram::Action.new(
                           path: "#{@prefix}#{path}",
                           method: method.upcase,
                           content_type: action_definition[method]['requestBody'] && action_definition[method]['requestBody']['content'].keys[0] == 'application/json' ? action_definition[method]['requestBody']['content'].keys[0] : '',
-                          requests: [],
+                          requests: [schema_new(valuekey(aj, 'schema'), @documentation['definitions'])].compact,
                           responses: responses(action_definition[method]['responses']),
                           resource: ''
                         ))
           end
         end
       end
 
+      def valuekey(value, key)
+        value.nil? ? nil : value[key]
+      end
+
+      def schema_new(sche, defi)
+        return sche unless sche
+        if sche.keys.include?('$ref')
+          res = sche.merge('definitions' => { sche['$ref'][14..-1] => defi[sche['$ref'][14..-1]] })
+          if defi[sche['$ref'][14..-1]].to_s.include?('$ref')
+            keys = defi[sche['$ref'][14..-1]].to_s.split('"').find_all { |word| word.include?('definitions') }
+            keys.each do |key|
+              res['definitions'].merge!({ key[14..-1] => defi[key[14..-1]] })
+            end
+          end
+          res
+        elsif sche.to_s.include?('$ref')
+          res = sche.merge('definitions' => {})
+          keys = sche.to_s.split('"').find_all { |word| word.include?('definitions') }
+          keys.each do |key|
+            res['definitions'].merge!({ key[14..-1] => defi[key[14..-1]] })
+          end
+          res
+        else
+          sche
+        end
+      end
+
       def responses(responses_definitions)
         result = []
         responses_definitions.each do |(response_code, response)|

lib/tomograph/version.rb

@@ -1,3 +1,3 @@
 module Tomograph
-  VERSION = '3.2.4'.freeze
+  VERSION = '3.2.5'.freeze
 end