Optimization fixes

Author: jsenecal

rest_framework_json_api/renderers.py

@@ -69,17 +69,20 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
             fields = utils.get_serializer_fields(resource_serializer)
 
             json_api_data = list()
-            for resource in results:
+            for position in range(len(results)):
+                resource = results[position]  # Get current resource
+                resource_instance = resource_serializer.instance[position]  # Get current instance
                 json_api_data.append(
-                    utils.build_json_resource_obj(fields, resource, resource_name))
+                    utils.build_json_resource_obj(fields, resource, resource_instance, resource_name))
                 included = utils.extract_included(fields, resource)
                 if included:
                     json_api_included.extend(included)
         else:
             # Check if data contains a serializer
             if hasattr(data, 'serializer'):
                 fields = utils.get_serializer_fields(data.serializer)
-                json_api_data = utils.build_json_resource_obj(fields, data, resource_name)
+                resource_instance = data.serializer.instance
+                json_api_data = utils.build_json_resource_obj(fields, data, resource_instance, resource_name)
                 included = utils.extract_included(fields, data)
                 if included:
                     json_api_included.extend(included)

rest_framework_json_api/utils.py

@@ -128,13 +128,13 @@ def format_value(value, format_type=None):
     return value
 
 
-def build_json_resource_obj(fields, resource, resource_name):
+def build_json_resource_obj(fields, resource, resource_instance, resource_name):
     resource_data = [
         ('type', resource_name),
         ('id', extract_id(fields, resource)),
         ('attributes', extract_attributes(fields, resource)),
     ]
-    relationships = extract_relationships(fields, resource)
+    relationships = extract_relationships(fields, resource, resource_instance)
     if relationships:
         resource_data.append(('relationships', relationships))
     # Add 'self' link if field is present and valid
@@ -166,18 +166,6 @@ def get_related_resource_type(relation):
     return inflection.pluralize(relation_model.__name__).lower()
 
 
-def get_current_instance(fields, resource):
-    serializer_instance = fields.serializer.instance
-    if isinstance(serializer_instance, list):
-        current_id = extract_id(fields, resource)
-        for instance in serializer_instance:
-            # Search for our own instance
-            if encoding.force_text(instance.pk) == current_id:
-                return instance
-    else:
-        return serializer_instance
-
-
 def extract_id_from_url(url):
     http_prefix = url.startswith(('http:', 'https:'))
     if http_prefix:
@@ -215,7 +203,7 @@ def extract_attributes(fields, resource):
     return format_keys(data)
 
 
-def extract_relationships(fields, resource):
+def extract_relationships(fields, resource, resource_instance):
     data = OrderedDict()
     for field_name, field in six.iteritems(fields):
         # Skip URL field
@@ -230,7 +218,7 @@ def extract_relationships(fields, resource):
             # special case for HyperlinkedRouterField
             relation_data = list()
             relation_type = get_related_resource_type(field)
-            related = getattr(get_current_instance(fields, resource), field_name).all()
+            related = getattr(resource_instance, field_name).all()
             for relation in related:
                 relation_data.append(OrderedDict([('type', relation_type), ('id', relation.pk)]))