Merge branch 'master' of https://github.com/appwrite/sdk-generator into fix-deno-overall-improvements

Author: TorstenDittmann

templates/python/package/services/service.py.twig

@@ -1,32 +1,45 @@
 from ..service import Service
-
+from ..exception import AppwriteException
 
 class {{ service.name | caseUcfirst }}(Service):
 
     def __init__(self, client):
         super({{ service.name | caseUcfirst }}, self).__init__(client)
 {% for method in service.methods %}
 
-    def {{ method.name | caseSnake }}(self{% if method.parameters.all|length > 0 %}, {% endif %}{% for parameter in method.parameters.all %}{{ parameter.name | escapeKeyword | caseSnake }}{{ parameter | paramDefault }}{% if not loop.last %}, {% endif %}{% endfor %}):
+    def {{ method.name | caseSnake }}(self{% if method.parameters.all|length > 0 %}, {% endif %}{% for parameter in method.parameters.all %}{{ parameter.name | escapeKeyword | caseSnake }}{% if not parameter.required %} = None{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}):
 {% if method.title %}
         """{{ method.title }}"""
 
 {% endif %}
+{% for parameter in method.parameters.all %}
+{% if parameter.required %}
+        if {{ parameter.name | escapeKeyword | caseSnake }} is None: 
+            raise {{spec.title | caseUcfirst}}Exception('Missing required parameter: "{{ parameter.name | caseSnake }}"')
+
+{% endif %}
+{% endfor %}
         params = {}
         path = '{{ method.path }}'
 {% for parameter in method.parameters.path %}
         path = path.replace('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}', {{ parameter.name | escapeKeyword | caseSnake }})                
 {% endfor %}
+
 {% for parameter in method.parameters.query %}
-        params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }}
+        if {{ parameter.name | escapeKeyword | caseSnake }} is not None: 
+            params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }}
+
 {% endfor %}
 {% for parameter in method.parameters.body %}
-        params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }}
+        if {{ parameter.name | escapeKeyword | caseSnake }} is not None: 
+            params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }}
+
 {% endfor %}
 {% for parameter in method.parameters.formData %}
-        params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }}
-{% endfor %}
+        if {{ parameter.name | escapeKeyword | caseSnake }} is not None: 
+            params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }}
 
+{% endfor %}
         return self.client.call('{{ method.method | caseLower }}', path, {
 {% for parameter in method.parameters.header %}
             '{{ parameter.name }}': {{ parameter.name | escapeKeyword | caseSnake }},

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

@@ -2,23 +2,34 @@ module {{spec.title | caseUcfirst}}
     class {{ service.name | caseUcfirst }} < Service
 
 {% for method in service.methods %}
-        def {{ method.name | caseSnake }}({% for parameter in method.parameters.all %}{{ parameter.name | caseSnake }}{{ parameter | paramDefault }}{% if not loop.last %}, {% endif %}{% endfor %})
+        def {{ method.name | caseSnake }}({% for parameter in method.parameters.all %}{{ parameter.name | caseSnake }}:{% if not parameter.required %} nil{% endif %}{% if not loop.last %}, {% endif %}{% endfor %})
+{% for parameter in method.parameters.all %}
+{% if parameter.required %}
+            if {{ parameter.name | caseSnake }}.nil?
+                raise {{spec.title | caseUcfirst}}::Exception.new('Missing required parameter: "{{ parameter.name | caseCamel }}"')
+            end
+
+{% endif %}
+{% endfor %}
             path = '{{ method.path }}'
 {% for parameter in method.parameters.path %}
                 .gsub('{{ '{' }}{{ parameter.name }}{{ '}' }}', {{ parameter.name | caseSnake }})
 {% endfor %}
 
-            params = {
+            params = {}
+
 {% for parameter in method.parameters.query %}
-                '{{ parameter.name }}': {{ parameter.name | caseSnake }}{% if not loop.last %}, {% endif %}
+            if !{{ parameter.name | caseSnake }}.nil?
+                params[:{{ parameter.name }}] = {{ parameter.name | caseSnake }}
+            end
 
 {% endfor %}
 {% for parameter in method.parameters.body %}
-                '{{ parameter.name }}': {{ parameter.name | caseSnake }}{% if not loop.last %}, {% endif %}
+            if !{{ parameter.name | caseSnake }}.nil?
+                params[:{{ parameter.name }}] = {{ parameter.name | caseSnake }}
+            end
 
 {% endfor %}
-            }
-
             return @client.call('{{ method.method | caseLower }}', path, {
 {% for parameter in method.parameters.header %}
                 '{{ parameter.name }}' => ${{ parameter.name | caseCamel }},