Skip to content

Commit 503a7a6

Browse files
dbantydbanty
committed
test: Fix errors found by E2E test
1 parent af8d0ea commit 503a7a6

18 files changed

+511
-204
lines changed

‎end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py

Lines changed: 68 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
from dateutil.parser import isoparse
66

77
from ...client import Client
8+
from ...models.an_enum import AnEnum
9+
from ...models.http_validation_error import HTTPValidationError
10+
from ...models.model_with_union_property import ModelWithUnionProperty
811
from ...types import UNSET, Response, Unset
912

1013

@@ -20,14 +23,14 @@ def _get_kwargs(
2023
float_prop: Union[Unset, float] = 3.14,
2124
int_prop: Union[Unset, int] = 7,
2225
boolean_prop: Union[Unset, bool] = False,
23-
list_prop: Union[Unset, List[None]] = UNSET,
26+
list_prop: Union[Unset, List[AnEnum]] = UNSET,
2427
union_prop: Union[Unset, float, str] = "not a float",
25-
union_prop_with_ref: Union[None, Unset, float] = 0.6,
26-
enum_prop: Union[Unset, None] = UNSET,
27-
model_prop: Union[Unset, None] = UNSET,
28-
required_model_prop: None,
29-
nullable_model_prop: Union[None, Unset] = UNSET,
30-
nullable_required_model_prop: None,
28+
union_prop_with_ref: Union[AnEnum, Unset, float] = 0.6,
29+
enum_prop: Union[Unset, AnEnum] = UNSET,
30+
model_prop: Union[Unset, ModelWithUnionProperty] = UNSET,
31+
required_model_prop: ModelWithUnionProperty,
32+
nullable_model_prop: Union[ModelWithUnionProperty, None, Unset] = UNSET,
33+
nullable_required_model_prop: Union[ModelWithUnionProperty, None],
3134
) -> Dict[str, Any]:
3235
url = "{}/tests/defaults".format(client.base_url)
3336

