Skip to content

Fixed issue with non-required fields in a model not being marked as such #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2020
Merged

Fixed issue with non-required fields in a model not being marked as such #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 26 additions & 19 deletions end_to_end_tests/golden-record-custom/custom_e2e/models/a_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from ..models.an_enum import AnEnum
from ..models.different_enum import DifferentEnum
from ..types import UNSET, Unset


@attr.s(auto_attribs=True)
Expand All @@ -16,11 +17,11 @@ class AModel:
a_camel_date_time: Union[datetime.datetime, datetime.date]
a_date: datetime.date
required_not_nullable: str
nested_list_of_enums: List[List[DifferentEnum]]
attr_1_leading_digit: str
required_nullable: Optional[str]
not_required_nullable: Optional[str]
not_required_not_nullable: str
nested_list_of_enums: Union[Unset, List[List[DifferentEnum]]] = UNSET
attr_1_leading_digit: Union[Unset, str] = UNSET
not_required_nullable: Union[Unset, Optional[str]] = UNSET
not_required_not_nullable: Union[Unset, str] = UNSET

def to_dict(self) -> Dict[str, Any]:
an_enum_value = self.an_enum_value.value
Expand All @@ -34,15 +35,17 @@ def to_dict(self) -> Dict[str, Any]:
a_date = self.a_date.isoformat()

required_not_nullable = self.required_not_nullable
nested_list_of_enums = []
for nested_list_of_enums_item_data in self.nested_list_of_enums:
nested_list_of_enums_item = []
for nested_list_of_enums_item_item_data in nested_list_of_enums_item_data:
nested_list_of_enums_item_item = nested_list_of_enums_item_item_data.value
nested_list_of_enums: Union[Unset, List[Any]] = UNSET
if not isinstance(self.nested_list_of_enums, Unset):
nested_list_of_enums = []
for nested_list_of_enums_item_data in self.nested_list_of_enums:
nested_list_of_enums_item = []
for nested_list_of_enums_item_item_data in nested_list_of_enums_item_data:
nested_list_of_enums_item_item = nested_list_of_enums_item_item_data.value

nested_list_of_enums_item.append(nested_list_of_enums_item_item)
nested_list_of_enums_item.append(nested_list_of_enums_item_item)

nested_list_of_enums.append(nested_list_of_enums_item)
nested_list_of_enums.append(nested_list_of_enums_item)

attr_1_leading_digit = self.attr_1_leading_digit
required_nullable = self.required_nullable
Expand All @@ -54,12 +57,16 @@ def to_dict(self) -> Dict[str, Any]:
"aCamelDateTime": a_camel_date_time,
"a_date": a_date,
"required_not_nullable": required_not_nullable,
"nested_list_of_enums": nested_list_of_enums,
"1_leading_digit": attr_1_leading_digit,
"required_nullable": required_nullable,
"not_required_nullable": not_required_nullable,
"not_required_not_nullable": not_required_not_nullable,
}
if nested_list_of_enums is not UNSET:
field_dict["nested_list_of_enums"] = nested_list_of_enums
if attr_1_leading_digit is not UNSET:
field_dict["1_leading_digit"] = attr_1_leading_digit
if not_required_nullable is not UNSET:
field_dict["not_required_nullable"] = not_required_nullable
if not_required_not_nullable is not UNSET:
field_dict["not_required_not_nullable"] = not_required_not_nullable

return field_dict

