test: Add end-to-end test for allOf required override

Add AllOfRequiredBase and AllOfRequiredDerived schemas to baseline
specs to verify the generated code correctly handles required field
overrides in allOf schemas. Update golden records accordingly.

Author: peter-goldstein

end_to_end_tests/baseline_openapi_3.0.json

@@ -1918,6 +1918,30 @@
           }
         ]
       },
+      "AllOfRequiredBase": {
+        "type": "object",
+        "properties": {
+          "bar": {
+            "type": "string",
+            "description": "The bar property"
+          },
+          "baz": {
+            "type": "string",
+            "description": "The baz property"
+          }
+        }
+      },
+      "AllOfRequiredDerived": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/AllOfRequiredBase"
+          },
+          {
+            "type": "object",
+            "required": ["bar"]
+          }
+        ]
+      },
       "AModel": {
         "title": "AModel",
         "required": [

end_to_end_tests/baseline_openapi_3.1.yaml

@@ -1871,6 +1871,27 @@ info:
         }
       ]
     },
+    "AllOfRequiredBase": {
+      "type": "object",
+      "properties": {
+        "bar": {
+          "type": "string",
+          "description": "The bar property"
+        },
+        "baz": {
+          "type": "string",
+          "description": "The baz property"
+        }
+      }
+    },
+    "AllOfRequiredDerived": {
+      "allOf": [
+        { "$ref": "#/components/schemas/AllOfRequiredBase" },
+        { "type": "object",
+          "required": ["bar"]
+        }
+      ]
+    },
     "AModel": {
       "title": "AModel",
       "required": [

end_to_end_tests/golden-record/my_test_api_client/models/__init__.py

@@ -7,6 +7,8 @@
 from .a_model_with_properties_reference_that_are_not_object import AModelWithPropertiesReferenceThatAreNotObject
 from .all_of_has_properties_but_no_type import AllOfHasPropertiesButNoType
 from .all_of_has_properties_but_no_type_type_enum import AllOfHasPropertiesButNoTypeTypeEnum
+from .all_of_required_base import AllOfRequiredBase
+from .all_of_required_derived import AllOfRequiredDerived
 from .all_of_sub_model import AllOfSubModel
 from .all_of_sub_model_type_enum import AllOfSubModelTypeEnum
 from .an_all_of_enum import AnAllOfEnum
@@ -100,6 +102,8 @@
     "AFormData",
     "AllOfHasPropertiesButNoType",
     "AllOfHasPropertiesButNoTypeTypeEnum",
+    "AllOfRequiredBase",
+    "AllOfRequiredDerived",
     "AllOfSubModel",
     "AllOfSubModelTypeEnum",
     "AModel",

end_to_end_tests/golden-record/my_test_api_client/models/all_of_required_base.py

@@ -0,0 +1,70 @@
+from __future__ import annotations
+
+from collections.abc import Mapping
+from typing import Any, TypeVar
+
+from attrs import define as _attrs_define
+from attrs import field as _attrs_field
+
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="AllOfRequiredBase")
+
+
+@_attrs_define
+class AllOfRequiredBase:
+    """
+    Attributes:
+        bar (str | Unset): The bar property
+        baz (str | Unset): The baz property
+    """
+
+    bar: str | Unset = UNSET
+    baz: str | Unset = UNSET
+    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+
+    def to_dict(self) -> dict[str, Any]:
+        bar = self.bar
+
+        baz = self.baz
+
+        field_dict: dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if bar is not UNSET:
+            field_dict["bar"] = bar
+        if baz is not UNSET:
+            field_dict["baz"] = baz
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
+        bar = d.pop("bar", UNSET)
+
+        baz = d.pop("baz", UNSET)
+
+        all_of_required_base = cls(
+            bar=bar,
+            baz=baz,
+        )
+
+        all_of_required_base.additional_properties = d
+        return all_of_required_base
+
+    @property
+    def additional_keys(self) -> list[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties

end_to_end_tests/golden-record/my_test_api_client/models/all_of_required_derived.py

@@ -0,0 +1,72 @@
+from __future__ import annotations
+
+from collections.abc import Mapping
+from typing import Any, TypeVar
+
+from attrs import define as _attrs_define
+from attrs import field as _attrs_field
+
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="AllOfRequiredDerived")
+
+
+@_attrs_define
+class AllOfRequiredDerived:
+    """
+    Attributes:
+        bar (str): The bar property
+        baz (str | Unset): The baz property
+    """
+
+    bar: str
+    baz: str | Unset = UNSET
+    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+
+    def to_dict(self) -> dict[str, Any]:
+        bar = self.bar
+
+        baz = self.baz
+
+        field_dict: dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update(
+            {
+                "bar": bar,
+            }
+        )
+        if baz is not UNSET:
+            field_dict["baz"] = baz
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
+        bar = d.pop("bar")
+
+        baz = d.pop("baz", UNSET)
+
+        all_of_required_derived = cls(
+            bar=bar,
+            baz=baz,
+        )
+
+        all_of_required_derived.additional_properties = d
+        return all_of_required_derived
+
+    @property
+    def additional_keys(self) -> list[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties