f included

Author: Boris Pleshakov

rest_framework_json_api/renderers.py

@@ -114,10 +114,14 @@ def extract_relationships(cls, fields, resource, resource_instance):
 
             # Skip fields without relations
             if not isinstance(
-                field, (relations.RelatedField, relations.ManyRelatedField, BaseSerializer)
+                field, (relations.RelatedField, relations.ManyRelatedField)
             ):
                 continue
 
+            if isinstance(field, BaseSerializer) and \
+                    rendering_strategy == ATTRIBUTE_RENDERING_STRATEGY:
+                continue
+
             source = field.source
             relation_type = utils.get_related_resource_type(field)
 
@@ -252,56 +256,55 @@ def extract_relationships(cls, fields, resource, resource_instance):
                 })
                 continue
 
-            if rendering_strategy == RELATIONS_RENDERING_STRATEGY:
-                if isinstance(field, ListSerializer):
+            if isinstance(field, ListSerializer):
+                resolved, relation_instance = utils.get_relation_instance(
+                    resource_instance, source, field.parent
+                )
+                if not resolved:
+                    continue
+
+                relation_data = list()
+
+                serializer_data = resource.get(field_name)
+                resource_instance_queryset = list(relation_instance)
+                if isinstance(serializer_data, list):
+                    for position in range(len(serializer_data)):
+                        nested_resource_instance = resource_instance_queryset[position]
+                        nested_resource_instance_type = (
+                            relation_type or
+                            utils.get_resource_type_from_instance(nested_resource_instance)
+                        )
+
+                        relation_data.append(OrderedDict([
+                            ('type', nested_resource_instance_type),
+                            ('id', encoding.force_str(nested_resource_instance.pk))
+                        ]))
+
+                    data.update({field_name: {'data': relation_data}})
+                    continue
+
+            if isinstance(field, Serializer):
+                relation_instance_id = getattr(resource_instance, source + "_id", None)
+                if not relation_instance_id:
                     resolved, relation_instance = utils.get_relation_instance(
                         resource_instance, source, field.parent
                     )
                     if not resolved:
                         continue
 
-                    relation_data = list()
-
-                    serializer_data = resource.get(field_name)
-                    resource_instance_queryset = list(relation_instance)
-                    if isinstance(serializer_data, list):
-                        for position in range(len(serializer_data)):
-                            nested_resource_instance = resource_instance_queryset[position]
-                            nested_resource_instance_type = (
-                                relation_type or
-                                utils.get_resource_type_from_instance(nested_resource_instance)
-                            )
+                    if relation_instance is not None:
+                        relation_instance_id = relation_instance.pk
 
-                            relation_data.append(OrderedDict([
-                                ('type', nested_resource_instance_type),
-                                ('id', encoding.force_str(nested_resource_instance.pk))
-                            ]))
-
-                        data.update({field_name: {'data': relation_data}})
-                        continue
-
-                if isinstance(field, Serializer):
-                    relation_instance_id = getattr(resource_instance, source + "_id", None)
-                    if not relation_instance_id:
-                        resolved, relation_instance = utils.get_relation_instance(
-                            resource_instance, source, field.parent
-                        )
-                        if not resolved:
-                            continue
-
-                        if relation_instance is not None:
-                            relation_instance_id = relation_instance.pk
-
-                    data.update({
-                        field_name: {
-                            'data': (
-                                OrderedDict([
-                                    ('type', relation_type),
-                                    ('id', encoding.force_str(relation_instance_id))
-                                ]) if resource.get(field_name) else None)
-                        }
-                    })
-                    continue
+                data.update({
+                    field_name: {
+                        'data': (
+                            OrderedDict([
+                                ('type', relation_type),
+                                ('id', encoding.force_str(relation_instance_id))
+                            ]) if resource.get(field_name) else None)
+                    }
+                })
+                continue
 
         return utils.format_field_names(data)
 
