diff --git a/example/serializers.py b/example/serializers.py
index c16b7cdf..19e69561 100644
--- a/example/serializers.py
+++ b/example/serializers.py
@@ -34,8 +34,10 @@ def __init__(self, *args, **kwargs):
included_serializers = {
'comments': 'example.serializers.CommentSerializer',
'suggested': 'example.serializers.EntrySerializer',
+ 'blog': 'example.serializers.BlogSerializer'
}
+ blog = serializers.ResourceRelatedField(read_only=True)
body_format = serializers.SerializerMethodField()
comments = relations.ResourceRelatedField(
source='comment_set', many=True, read_only=True)
diff --git a/example/tests/integration/test_includes.py b/example/tests/integration/test_includes.py
index 4e8c79ce..b16b2949 100644
--- a/example/tests/integration/test_includes.py
+++ b/example/tests/integration/test_includes.py
@@ -50,3 +50,21 @@ def test_missing_field_not_included(author_bio_factory, author_factory, client):
assert 'included' in data
assert len(data['included']) == 1
assert data['included'][0]['attributes']['body'] == bio.body
+
+def test_reverse_included(single_entry, client):
+ """Test the parsing of included names"""
+ from django.conf import settings
+
+ parse_relation = getattr(settings, 'JSON_API_PARSE_INCLUDE_KEYS', None)
+ singularize_included = getattr(settings, 'JSON_API_SINGULARIZE_INCLUDE_TYPE', None)
+
+ settings.JSON_API_PARSE_INCLUDE_KEYS = 'underscore'
+ settings.JSON_API_SINGULARIZE_INCLUDE_TYPE = True
+
+ response = client.get(reverse('entry-list') + '?include=blogs')
+ included = load_json(response.content).get('included')
+
+ assert [x.get('type') for x in included] == ['blogs'], 'Related Blogs are incorrect'
+
+ settings.JSON_API_PARSE_INCLUDE_KEYS = parse_relation
+ settings.JSON_API_SINGULARIZE_INCLUDE_TYPE = singularize_included
diff --git a/rest_framework_json_api/renderers.py b/rest_framework_json_api/renderers.py
index a8e852cf..7018548b 100644
--- a/rest_framework_json_api/renderers.py
+++ b/rest_framework_json_api/renderers.py
@@ -406,10 +406,12 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
include_resources_param = request.query_params.get('include') if request else None
if include_resources_param:
- included_resources = include_resources_param.split(',')
+ included_resources = [".".join([utils.parse_relation_name(part) for part in resource.split('.')])
+ for resource in include_resources_param.split(',')]
else:
included_resources = list()
+
json_api_included = list()
# initialize json_api_meta with pagination meta or an empty dict
json_api_meta = data.get('meta', {}) if isinstance(data, dict) else {}
diff --git a/rest_framework_json_api/serializers.py b/rest_framework_json_api/serializers.py
index f68d984e..b980a970 100644
--- a/rest_framework_json_api/serializers.py
+++ b/rest_framework_json_api/serializers.py
@@ -5,7 +5,7 @@
from rest_framework_json_api.relations import ResourceRelatedField
from rest_framework_json_api.utils import (
get_resource_type_from_model, get_resource_type_from_instance,
- get_resource_type_from_serializer, get_included_serializers)
+ get_resource_type_from_serializer, get_included_serializers, parse_relation_name)
class ResourceIdentifierObjectSerializer(BaseSerializer):
@@ -75,7 +75,7 @@ def validate_path(serializer_class, field_path, path):
serializers = get_included_serializers(serializer_class)
if serializers is None:
raise ParseError('This endpoint does not support the include parameter')
- this_field_name = field_path[0]
+ this_field_name = parse_relation_name(field_path[0])
this_included_serializer = serializers.get(this_field_name)
if this_included_serializer is None:
raise ParseError(
diff --git a/rest_framework_json_api/utils.py b/rest_framework_json_api/utils.py
index d8a4e67a..e0369f5e 100644
--- a/rest_framework_json_api/utils.py
+++ b/rest_framework_json_api/utils.py
@@ -148,6 +148,17 @@ def format_relation_name(value, format_type=None):
return inflection.pluralize(value) if pluralize else value
+def parse_relation_name(value, format_type=None):
+ if format_type is None:
+ format_type = getattr(settings, 'JSON_API_PARSE_INCLUDE_KEYS', False)
+
+ singularize = getattr(settings, 'JSON_API_SINGULARIZE_INCLUDE_TYPE', False)
+
+ if format_type:
+ value = format_value(value, format_type)
+
+ return inflection.singularize(value) if singularize else value
+
def get_related_resource_type(relation):
if hasattr(relation, '_meta'):
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy