test: allOf should work with enums, and get default from outer schema

Author: Constantinos Symeonides

Diff for: end_to_end_tests/golden-record/my_test_api_client/models/__init__.py

@@ -2,6 +2,7 @@
 
 from .a_model import AModel
 from .all_of_sub_model import AllOfSubModel
+from .an_all_of_enum import AnAllOfEnum
 from .an_enum import AnEnum
 from .an_int_enum import AnIntEnum
 from .another_all_of_sub_model import AnotherAllOfSubModel

Diff for: end_to_end_tests/golden-record/my_test_api_client/models/a_model.py

@@ -4,6 +4,7 @@
 import attr
 from dateutil.parser import isoparse
 
+from ..models.an_all_of_enum import AnAllOfEnum
 from ..models.an_enum import AnEnum
 from ..models.different_enum import DifferentEnum
 from ..models.free_form_model import FreeFormModel
@@ -27,6 +28,8 @@ class AModel:
     required_nullable: Optional[str]
     nullable_one_of_models: Union[FreeFormModel, ModelWithUnionProperty, None]
     nullable_model: Optional[ModelWithUnionProperty]
+    an_allof_enum_with_overridden_default: AnAllOfEnum = AnAllOfEnum.OVERRIDDEN_DEFAULT
+    an_optional_allof_enum: Union[Unset, AnAllOfEnum] = UNSET
     nested_list_of_enums: Union[Unset, List[List[DifferentEnum]]] = UNSET
     a_not_required_date: Union[Unset, datetime.date] = UNSET
     attr_1_leading_digit: Union[Unset, str] = UNSET
@@ -40,6 +43,8 @@ class AModel:
     def to_dict(self) -> Dict[str, Any]:
         an_enum_value = self.an_enum_value.value
 
+        an_allof_enum_with_overridden_default = self.an_allof_enum_with_overridden_default.value
+
         if isinstance(self.a_camel_date_time, datetime.datetime):
             a_camel_date_time = self.a_camel_date_time.isoformat()
 
@@ -56,6 +61,10 @@ def to_dict(self) -> Dict[str, Any]:
 
         model = self.model.to_dict()
 
+        an_optional_allof_enum: Union[Unset, str] = UNSET
+        if not isinstance(self.an_optional_allof_enum, Unset):
+            an_optional_allof_enum = self.an_optional_allof_enum.value
+
         nested_list_of_enums: Union[Unset, List[List[str]]] = UNSET
         if not isinstance(self.nested_list_of_enums, Unset):
             nested_list_of_enums = []
@@ -133,6 +142,7 @@ def to_dict(self) -> Dict[str, Any]:
         field_dict.update(
             {
                 "an_enum_value": an_enum_value,
+                "an_allof_enum_with_overridden_default": an_allof_enum_with_overridden_default,
                 "aCamelDateTime": a_camel_date_time,
                 "a_date": a_date,
                 "required_not_nullable": required_not_nullable,
@@ -144,6 +154,8 @@ def to_dict(self) -> Dict[str, Any]:
                 "nullable_model": nullable_model,
             }
         )
+        if an_optional_allof_enum is not UNSET:
+            field_dict["an_optional_allof_enum"] = an_optional_allof_enum
         if nested_list_of_enums is not UNSET:
             field_dict["nested_list_of_enums"] = nested_list_of_enums
         if a_not_required_date is not UNSET:
@@ -170,6 +182,8 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         d = src_dict.copy()
         an_enum_value = AnEnum(d.pop("an_enum_value"))
 
+        an_allof_enum_with_overridden_default = AnAllOfEnum(d.pop("an_allof_enum_with_overridden_default"))
+
         def _parse_a_camel_date_time(data: object) -> Union[datetime.date, datetime.datetime]:
             try:
                 a_camel_date_time_type0: datetime.datetime
@@ -214,6 +228,11 @@ def _parse_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionPro
 
         model = ModelWithUnionProperty.from_dict(d.pop("model"))
 
+        an_optional_allof_enum: Union[Unset, AnAllOfEnum] = UNSET
+        _an_optional_allof_enum = d.pop("an_optional_allof_enum", UNSET)
+        if not isinstance(_an_optional_allof_enum, Unset):
+            an_optional_allof_enum = AnAllOfEnum(_an_optional_allof_enum)
+
         nested_list_of_enums = []
         _nested_list_of_enums = d.pop("nested_list_of_enums", UNSET)
         for nested_list_of_enums_item_data in _nested_list_of_enums or []:
@@ -350,11 +369,13 @@ def _parse_not_required_nullable_one_of_models(
 
         a_model = cls(
             an_enum_value=an_enum_value,
+            an_allof_enum_with_overridden_default=an_allof_enum_with_overridden_default,
             a_camel_date_time=a_camel_date_time,
             a_date=a_date,
             required_not_nullable=required_not_nullable,
             one_of_models=one_of_models,
             model=model,
+            an_optional_allof_enum=an_optional_allof_enum,
             nested_list_of_enums=nested_list_of_enums,
             a_nullable_date=a_nullable_date,
             a_not_required_date=a_not_required_date,

Diff for: end_to_end_tests/golden-record/my_test_api_client/models/an_all_of_enum.py

@@ -0,0 +1,11 @@
+from enum import Enum
+
+
+class AnAllOfEnum(str, Enum):
+    FOO = "foo"
+    BAR = "bar"
+    A_DEFAULT = "a_default"
+    OVERRIDDEN_DEFAULT = "overridden_default"
+
+    def __str__(self) -> str:
+        return str(self.value)

Diff for: end_to_end_tests/openapi.json

@@ -737,6 +737,7 @@
         "title": "AModel",
         "required": [
           "an_enum_value",
+          "an_allof_enum_with_overridden_default",
           "aCamelDateTime",
           "a_date",
           "a_nullable_date",
@@ -752,6 +753,21 @@
           "an_enum_value": {
             "$ref": "#/components/schemas/AnEnum"
           },
+          "an_allof_enum_with_overridden_default": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/AnAllOfEnum"
+              }
+            ],
+            "default": "overridden_default"
+          },
+          "an_optional_allof_enum": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/AnAllOfEnum"
+              }
+            ]
+          },
           "nested_list_of_enums": {
             "title": "Nested List Of Enums",
             "type": "array",
@@ -904,6 +920,11 @@
         "enum": ["FIRST_VALUE", "SECOND_VALUE"],
         "description": "For testing Enums in all the ways they can be used "
       },
+      "AnAllOfEnum": {
+        "title": "AnAllOfEnum",
+        "enum": ["foo", "bar", "a_default", "overridden_default"],
+        "default": "a_default"
+      },
       "AnIntEnum": {
         "title": "AnIntEnum",
         "enum": [-1, 1, 2],

Diff for: end_to_end_tests/regen_golden_record.py

@@ -1,6 +1,5 @@
 """ Regenerate golden-record """
 import shutil
-import sys
 from pathlib import Path
 
 from typer.testing import CliRunner