fixed openapi schema change

Author: eadwinCode

tests/test_openapi/test_builder.py

@@ -234,7 +234,11 @@ def test_builder_build_document_has_correct_schema():
                     "parameters": [
                         {
                             "required": True,
-                            "schema_": {"title": "Cat Id", "type": "integer"},
+                            "schema_": {
+                                "title": "Cat Id",
+                                "type": "integer",
+                                "include_in_schema": True,
+                            },
                             "name": "cat_id",
                             "in_": "path",
                         }

tests/test_openapi/test_open_api_route_documentation.py

@@ -120,19 +120,29 @@ def test_open_api_route_get_openapi_operation_parameters_works_for_empty_model_n
             "name": "car_id",
             "in": "path",
             "required": True,
-            "schema": {"title": "Car Id", "type": "integer"},
+            "schema": {"title": "Car Id", "include_in_schema": True, "type": "integer"},
         },
         {
             "name": "to",
             "in": "query",
             "required": False,
-            "schema": {"title": "To", "type": "string", "format": "date-time"},
+            "schema": {
+                "title": "To",
+                "include_in_schema": True,
+                "type": "string",
+                "format": "date-time",
+            },
         },
         {
             "name": "from",
             "in": "query",
             "required": False,
-            "schema": {"title": "From", "type": "string", "format": "date-time"},
+            "schema": {
+                "title": "From",
+                "include_in_schema": True,
+                "type": "string",
+                "format": "date-time",
+            },
         },
     ]
 
@@ -161,12 +171,16 @@ def test_open_api_route_get_openapi_operation_request_body():
         model_name_map=model_name_map
     )
     assert result == {
-        "required": True,
         "content": {
             "application/json": {
-                "schema": {"$ref": "#/components/schemas/CreateCarSchema"}
+                "schema": {
+                    "allOf": [{"$ref": "#/components/schemas/CreateCarSchema"}],
+                    "include_in_schema": True,
+                    "title": "Car",
+                }
             }
         },
+        "required": True,
     }
 
 
@@ -190,7 +204,11 @@ def test_open_api_route_get_child_openapi_path():
                 "required": True,
                 "content": {
                     "application/json": {
-                        "schema": {"$ref": "#/components/schemas/CreateCarSchema"}
+                        "schema": {
+                            "title": "Car",
+                            "include_in_schema": True,
+                            "allOf": [{"$ref": "#/components/schemas/CreateCarSchema"}],
+                        }
                     }
                 },
             },
@@ -245,7 +263,13 @@ def test_open_api_route_get_openapi_path():
                     "required": True,
                     "content": {
                         "application/json": {
-                            "schema": {"$ref": "#/components/schemas/CreateCarSchema"}
+                            "schema": {
+                                "title": "Car",
+                                "include_in_schema": True,
+                                "allOf": [
+                                    {"$ref": "#/components/schemas/CreateCarSchema"}
+                                ],
+                            }
                         }
                     },
                 },
@@ -295,7 +319,13 @@ def test_open_api_route_get_openapi_path():
                     "required": True,
                     "content": {
                         "application/json": {
-                            "schema": {"$ref": "#/components/schemas/CreateCarSchema"}
+                            "schema": {
+                                "title": "Car",
+                                "include_in_schema": True,
+                                "allOf": [
+                                    {"$ref": "#/components/schemas/CreateCarSchema"}
+                                ],
+                            }
                         }
                     },
                 },
@@ -365,7 +395,13 @@ def test_open_api_route_get_openapi_path_with_security():
                     "required": True,
                     "content": {
                         "application/json": {
-                            "schema": {"$ref": "#/components/schemas/CreateCarSchema"}
+                            "schema": {
+                                "title": "Car",
+                                "include_in_schema": True,
+                                "allOf": [
+                                    {"$ref": "#/components/schemas/CreateCarSchema"}
+                                ],
+                            }
                         }
                     },
                 },
@@ -412,13 +448,17 @@ def test_open_api_route__get_openapi_path_object_works_for_routes_with_multiple_
     result = openapi_route_doc._get_openapi_path_object(model_name_map=model_name_map)
     assert isinstance(result, tuple)
     assert result[0] == {
-        "post": {
+        "get": {
             "summary": None,
-            "operationId": "list_and_create_car_list_post",
+            "operationId": "list_and_create_car_list_get",
             "requestBody": {
                 "content": {
                     "application/json": {
-                        "schema": {"$ref": "#/components/schemas/CreateCarSchema"}
+                        "schema": {
+                            "title": "Car",
+                            "include_in_schema": True,
+                            "allOf": [{"$ref": "#/components/schemas/CreateCarSchema"}],
+                        }
                     }
                 }
             },
@@ -444,13 +484,17 @@ def test_open_api_route__get_openapi_path_object_works_for_routes_with_multiple_
                 },
             },
         },
-        "get": {
+        "post": {
             "summary": None,
-            "operationId": "list_and_create_car_list_get",
+            "operationId": "list_and_create_car_list_post",
             "requestBody": {
                 "content": {
                     "application/json": {
-                        "schema": {"$ref": "#/components/schemas/CreateCarSchema"}
+                        "schema": {
+                            "title": "Car",
+                            "include_in_schema": True,
+                            "allOf": [{"$ref": "#/components/schemas/CreateCarSchema"}],
+                        }
                     }
                 }
             },