Expand All @@ -86,7 +93,7 @@ def _parse_a_camel_date_time(data: Dict[str, Any]) -> Union[datetime.datetime, d
required_not_nullable = d["required_not_nullable"]

nested_list_of_enums = []
for nested_list_of_enums_item_data in d["nested_list_of_enums"]:
for nested_list_of_enums_item_data in d.get("nested_list_of_enums", UNSET) or []:
nested_list_of_enums_item = []
for nested_list_of_enums_item_item_data in nested_list_of_enums_item_data:
nested_list_of_enums_item_item = DifferentEnum(nested_list_of_enums_item_item_data)
Expand All @@ -95,13 +102,13 @@ def _parse_a_camel_date_time(data: Dict[str, Any]) -> Union[datetime.datetime, d

nested_list_of_enums.append(nested_list_of_enums_item)

attr_1_leading_digit = d["1_leading_digit"]
attr_1_leading_digit = d.get("1_leading_digit", UNSET)

required_nullable = d["required_nullable"]

not_required_nullable = d["not_required_nullable"]
not_required_nullable = d.get("not_required_nullable", UNSET)

not_required_not_nullable = d["not_required_not_nullable"]
not_required_not_nullable = d.get("not_required_not_nullable", UNSET)

return AModel(
an_enum_value=an_enum_value,
Expand Down
23 changes: 13 additions & 10 deletions end_to_end_tests/golden-record-custom/custom_e2e/models/http_validation_error.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,36 @@
from typing import Any, Dict, List
from typing import Any, Dict, List, Union

import attr

from ..models.validation_error import ValidationError
from ..types import UNSET, Unset


@attr.s(auto_attribs=True)
class HTTPValidationError:
""" """

detail: List[ValidationError]
detail: Union[Unset, List[ValidationError]] = UNSET

def to_dict(self) -> Dict[str, Any]:
detail = []
for detail_item_data in self.detail:
detail_item = detail_item_data.to_dict()
detail: Union[Unset, List[Any]] = UNSET
if not isinstance(self.detail, Unset):
detail = []
for detail_item_data in self.detail:
detail_item = detail_item_data.to_dict()

detail.append(detail_item)
detail.append(detail_item)

field_dict = {
"detail": detail,
}
field_dict = {}
if detail is not UNSET:
field_dict["detail"] = detail

return field_dict

@staticmethod
def from_dict(d: Dict[str, Any]) -> "HTTPValidationError":
detail = []
for detail_item_data in d["detail"]:
for detail_item_data in d.get("detail", UNSET) or []:
detail_item = ValidationError.from_dict(detail_item_data)

detail.append(detail_item)
Expand Down
14 changes: 8 additions & 6 deletions end_to_end_tests/golden-record-custom/custom_e2e/models/test_inline_objectsjson_body.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
from typing import Any, Dict
from typing import Any, Dict, Union

import attr

from ..types import UNSET, Unset


@attr.s(auto_attribs=True)
class TestInlineObjectsjsonBody:
""" """

a_property: str
a_property: Union[Unset, str] = UNSET

def to_dict(self) -> Dict[str, Any]:
a_property = self.a_property

field_dict = {
"a_property": a_property,
}
field_dict = {}
if a_property is not UNSET:
field_dict["a_property"] = a_property

return field_dict

@staticmethod
def from_dict(d: Dict[str, Any]) -> "TestInlineObjectsjsonBody":
a_property = d["a_property"]
a_property = d.get("a_property", UNSET)

return TestInlineObjectsjsonBody(
a_property=a_property,
Expand Down
14 changes: 8 additions & 6 deletions end_to_end_tests/golden-record-custom/custom_e2e/models/test_inline_objectsresponse_200.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
from typing import Any, Dict
from typing import Any, Dict, Union

import attr

from ..types import UNSET, Unset


@attr.s(auto_attribs=True)
class TestInlineObjectsresponse_200:
""" """

a_property: str
a_property: Union[Unset, str] = UNSET

def to_dict(self) -> Dict[str, Any]:
a_property = self.a_property

field_dict = {
"a_property": a_property,
}
field_dict = {}
if a_property is not UNSET:
field_dict["a_property"] = a_property

return field_dict

@staticmethod
def from_dict(d: Dict[str, Any]) -> "TestInlineObjectsresponse_200":
a_property = d["a_property"]
a_property = d.get("a_property", UNSET)

return TestInlineObjectsresponse_200(
a_property=a_property,
Expand Down
45 changes: 26 additions & 19 deletions end_to_end_tests/golden-record/my_test_api_client/models/a_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from ..models.an_enum import AnEnum
from ..models.different_enum import DifferentEnum
from ..types import UNSET, Unset


@attr.s(auto_attribs=True)
Expand All @@ -16,11 +17,11 @@ class AModel:
a_camel_date_time: Union[datetime.datetime, datetime.date]
a_date: datetime.date
required_not_nullable: str
nested_list_of_enums: List[List[DifferentEnum]]
attr_1_leading_digit: str
required_nullable: Optional[str]
not_required_nullable: Optional[str]
not_required_not_nullable: str
nested_list_of_enums: Union[Unset, List[List[DifferentEnum]]] = UNSET
attr_1_leading_digit: Union[Unset, str] = UNSET
not_required_nullable: Union[Unset, Optional[str]] = UNSET
not_required_not_nullable: Union[Unset, str] = UNSET

def to_dict(self) -> Dict[str, Any]:
an_enum_value = self.an_enum_value.value
Expand All @@ -34,15 +35,17 @@ def to_dict(self) -> Dict[str, Any]:
a_date = self.a_date.isoformat()

required_not_nullable = self.required_not_nullable
nested_list_of_enums = []
for nested_list_of_enums_item_data in self.nested_list_of_enums:
nested_list_of_enums_item = []
for nested_list_of_enums_item_item_data in nested_list_of_enums_item_data:
nested_list_of_enums_item_item = nested_list_of_enums_item_item_data.value
nested_list_of_enums: Union[Unset, List[Any]] = UNSET
if not isinstance(self.nested_list_of_enums, Unset):
nested_list_of_enums = []
for nested_list_of_enums_item_data in self.nested_list_of_enums:
nested_list_of_enums_item = []
for nested_list_of_enums_item_item_data in nested_list_of_enums_item_data:
nested_list_of_enums_item_item = nested_list_of_enums_item_item_data.value

nested_list_of_enums_item.append(nested_list_of_enums_item_item)
nested_list_of_enums_item.append(nested_list_of_enums_item_item)

nested_list_of_enums.append(nested_list_of_enums_item)
nested_list_of_enums.append(nested_list_of_enums_item)

attr_1_leading_digit = self.attr_1_leading_digit
required_nullable = self.required_nullable
Expand All @@ -54,12 +57,16 @@ def to_dict(self) -> Dict[str, Any]:
"aCamelDateTime": a_camel_date_time,
"a_date": a_date,
"required_not_nullable": required_not_nullable,
"nested_list_of_enums": nested_list_of_enums,
"1_leading_digit": attr_1_leading_digit,
"required_nullable": required_nullable,
"not_required_nullable": not_required_nullable,
"not_required_not_nullable": not_required_not_nullable,
}
if nested_list_of_enums is not UNSET:
field_dict["nested_list_of_enums"] = nested_list_of_enums
if attr_1_leading_digit is not UNSET:
field_dict["1_leading_digit"] = attr_1_leading_digit
if not_required_nullable is not UNSET:
field_dict["not_required_nullable"] = not_required_nullable
if not_required_not_nullable is not UNSET:
field_dict["not_required_not_nullable"] = not_required_not_nullable

return field_dict

Expand All @@ -86,7 +93,7 @@ def _parse_a_camel_date_time(data: Dict[str, Any]) -> Union[datetime.datetime, d
required_not_nullable = d["required_not_nullable"]

nested_list_of_enums = []
for nested_list_of_enums_item_data in d["nested_list_of_enums"]:
for nested_list_of_enums_item_data in d.get("nested_list_of_enums", UNSET) or []:
nested_list_of_enums_item = []
for nested_list_of_enums_item_item_data in nested_list_of_enums_item_data:
nested_list_of_enums_item_item = DifferentEnum(nested_list_of_enums_item_item_data)
Expand All @@ -95,13 +102,13 @@ def _parse_a_camel_date_time(data: Dict[str, Any]) -> Union[datetime.datetime, d

nested_list_of_enums.append(nested_list_of_enums_item)

attr_1_leading_digit = d["1_leading_digit"]
attr_1_leading_digit = d.get("1_leading_digit", UNSET)

required_nullable = d["required_nullable"]

not_required_nullable = d["not_required_nullable"]
not_required_nullable = d.get("not_required_nullable", UNSET)

not_required_not_nullable = d["not_required_not_nullable"]
not_required_not_nullable = d.get("not_required_not_nullable", UNSET)

return AModel(
an_enum_value=an_enum_value,
Expand Down
23 changes: 13 additions & 10 deletions end_to_end_tests/golden-record/my_test_api_client/models/http_validation_error.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,36 @@
from typing import Any, Dict, List
from typing import Any, Dict, List, Union

import attr

from ..models.validation_error import ValidationError
from ..types import UNSET, Unset


@attr.s(auto_attribs=True)
class HTTPValidationError:
""" """

detail: List[ValidationError]
detail: Union[Unset, List[ValidationError]] = UNSET

def to_dict(self) -> Dict[str, Any]:
detail = []
for detail_item_data in self.detail:
detail_item = detail_item_data.to_dict()
detail: Union[Unset, List[Any]] = UNSET
if not isinstance(self.detail, Unset):
detail = []
for detail_item_data in self.detail:
detail_item = detail_item_data.to_dict()

detail.append(detail_item)
detail.append(detail_item)

field_dict = {
"detail": detail,
}
field_dict = {}
if detail is not UNSET:
field_dict["detail"] = detail

return field_dict

@staticmethod
def from_dict(d: Dict[str, Any]) -> "HTTPValidationError":
detail = []
for detail_item_data in d["detail"]:
for detail_item_data in d.get("detail", UNSET) or []:
detail_item = ValidationError.from_dict(detail_item_data)

detail.append(detail_item)
Expand Down
14 changes: 8 additions & 6 deletions end_to_end_tests/golden-record/my_test_api_client/models/test_inline_objectsjson_body.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
from typing import Any, Dict
from typing import Any, Dict, Union

import attr

from ..types import UNSET, Unset


@attr.s(auto_attribs=True)
class TestInlineObjectsjsonBody:
""" """

a_property: str
a_property: Union[Unset, str] = UNSET

def to_dict(self) -> Dict[str, Any]:
a_property = self.a_property

field_dict = {
"a_property": a_property,
}
field_dict = {}
if a_property is not UNSET:
field_dict["a_property"] = a_property

return field_dict

@staticmethod
def from_dict(d: Dict[str, Any]) -> "TestInlineObjectsjsonBody":
a_property = d["a_property"]
a_property = d.get("a_property", UNSET)

return TestInlineObjectsjsonBody(
a_property=a_property,
Expand Down
Loading