Fix remaining tests

Author: forest-benchling

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/defaults_tests_defaults_post.py

@@ -92,15 +92,15 @@ def httpx_request(
     if isinstance(union_prop, Unset):
         json_union_prop = UNSET
     elif union_prop is None:
-        json_union_prop: Union[Unset, None, float, str] = None
+        json_union_prop = None
     else:
         json_union_prop = union_prop
 
     json_union_prop_with_ref: Union[Unset, None, float, AnEnum]
     if isinstance(union_prop_with_ref, Unset):
         json_union_prop_with_ref = UNSET
     elif union_prop_with_ref is None:
-        json_union_prop_with_ref: Union[Unset, None, float, AnEnum] = None
+        json_union_prop_with_ref = None
     elif isinstance(union_prop_with_ref, AnEnum):
         json_union_prop_with_ref = UNSET
         if not isinstance(union_prop_with_ref, Unset):

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/get_user_list.py

@@ -53,8 +53,6 @@ def httpx_request(
 
         json_an_enum_value.append(an_enum_value_item)
 
-    if some_date is None:
-        json_some_date: Union[datetime.date, datetime.datetime] = None
     if isinstance(some_date, datetime.date):
         json_some_date = some_date.isoformat()
     else:

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

@@ -68,15 +68,15 @@ def _get_kwargs(
     if isinstance(union_prop, Unset):
         json_union_prop = UNSET
     elif union_prop is None:
-        json_union_prop: Union[Unset, None, float, str] = None
+        json_union_prop = None
     else:
         json_union_prop = union_prop
 
     json_union_prop_with_ref: Union[Unset, None, float, AnEnum]
     if isinstance(union_prop_with_ref, Unset):
         json_union_prop_with_ref = UNSET
     elif union_prop_with_ref is None:
-        json_union_prop_with_ref: Union[Unset, None, float, AnEnum] = None
+        json_union_prop_with_ref = None
     elif isinstance(union_prop_with_ref, AnEnum):
         json_union_prop_with_ref = UNSET
         if not isinstance(union_prop_with_ref, Unset):

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

@@ -26,8 +26,6 @@ def _get_kwargs(
 
         json_an_enum_value.append(an_enum_value_item)
 
-    if some_date is None:
-        json_some_date: Union[datetime.date, datetime.datetime] = None
     if isinstance(some_date, datetime.date):
         json_some_date = some_date.isoformat()
     else:

openapi_python_client/templates/property_templates/union_property.pyi

@@ -25,19 +25,19 @@ def _parse_{{ property.python_name }}(data: Any) -> {{ property.get_type_string(
 {% endmacro %}
 
 {% macro transform(property, source, destination, declare_type=True, query_parameter=False) %}
-{% if not property.required %}
+{% if not property.required or property.nullable %}
 {{ destination }}{% if declare_type %}: {{ property.get_type_string(query_parameter=query_parameter) }}{% endif %}
 
 if isinstance({{ source }}, Unset):
     {{ destination }} = UNSET
 {% endif %}
-{% if property.nullable or query_parameter %}
+{% if property.nullable or (query_parameter and not property.required) %}
     {% if property.required %}
 if {{ source }} is None:
     {% else %}{# There's an if UNSET statement before this #}
 elif {{ source }} is None:
     {% endif %}
-    {{ destination }}{% if declare_type %}: {{ property.get_type_string(query_parameter=query_parameter) }}{% endif %} = None
+    {{ destination }} = None
 {% endif %}
 {% for inner_property in property.inner_properties_with_template() %}
     {% if loop.first and property.required and not property.nullable %}{# No if UNSET or if None statement before this #}