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 django-json-api#260

Author: jerel

example/serializers.py

@@ -35,6 +35,7 @@ def __init__(self, *args, **kwargs):
         'authors': 'example.serializers.AuthorSerializer',
         'comments': 'example.serializers.CommentSerializer',
         'featured': 'example.serializers.EntrySerializer',
+        'suggested': 'example.serializers.EntrySerializer',
     }
 
     body_format = serializers.SerializerMethodField()

example/tests/integration/test_includes.py

@@ -53,6 +53,15 @@ def test_dynamic_related_data_is_included(single_entry, entry_factory, client):
     assert len(included) == 1, 'The dynamically included blog entries are of an incorrect count'
 
 
+def test_dynamic_many_related_data_is_included(single_entry, entry_factory, client):
+    entry_factory()
+    response = client.get(reverse("entry-detail", kwargs={'pk': single_entry.pk}) + '?include=suggested')
+    included = load_json(response.content).get('included')
+
+    assert included
+    assert [x.get('type') for x in included] == ['entries'], 'Dynamic included types are incorrect'
+
+
 def test_missing_field_not_included(author_bio_factory, author_factory, client):
     # First author does not have a bio
     author = author_factory(bio=None)

rest_framework_json_api/renderers.py

@@ -300,8 +300,10 @@ def extract_included(fields, resource, resource_instance, included_resources):
             if isinstance(field, relations.RelatedField):
                 if relation_instance is None:
                     continue
+
+                many = field._kwargs.get('child_relation', None) is not None
                 serializer_class = included_serializers[field_name]
-                field = serializer_class(relation_instance, context=context)
+                field = serializer_class(relation_instance, many=many, context=context)
                 serializer_data = field.data
 
             if isinstance(field, ListSerializer):