Merge pull request #83 from oxan/metadata-child-kwargs

Author: oxan

CHANGELOG.rst

@@ -15,6 +15,7 @@ Features & fixes:
 * Support dataclasses with fields that have ``init=False``.
 * Support ``save()`` on serializers with ``many=True``.
 * Support for fields with union types.
+* Fix ``child_kwargs`` defined in dataclass field metadata (as opposed to ``extra_kwargs`` field on ``Meta`` subclass).
 
 1.2.0, 18 November 2022
 -----------------------

rest_framework_dataclasses/serializers.py

@@ -376,12 +376,11 @@ def create_field(self, field_name: str, extra_kwargs: KWArgs) -> SerializerField
  # Determine the serializer field class and keyword arguments.
  if source in self.dataclass_definition.fields:
  field = self.dataclass_definition.fields[source]
+ if 'serializer_kwargs' in field.metadata: # merge extra kwargs defined in the field metadata
+ extra_kwargs = {**field.metadata['serializer_kwargs'], **extra_kwargs}
+
  type_info = field_utils.get_type_info(self.dataclass_definition.field_types[source])
  field_class, field_kwargs = self.build_typed_field(source, type_info, extra_kwargs)
-
- # Include extra kwargs defined in the field metadata
- if 'serializer_kwargs' in field.metadata:
- field_kwargs = self.include_extra_kwargs(field_kwargs, field.metadata['serializer_kwargs'])
  elif hasattr(self.dataclass_definition.dataclass_type, source):
  field_class, field_kwargs = self.build_property_field(source)
  else:

tests/test_serializers.py

@@ -323,6 +323,9 @@ def test_create_field(self):
  class TestPerson:
  name: str
  length: int = dataclasses.field(metadata={'serializer_kwargs': {'max_value': 200}})
+ numbers: typing.List[int] = dataclasses.field(metadata={
+ 'serializer_kwargs': {'child_kwargs': {'max_value': 200}}
+ })
  species: types.Final[str] = 'Human'
 
  def age(self) -> int:
@@ -345,6 +348,11 @@ def is_child(self) -> bool:
  self.assertIsInstance(length_field, fields.IntegerField)
  self.assertEqual(length_field.max_value, 200)
 
+ # Composite field with metadata argument for child field
+ numbers_field = serializer.create_field('numbers', {})
+ self.assertIsInstance(numbers_field.child, fields.IntegerField)
+ self.assertEqual(numbers_field.child.max_value, 200)
+
  # Function field
  age_field = serializer.create_field('age', {})
  self.assertIsInstance(age_field, fields.ReadOnlyField)