From 880c8b37cf8ba88a7f4de40cf18dec49c9e71454 Mon Sep 17 00:00:00 2001
From: Ori Levari <ori.levari@microsoft.com>
Date: Fri, 26 Aug 2022 02:26:20 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20support=20for=20extending?=
 =?UTF-8?q?=20`openapi=5Fextras`=20with=20parameter=20lists=20(#4267)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sebastián Ramírez <tiangolo@gmail.com>
---
 fastapi/utils.py                              |   6 +
 .../test_openapi_query_parameter_extension.py | 127 ++++++++++++++++++
 2 files changed, 133 insertions(+)
 create mode 100644 tests/test_openapi_query_parameter_extension.py

diff --git a/fastapi/utils.py b/fastapi/utils.py
index 40750a5b35269..0163fd95fc62c 100644
--- a/fastapi/utils.py
+++ b/fastapi/utils.py
@@ -161,6 +161,12 @@ def deep_dict_update(main_dict: Dict[Any, Any], update_dict: Dict[Any, Any]) ->
             and isinstance(value, dict)
         ):
             deep_dict_update(main_dict[key], value)
+        elif (
+            key in main_dict
+            and isinstance(main_dict[key], list)
+            and isinstance(update_dict[key], list)
+        ):
+            main_dict[key] = main_dict[key] + update_dict[key]
         else:
             main_dict[key] = value
 
diff --git a/tests/test_openapi_query_parameter_extension.py b/tests/test_openapi_query_parameter_extension.py
new file mode 100644
index 0000000000000..d3996f26ee417
--- /dev/null
+++ b/tests/test_openapi_query_parameter_extension.py
@@ -0,0 +1,127 @@
+from typing import Optional
+
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+
+app = FastAPI()
+
+
+@app.get(
+    "/",
+    openapi_extra={
+        "parameters": [
+            {
+                "required": False,
+                "schema": {"title": "Extra Param 1"},
+                "name": "extra_param_1",
+                "in": "query",
+            },
+            {
+                "required": True,
+                "schema": {"title": "Extra Param 2"},
+                "name": "extra_param_2",
+                "in": "query",
+            },
+        ]
+    },
+)
+def route_with_extra_query_parameters(standard_query_param: Optional[int] = 50):
+    return {}
+
+
+client = TestClient(app)
+
+
+openapi_schema = {
+    "openapi": "3.0.2",
+    "info": {"title": "FastAPI", "version": "0.1.0"},
+    "paths": {
+        "/": {
+            "get": {
+                "summary": "Route With Extra Query Parameters",
+                "operationId": "route_with_extra_query_parameters__get",
+                "parameters": [
+                    {
+                        "required": False,
+                        "schema": {
+                            "title": "Standard Query Param",
+                            "type": "integer",
+                            "default": 50,
+                        },
+                        "name": "standard_query_param",
+                        "in": "query",
+                    },
+                    {
+                        "required": False,
+                        "schema": {"title": "Extra Param 1"},
+                        "name": "extra_param_1",
+                        "in": "query",
+                    },
+                    {
+                        "required": True,
+                        "schema": {"title": "Extra Param 2"},
+                        "name": "extra_param_2",
+                        "in": "query",
+                    },
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successful Response",
+                        "content": {"application/json": {"schema": {}}},
+                    },
+                    "422": {
+                        "description": "Validation Error",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/HTTPValidationError"
+                                }
+                            }
+                        },
+                    },
+                },
+            }
+        }
+    },
+    "components": {
+        "schemas": {
+            "HTTPValidationError": {
+                "title": "HTTPValidationError",
+                "type": "object",
+                "properties": {
+                    "detail": {
+                        "title": "Detail",
+                        "type": "array",
+                        "items": {"$ref": "#/components/schemas/ValidationError"},
+                    }
+                },
+            },
+            "ValidationError": {
+                "title": "ValidationError",
+                "required": ["loc", "msg", "type"],
+                "type": "object",
+                "properties": {
+                    "loc": {
+                        "title": "Location",
+                        "type": "array",
+                        "items": {"anyOf": [{"type": "string"}, {"type": "integer"}]},
+                    },
+                    "msg": {"title": "Message", "type": "string"},
+                    "type": {"title": "Error Type", "type": "string"},
+                },
+            },
+        }
+    },
+}
+
+
+def test_openapi():
+    response = client.get("/openapi.json")
+    assert response.status_code == 200, response.text
+    assert response.json() == openapi_schema
+
+
+def test_get_route():
+    response = client.get("/")
+    assert response.status_code == 200, response.text
+    assert response.json() == {}