Commit e79d960

committed

Merge branch 'fix/include-in-many-related-serializer' of https://github.com/tbartelmess/django-rest-framework-json-api into tbartelmess-fix/include-in-many-related-serializer

Closes #260

2 parents 38c7ca2 + c1049e4 commit e79d960Copy full SHA for e79d960

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ def __init__(self, args, *kwargs):`
`35`	`35`	`'authors': 'example.serializers.AuthorSerializer',`
`36`	`36`	`'comments': 'example.serializers.CommentSerializer',`
`37`	`37`	`'featured': 'example.serializers.EntrySerializer',`
	`38`	`+ 'suggested': 'example.serializers.EntrySerializer',`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`body_format = serializers.SerializerMethodField()`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,15 @@ def test_dynamic_related_data_is_included(single_entry, entry_factory, client):`
`53`	`53`	`assert len(included) == 1, 'The dynamically included blog entries are of an incorrect count'`
`54`	`54`
`55`	`55`
	`56`	`+def test_dynamic_many_related_data_is_included(single_entry, entry_factory, client):`
	`57`	`+ entry_factory()`
	`58`	`+ response = client.get(reverse("entry-detail", kwargs={'pk': single_entry.pk}) + '?include=suggested')`
	`59`	`+ included = load_json(response.content).get('included')`
	`60`	`+`
	`61`	`+ assert included`
	`62`	`+ assert [x.get('type') for x in included] == ['entries'], 'Dynamic included types are incorrect'`
	`63`	`+`
	`64`	`+`
`56`	`65`	`def test_missing_field_not_included(author_bio_factory, author_factory, client):`
`57`	`66`	`# First author does not have a bio`
`58`	`67`	`author = author_factory(bio=None)`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -300,8 +300,10 @@ def extract_included(fields, resource, resource_instance, included_resources):`
`300`	`300`	`if isinstance(field, relations.RelatedField):`
`301`	`301`	`if relation_instance is None:`
`302`	`302`	`continue`
	`303`	`+`
	`304`	`+ many = field._kwargs.get('child_relation', None) is not None`
`303`	`305`	`serializer_class = included_serializers[field_name]`
`304`		`- field = serializer_class(relation_instance, context=context)`
	`306`	`+ field = serializer_class(relation_instance, many=many, context=context)`
`305`	`307`	`serializer_data = field.data`
`306`	`308`
`307`	`309`	`if isinstance(field, ListSerializer):`

Comments

(0)