Reverse the included relation name formatting

Author: schtibe

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 {}

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(

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_RELATION_KEYS', 'underscore')
+
+    singularize = getattr(settings, 'JSON_API_PLURALIZE_RELATION_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'):