Skip to content

Optimizations for parsing relation data #79

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

Merged
merged 1 commit into from
Sep 14, 2015
Merged

Optimizations for parsing relation data #79

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 25 additions & 33 deletions rest_framework_json_api/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

from django.utils.six.moves.urllib.parse import urlparse


try:
from rest_framework.compat import OrderedDict
except ImportError:
Expand Down Expand Up @@ -234,46 +233,39 @@ def extract_relationships(fields, resource, resource_instance):

if isinstance(field, (PrimaryKeyRelatedField, HyperlinkedRelatedField)):
relation_type = get_related_resource_type(field)
relation_id = getattr(resource_instance, field_name).pk if resource.get(field_name) else None

if resource.get(field_name) is not None:
if isinstance(field, PrimaryKeyRelatedField):
relation_id = encoding.force_text(resource.get(field_name))
elif isinstance(field, HyperlinkedRelatedField):
relation_id = extract_id_from_url(resource.get(field_name))
else:
relation_id = None

data.update(
{
field_name: {
'data': (OrderedDict([
('type', relation_type), ('id', relation_id)
]) if relation_id is not None else None)
}
}
relation_data = {
'data': (OrderedDict([
('type', relation_type), ('id', relation_id)
]) if relation_id is not None else None)
}

relation_data.update(
{'links': {'related': resource.get(field_name)}}
if isinstance(field, HyperlinkedRelatedField) and resource.get(field_name) else {}
)
data.update({field_name: relation_data})
continue

if isinstance(field, ManyRelatedField):
relation_data = list()

relation = field.child_relation

relation_type = get_related_resource_type(relation)

if isinstance(relation, HyperlinkedRelatedField):
for link in resource.get(field_name, list()):
relation_data.append(OrderedDict([('type', relation_type), ('id', extract_id_from_url(link))]))

data.update({field_name: {'data': relation_data}})
continue

if isinstance(relation, PrimaryKeyRelatedField):
for pk in resource.get(field_name, list()):
relation_data.append(OrderedDict([('type', relation_type), ('id', encoding.force_text(pk))]))

data.update({field_name: {'data': relation_data}})
continue
for related_object in getattr(resource_instance, field_name).all():
relation_data.append(OrderedDict([
('type', relation_type),
('id', encoding.force_text(related_object.pk))
]))
data.update({
field_name: {
'data': relation_data,
'meta': {
'count': len(relation_data)
}
}
})
continue

if isinstance(field, ListSerializer):
relation_data = list()
Expand Down