Handling multiple locations in multiple @use_kwargs (#162)

* Handling multiple locations in multiple @use_kwargs

* Fix flake8 errors

Author: shrsubra

flask_apispec/apidoc.py

@@ -69,25 +69,26 @@ def get_parent(self, view):
     def get_parameters(self, rule, view, docs, parent=None):
         openapi = self.marshmallow_plugin.openapi
         annotation = resolve_annotations(view, 'args', parent)
-        args = merge_recursive(annotation.options)
-        schema = args.get('args', {})
-        if is_instance_or_subclass(schema, Schema):
-            converter = openapi.schema2parameters
-        elif callable(schema):
-            schema = schema(request=None)
+        extra_params = []
+        for args in annotation.options:
+            schema = args.get('args', {})
             if is_instance_or_subclass(schema, Schema):
                 converter = openapi.schema2parameters
+            elif callable(schema):
+                schema = schema(request=None)
+                if is_instance_or_subclass(schema, Schema):
+                    converter = openapi.schema2parameters
+                else:
+                    converter = openapi.fields2parameters
             else:
                 converter = openapi.fields2parameters
-        else:
-            converter = openapi.fields2parameters
-        options = copy.copy(args.get('kwargs', {}))
-        locations = options.pop('locations', None)
-        if locations:
-            options['default_in'] = locations[0]
+            options = copy.copy(args.get('kwargs', {}))
+            locations = options.pop('locations', None)
+            if locations:
+                options['default_in'] = locations[0]
+            extra_params += converter(schema, **options) if args else []
 
         rule_params = rule_to_params(rule, docs.get('params')) or []
-        extra_params = converter(schema, **options) if args else []
 
         return extra_params + rule_params
 

tests/test_openapi.py

@@ -197,3 +197,47 @@ def test_responses(self, schemas, path, openapi):
 
     def test_tags(self, path):
         assert path['get']['tags'] == ['band']
+
+
+class TestMultipleLocations:
+
+    @pytest.fixture
+    def function_view(self, app, models, schemas):
+        class QuerySchema(Schema):
+            name = fields.Str()
+
+        class BodySchema(Schema):
+            address = fields.Str()
+
+        @app.route('/bands/<int:band_id>/')
+        @use_kwargs(QuerySchema, locations=('query', ))
+        @use_kwargs(BodySchema, locations=('body', ))
+        def get_band(**kwargs):
+            return kwargs
+        return get_band
+
+    @pytest.fixture
+    def path(self, app, spec, function_view):
+        converter = ViewConverter(app=app, spec=spec)
+        paths = converter.convert(function_view)
+        for path in paths:
+            spec.path(**path)
+        return spec._paths['/bands/{band_id}/']
+
+    def test_params(self, app, path):
+        params = path['get']['parameters']
+        rule = app.url_map._rules_by_endpoint['get_band'][0]
+        expected = (
+            [{
+                'in': 'query',
+                'name': 'name',
+                'required': False,
+                'type': 'string'
+            }, {
+                'in': 'body',
+                'name': 'body',
+                'required': False,
+                'schema': {'$ref': '#/definitions/Body'}
+            }] + rule_to_params(rule)
+        )
+        assert params == expected