Skip to content

Nested includes did not work #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Nested includes did not work #200

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95ca073
fixed nested included resources
Feb 4, 2016
cf61ba7
Delete renderers.py~
Feb 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions rest_framework_json_api/renderers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from . import utils


class JSONRenderer(renderers.JSONRenderer):
"""
Render a JSON response per the JSON API spec:
Expand Down Expand Up @@ -244,12 +243,24 @@ def extract_included(fields, resource, resource_instance, included_resources):
if not isinstance(field, (relations.RelatedField, relations.ManyRelatedField, BaseSerializer)):
continue

try:
included_resources.remove(field_name)
except ValueError:
# Skip fields not in requested included resources
# Find included resourcs for this field
matches = [
key for key in included_resources
if key.split('.')[0] == field_name
]

# Skip fields without included resources
if not matches:
continue

# Remove included resources and collect nested included resources
nested_included_resources = []
for key in matches:
included_resources.remove(key)
nested_resource = '.'.join(key.split('.')[1:])
if nested_resource:
nested_included_resources.append(nested_resource)

try:
relation_instance_or_manager = getattr(resource_instance, field_name)
except AttributeError:
Expand All @@ -262,9 +273,6 @@ def extract_included(fields, resource, resource_instance, included_resources):
serializer_method = getattr(current_serializer, field.source)
relation_instance_or_manager = serializer_method(resource_instance)

new_included_resources = [key.replace('%s.' % field_name, '', 1)
for key in included_resources
if field_name == key.split('.')[0]]
serializer_data = resource.get(field_name)

if isinstance(field, relations.ManyRelatedField):
Expand Down Expand Up @@ -297,7 +305,7 @@ def extract_included(fields, resource, resource_instance, included_resources):
)
included_data.extend(
JSONRenderer.extract_included(
serializer_fields, serializer_resource, nested_resource_instance, new_included_resources
serializer_fields, serializer_resource, nested_resource_instance, nested_included_resources
)
)

Expand All @@ -315,7 +323,7 @@ def extract_included(fields, resource, resource_instance, included_resources):
)
included_data.extend(
JSONRenderer.extract_included(
serializer_fields, serializer_data, relation_instance_or_manager, new_included_resources
serializer_fields, serializer_data, relation_instance_or_manager, nested_included_resources
)
)

Expand Down Expand Up @@ -497,3 +505,4 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
return super(JSONRenderer, self).render(
render_data, accepted_media_type, renderer_context
)