@@ -344,12 +347,16 @@ def extract_included(cls, fields, resource, resource_instance, included_resource
             if field_name == api_settings.URL_FIELD_NAME:
                 continue
 
-            # Skip fields without relations or serialized data
+            # Skip fields without relations
             if not isinstance(
-                    field, (relations.RelatedField, relations.ManyRelatedField, BaseSerializer)
+                field, (relations.RelatedField, relations.ManyRelatedField)
             ):
                 continue
 
+            if isinstance(field, BaseSerializer) and \
+                    rendering_strategy == ATTRIBUTE_RENDERING_STRATEGY:
+                continue
+
             try:
                 included_resources.remove(field_name)
             except ValueError:
@@ -392,66 +399,65 @@ def extract_included(cls, fields, resource, resource_instance, included_resource
                                       for key in included_resources
                                       if field_name == key.split('.')[0]]
 
-            if rendering_strategy == RELATIONS_RENDERING_STRATEGY:
-                if isinstance(field, ListSerializer):
-                    serializer = field.child
-                    relation_type = utils.get_resource_type_from_serializer(serializer)
-                    relation_queryset = list(relation_instance)
-
-                    if serializer_data:
-                        for position in range(len(serializer_data)):
-                            serializer_resource = serializer_data[position]
-                            nested_resource_instance = relation_queryset[position]
-                            resource_type = (
-                                relation_type or
-                                utils.get_resource_type_from_instance(nested_resource_instance)
-                            )
-                            serializer_fields = utils.get_serializer_fields(
-                                serializer.__class__(
-                                    nested_resource_instance, context=serializer.context
-                                )
-                            )
-                            new_item = cls.build_json_resource_obj(
-                                serializer_fields,
-                                serializer_resource,
-                                nested_resource_instance,
-                                resource_type,
-                                getattr(serializer, '_poly_force_type_resolution', False)
-                            )
-                            included_cache[new_item['type']][new_item['id']] = \
-                                utils.format_field_names(new_item)
-                            cls.extract_included(
-                                serializer_fields,
-                                serializer_resource,
-                                nested_resource_instance,
-                                new_included_resources,
-                                included_cache,
+            if isinstance(field, ListSerializer):
+                serializer = field.child
+                relation_type = utils.get_resource_type_from_serializer(serializer)
+                relation_queryset = list(relation_instance)
+
+                if serializer_data:
+                    for position in range(len(serializer_data)):
+                        serializer_resource = serializer_data[position]
+                        nested_resource_instance = relation_queryset[position]
+                        resource_type = (
+                            relation_type or
+                            utils.get_resource_type_from_instance(nested_resource_instance)
+                        )
+                        serializer_fields = utils.get_serializer_fields(
+                            serializer.__class__(
+                                nested_resource_instance, context=serializer.context
                             )
-
-                if isinstance(field, Serializer):
-                    relation_type = utils.get_resource_type_from_serializer(field)
-
-                    # Get the serializer fields
-                    serializer_fields = utils.get_serializer_fields(field)
-                    if serializer_data:
+                        )
                         new_item = cls.build_json_resource_obj(
                             serializer_fields,
-                            serializer_data,
-                            relation_instance,
-                            relation_type,
-                            getattr(field, '_poly_force_type_resolution', False)
-                        )
-                        included_cache[new_item['type']][new_item['id']] = utils.format_field_names(
-                            new_item
+                            serializer_resource,
+                            nested_resource_instance,
+                            resource_type,
+                            getattr(serializer, '_poly_force_type_resolution', False)
                         )
+                        included_cache[new_item['type']][new_item['id']] = \
+                            utils.format_field_names(new_item)
                         cls.extract_included(
                             serializer_fields,
-                            serializer_data,
-                            relation_instance,
+                            serializer_resource,
+                            nested_resource_instance,
                             new_included_resources,
                             included_cache,
                         )
 
+            if isinstance(field, Serializer):
+                relation_type = utils.get_resource_type_from_serializer(field)
+
+                # Get the serializer fields
+                serializer_fields = utils.get_serializer_fields(field)
+                if serializer_data:
+                    new_item = cls.build_json_resource_obj(
+                        serializer_fields,
+                        serializer_data,
+                        relation_instance,
+                        relation_type,
+                        getattr(field, '_poly_force_type_resolution', False)
+                    )
+                    included_cache[new_item['type']][new_item['id']] = utils.format_field_names(
+                        new_item
+                    )
+                    cls.extract_included(
+                        serializer_fields,
+                        serializer_data,
+                        relation_instance,
+                        new_included_resources,
+                        included_cache,
+                    )
+
     @classmethod
     def extract_meta(cls, serializer, resource):
         """