@@ -54,11 +57,11 @@ def _get_kwargs(
5457
if not isinstance(date_prop, Unset):
5558
json_date_prop = date_prop.isoformat()
5659

57-
json_list_prop: Union[Unset, List[None]] = UNSET
60+
json_list_prop: Union[Unset, List[str]] = UNSET
5861
if not isinstance(list_prop, Unset):
5962
json_list_prop = []
6063
for list_prop_item_data in list_prop:
61-
list_prop_item = None
64+
list_prop_item = list_prop_item_data.value
6265

6366
json_list_prop.append(list_prop_item)
6467

@@ -68,34 +71,42 @@ def _get_kwargs(
6871
else:
6972
json_union_prop = union_prop
7073

71-
json_union_prop_with_ref: Union[None, Unset, float]
74+
json_union_prop_with_ref: Union[Unset, float, str]
7275
if isinstance(union_prop_with_ref, Unset):
7376
json_union_prop_with_ref = UNSET
74-
elif isinstance(union_prop_with_ref, None):
75-
json_union_prop_with_ref = None
77+
elif isinstance(union_prop_with_ref, AnEnum):
78+
json_union_prop_with_ref = UNSET
79+
if not isinstance(union_prop_with_ref, Unset):
80+
json_union_prop_with_ref = union_prop_with_ref.value
7681

7782
else:
7883
json_union_prop_with_ref = union_prop_with_ref
7984

80-
json_enum_prop = None
85+
json_enum_prop: Union[Unset, str] = UNSET
86+
if not isinstance(enum_prop, Unset):
87+
json_enum_prop = enum_prop.value
8188

82-
json_model_prop = None
89+
json_model_prop: Union[Unset, Dict[str, Any]] = UNSET
90+
if not isinstance(model_prop, Unset):
91+
json_model_prop = model_prop.to_dict()
8392

84-
json_required_model_prop = None
93+
json_required_model_prop = required_model_prop.to_dict()
8594

86-
json_nullable_model_prop: Union[None, Unset]
95+
json_nullable_model_prop: Union[Dict[str, Any], None, Unset]
8796
if isinstance(nullable_model_prop, Unset):
8897
json_nullable_model_prop = UNSET
8998
elif nullable_model_prop is None:
9099
json_nullable_model_prop = None
91100
else:
92-
json_nullable_model_prop = None
101+
json_nullable_model_prop = UNSET
102+
if not isinstance(nullable_model_prop, Unset):
103+
json_nullable_model_prop = nullable_model_prop.to_dict()
93104

94-
json_nullable_required_model_prop: None
105+
json_nullable_required_model_prop: Union[Dict[str, Any], None]
95106
if nullable_required_model_prop is None:
96107
json_nullable_required_model_prop = None
97108
else:
98-
json_nullable_required_model_prop = None
109+
json_nullable_required_model_prop = nullable_required_model_prop.to_dict()
99110

100111
params: Dict[str, Any] = {
101112
"string_prop": string_prop,
@@ -111,11 +122,12 @@ def _get_kwargs(
111122
"union_prop": json_union_prop,
112123
"union_prop_with_ref": json_union_prop_with_ref,
113124
"enum_prop": json_enum_prop,
114-
"model_prop": json_model_prop,
115-
"required_model_prop": json_required_model_prop,
116125
"nullable_model_prop": json_nullable_model_prop,
117126
"nullable_required_model_prop": json_nullable_required_model_prop,
118127
}
128+
if not isinstance(json_model_prop, Unset):
129+
params.update(json_model_prop)
130+
params.update(json_required_model_prop)
119131
params = {k: v for k, v in params.items() if v is not UNSET and v is not None}
120132

121133
return {
@@ -127,19 +139,19 @@ def _get_kwargs(
127139
}
128140

129141

130-
def _parse_response(*, response: httpx.Response) -> Optional[Union[None, None]]:
142+
def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPValidationError]]:
131143
if response.status_code == 200:
132144
response_200 = None
133145

134146
return response_200
135147
if response.status_code == 422:
136-
response_422 = None
148+
response_422 = HTTPValidationError.from_dict(response.json())
137149

138150
return response_422
139151
return None
140152

141153

142-
def _build_response(*, response: httpx.Response) -> Response[Union[None, None]]:
154+
def _build_response(*, response: httpx.Response) -> Response[Union[None, HTTPValidationError]]:
143155
return Response(
144156
status_code=response.status_code,
145157
content=response.content,
@@ -160,15 +172,15 @@ def sync_detailed(
160172
float_prop: Union[Unset, float] = 3.14,
161173
int_prop: Union[Unset, int] = 7,
162174
boolean_prop: Union[Unset, bool] = False,
163-
list_prop: Union[Unset, List[None]] = UNSET,
175+
list_prop: Union[Unset, List[AnEnum]] = UNSET,
164176
union_prop: Union[Unset, float, str] = "not a float",
165-
union_prop_with_ref: Union[None, Unset, float] = 0.6,
166-
enum_prop: Union[Unset, None] = UNSET,
167-
model_prop: Union[Unset, None] = UNSET,
168-
required_model_prop: None,
169-
nullable_model_prop: Union[None, Unset] = UNSET,
170-
nullable_required_model_prop: None,
171-
) -> Response[Union[None, None]]:
177+
union_prop_with_ref: Union[AnEnum, Unset, float] = 0.6,
178+
enum_prop: Union[Unset, AnEnum] = UNSET,
179+
model_prop: Union[Unset, ModelWithUnionProperty] = UNSET,
180+
required_model_prop: ModelWithUnionProperty,
181+
nullable_model_prop: Union[ModelWithUnionProperty, None, Unset] = UNSET,
182+
nullable_required_model_prop: Union[ModelWithUnionProperty, None],
183+
) -> Response[Union[None, HTTPValidationError]]:
172184
kwargs = _get_kwargs(
173185
client=client,
174186
string_prop=string_prop,
@@ -209,15 +221,15 @@ def sync(
209221
float_prop: Union[Unset, float] = 3.14,
210222
int_prop: Union[Unset, int] = 7,
211223
boolean_prop: Union[Unset, bool] = False,
212-
list_prop: Union[Unset, List[None]] = UNSET,
224+
list_prop: Union[Unset, List[AnEnum]] = UNSET,
213225
union_prop: Union[Unset, float, str] = "not a float",
214-
union_prop_with_ref: Union[None, Unset, float] = 0.6,
215-
enum_prop: Union[Unset, None] = UNSET,
216-
model_prop: Union[Unset, None] = UNSET,
217-
required_model_prop: None,
218-
nullable_model_prop: Union[None, Unset] = UNSET,
219-
nullable_required_model_prop: None,
220-
) -> Optional[Union[None, None]]:
226+
union_prop_with_ref: Union[AnEnum, Unset, float] = 0.6,
227+
enum_prop: Union[Unset, AnEnum] = UNSET,
228+
model_prop: Union[Unset, ModelWithUnionProperty] = UNSET,
229+
required_model_prop: ModelWithUnionProperty,
230+
nullable_model_prop: Union[ModelWithUnionProperty, None, Unset] = UNSET,
231+
nullable_required_model_prop: Union[ModelWithUnionProperty, None],
232+
) -> Optional[Union[None, HTTPValidationError]]:
221233
""" """
222234

223235
return sync_detailed(
@@ -254,15 +266,15 @@ async def asyncio_detailed(
254266
float_prop: Union[Unset, float] = 3.14,
255267
int_prop: Union[Unset, int] = 7,
256268
boolean_prop: Union[Unset, bool] = False,
257-
list_prop: Union[Unset, List[None]] = UNSET,
269+
list_prop: Union[Unset, List[AnEnum]] = UNSET,
258270
union_prop: Union[Unset, float, str] = "not a float",
259-
union_prop_with_ref: Union[None, Unset, float] = 0.6,
260-
enum_prop: Union[Unset, None] = UNSET,
261-
model_prop: Union[Unset, None] = UNSET,
262-
required_model_prop: None,
263-
nullable_model_prop: Union[None, Unset] = UNSET,
264-
nullable_required_model_prop: None,
265-
) -> Response[Union[None, None]]:
271+
union_prop_with_ref: Union[AnEnum, Unset, float] = 0.6,
272+
enum_prop: Union[Unset, AnEnum] = UNSET,
273+
model_prop: Union[Unset, ModelWithUnionProperty] = UNSET,
274+
required_model_prop: ModelWithUnionProperty,
275+
nullable_model_prop: Union[ModelWithUnionProperty, None, Unset] = UNSET,
276+
nullable_required_model_prop: Union[ModelWithUnionProperty, None],
277+
) -> Response[Union[None, HTTPValidationError]]:
266278
kwargs = _get_kwargs(
267279
client=client,
268280
string_prop=string_prop,
@@ -302,15 +314,15 @@ async def asyncio(
302314
float_prop: Union[Unset, float] = 3.14,
303315
int_prop: Union[Unset, int] = 7,
304316
boolean_prop: Union[Unset, bool] = False,
305-
list_prop: Union[Unset, List[None]] = UNSET,
317+
list_prop: Union[Unset, List[AnEnum]] = UNSET,
306318
union_prop: Union[Unset, float, str] = "not a float",
307-
union_prop_with_ref: Union[None, Unset, float] = 0.6,
308-
enum_prop: Union[Unset, None] = UNSET,
309-
model_prop: Union[Unset, None] = UNSET,
310-
required_model_prop: None,
311-
nullable_model_prop: Union[None, Unset] = UNSET,
312-
nullable_required_model_prop: None,
313-
) -> Optional[Union[None, None]]:
319+
union_prop_with_ref: Union[AnEnum, Unset, float] = 0.6,
320+
enum_prop: Union[Unset, AnEnum] = UNSET,
321+
model_prop: Union[Unset, ModelWithUnionProperty] = UNSET,
322+
required_model_prop: ModelWithUnionProperty,
323+
nullable_model_prop: Union[ModelWithUnionProperty, None, Unset] = UNSET,
324+
nullable_required_model_prop: Union[ModelWithUnionProperty, None],
325+
) -> Optional[Union[None, HTTPValidationError]]:
314326
""" """
315327

316328
return (

‎end_to_end_tests/golden-record/my_test_api_client/api/tests/get_user_list.py

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@
44
import httpx
55

66
from ...client import Client
7+
from ...models.a_model import AModel
8+
from ...models.an_enum import AnEnum
9+
from ...models.http_validation_error import HTTPValidationError
710
from ...types import UNSET, Response
811

912

1013
def _get_kwargs(
1114
*,
1215
client: Client,
13-
an_enum_value: List[None],
16+
an_enum_value: List[AnEnum],
1417
some_date: Union[datetime.date, datetime.datetime],
1518
) -> Dict[str, Any]:
1619
url = "{}/tests/".format(client.base_url)
@@ -20,7 +23,7 @@ def _get_kwargs(
2023

2124
json_an_enum_value = []
2225
for an_enum_value_item_data in an_enum_value:
23-
an_enum_value_item = None
26+
an_enum_value_item = an_enum_value_item_data.value
2427

2528
json_an_enum_value.append(an_enum_value_item)
2629

@@ -44,24 +47,24 @@ def _get_kwargs(
4447
}
4548

4649

47-
def _parse_response(*, response: httpx.Response) -> Optional[Union[List[None], None]]:
50+
def _parse_response(*, response: httpx.Response) -> Optional[Union[List[AModel], HTTPValidationError]]:
4851
if response.status_code == 200:
4952
response_200 = []
5053
_response_200 = response.json()
5154
for response_200_item_data in _response_200:
52-
response_200_item = None
55+
response_200_item = AModel.from_dict(response_200_item_data)
5356

5457
response_200.append(response_200_item)
5558

5659
return response_200
5760
if response.status_code == 422:
58-
response_422 = None
61+
response_422 = HTTPValidationError.from_dict(response.json())
5962

6063
return response_422
6164
return None
6265

6366

64-
def _build_response(*, response: httpx.Response) -> Response[Union[List[None], None]]:
67+
def _build_response(*, response: httpx.Response) -> Response[Union[List[AModel], HTTPValidationError]]:
6568
return Response(
6669
status_code=response.status_code,
6770
content=response.content,
@@ -73,9 +76,9 @@ def _build_response(*, response: httpx.Response) -> Response[Union[List[None], N
7376
def sync_detailed(
7477
*,
7578
client: Client,
76-
an_enum_value: List[None],
79+
an_enum_value: List[AnEnum],
7780
some_date: Union[datetime.date, datetime.datetime],
78-
) -> Response[Union[List[None], None]]:
81+
) -> Response[Union[List[AModel], HTTPValidationError]]:
7982
kwargs = _get_kwargs(
8083
client=client,
8184
an_enum_value=an_enum_value,
@@ -92,9 +95,9 @@ def sync_detailed(
9295
def sync(
9396
*,
9497
client: Client,
95-
an_enum_value: List[None],
98+
an_enum_value: List[AnEnum],
9699
some_date: Union[datetime.date, datetime.datetime],
97-
) -> Optional[Union[List[None], None]]:
100+
) -> Optional[Union[List[AModel], HTTPValidationError]]:
98101
""" Get a list of things """
99102

100103
return sync_detailed(
@@ -107,9 +110,9 @@ def sync(
107110
async def asyncio_detailed(
108111
*,
109112
client: Client,
110-
an_enum_value: List[None],
113+
an_enum_value: List[AnEnum],
111114
some_date: Union[datetime.date, datetime.datetime],
112-
) -> Response[Union[List[None], None]]:
115+
) -> Response[Union[List[AModel], HTTPValidationError]]:
113116
kwargs = _get_kwargs(
114117
client=client,
115118
an_enum_value=an_enum_value,
@@ -125,9 +128,9 @@ async def asyncio_detailed(
125128
async def asyncio(
126129
*,
127130
client: Client,
128-
an_enum_value: List[None],
131+
an_enum_value: List[AnEnum],
129132
some_date: Union[datetime.date, datetime.datetime],
130-
) -> Optional[Union[List[None], None]]:
133+
) -> Optional[Union[List[AModel], HTTPValidationError]]:
131134
""" Get a list of things """
132135

133136
return (

0 commit comments

Comments
 (0)