fix bugs in ruby refactor

Author: everly-gif

templates/ruby/base/params.twig

@@ -1,22 +1,9 @@
-{% if method.parameters.all | length %}
-{% for parameter in method.parameters.all %}
-{% if parameter.required %}
-            if {% if parameter.isGlobal %}@{% endif %}{{ parameter.name | caseSnake | escapeKeyword }}.nil?
-                raise {{spec.title | caseUcfirst}}::Exception.new('Missing required parameter: "{{ parameter.name | caseCamel | escapeKeyword }}"')
-            end
-
-{% endif %}
-{% endfor %}
-{% for parameter in method.parameters.path %}
-                .gsub('{{ '{' }}{{ parameter.name }}{{ '}' }}', {% if parameter.isGlobal %}@{% endif %}{{ parameter.name | caseSnake | escapeKeyword }})
-{% endfor %}
-
             params = {
 {% for parameter in method.parameters.query | merge(method.parameters.body)  %}
                 {{ parameter.name }}: {% if parameter.isGlobal %}@{% endif %}{{ parameter.name | caseSnake | escapeKeyword }},
 {% endfor %}
             }
-
+            
             headers = {
 {% for parameter in method.parameters.header %}
                 "{{ parameter.name }}": {{ parameter.name | caseCamel | escapeKeyword }},
@@ -25,4 +12,16 @@
                 "{{ key }}": '{{ header }}',
 {% endfor %}
             }
+{% if method.parameters.all | length %}
+{% for parameter in method.parameters.all %}
+{% if parameter.required %}
+            if {% if parameter.isGlobal %}@{% endif %}{{ parameter.name | caseSnake | escapeKeyword }}.nil?
+                raise {{spec.title | caseUcfirst}}::Exception.new('Missing required parameter: "{{ parameter.name | caseCamel | escapeKeyword }}"')
+            end
+
+{% endif %}
+{% endfor %}
+{% for parameter in method.parameters.path %}
+                .gsub('{{ '{' }}{{ parameter.name }}{{ '}' }}', {% if parameter.isGlobal %}@{% endif %}{{ parameter.name | caseSnake | escapeKeyword }})
+{% endfor %}
 {% endif %}

templates/ruby/lib/container/services/service.rb.twig

@@ -27,13 +27,16 @@ module {{spec.title | caseUcfirst}}
         def {{ method.name | caseSnake }}({% for parameter in method.parameters.all | filter((param) => not param.isGlobal) %}{{ parameter.name | caseSnake | escapeKeyword }}:{% if not parameter.required %} nil{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in method.consumes %}, on_progress: nil{% endif %})
 
             path = '{{ method.path }}'
+
 {{ include('ruby/base/params.twig')}}
 {% if 'multipart/form-data' in method.consumes %}
 {{ include('ruby/base/requests/file.twig')}}
 {% else %}
 {{ include('ruby/base/requests/api.twig')}}
-        end
 {% endif %}
+        end
+
+        
 {% endfor %}
     end 
 end