Merge pull request #20 from koxudaxi/fix_default

fix default

fastapi_code_generator/parser.py

@@ -214,19 +214,19 @@ def get_parameter_type(
             name=name,
             data_types=[type_map[type_]],
             required=parameter.get("required") or parameter.get("in") == "path",
-            default=schema.typed_default,
         )
         self.imports.extend(field.imports)
+        represented_default = repr(schema.default)
         if orig_name != name:
-            default = f"Query({'...' if field.required else field.default}, alias='{orig_name}')"
+            default = f"Query({'...' if field.required else represented_default}, alias='{orig_name}')"
             self.imports.append(Import(from_='fastapi', import_='Query'))
         else:
-            default = field.default
+            default = represented_default
         return Argument(
             name=field.name,
             type_hint=field.type_hint,
             default=default,  # type: ignore
-            default_value=field.default,
+            default_value=represented_default,  # type: ignore
             required=field.required,
         )
 

pyproject.toml

@@ -28,7 +28,7 @@ fastapi-codegen = "fastapi_code_generator.__main__:app"
 [tool.poetry.dependencies]
 python = "^3.8.0"
 typer = {extras = ["all"], version =  "^0.2.1"}
-datamodel-code-generator = "^0.5.9"
+datamodel-code-generator = "==0.5.10"
 stringcase = "^1.2.0"
 black = "19.10b0"
 isort = "^4.3.21"

tests/data/expected/openapi/body_and_parameters/main.py

@@ -14,7 +14,11 @@
 
 
 @app.get('/pets', response_model=List[Pet])
-def list_pets(limit: Optional[int] = 0) -> List[Pet]:
+def list_pets(
+    limit: Optional[int] = 0,
+    home_address: Optional[str] = Query('Unknown', alias='HomeAddress'),
+    kind: Optional[str] = 'dog',
+) -> List[Pet]:
     pass
 
 

tests/data/openapi/body_and_parameters.yaml

@@ -22,6 +22,18 @@ paths:
             default: 0
             type: integer
             format: int32
+        - name: HomeAddress
+          in: query
+          required: false
+          schema:
+            default: 'Unknown'
+            type: string
+        - name: kind
+          in: query
+          required: false
+          schema:
+            default: dog
+            type: string
       responses:
         '200':
           description: A paged array of pets