Commit 38c2ab0

committed

Respect serializer's id field.

1 parent 435325e commit 38c2ab0Copy full SHA for 38c2ab0

File tree

+42

-1

lines changed

+42

-1

lines changed

Lines changed: 34 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,40 @@ def test_build_json_resource_obj():`
`41`	`41`	`serializer.fields, resource, resource_instance, 'user') == output`
`42`	`42`
`43`	`43`
	`44`	`+class PrefixedId(serializers.CharField):`
	`45`	`+ def get_attribute(self, instance):`
	`46`	`+ return 'my-id-' + str(instance.id)`
	`47`	`+`
	`48`	`+ def to_internal_value(self, data):`
	`49`	`+ return int(data['id'].split('-')[-1])`
	`50`	`+`
	`51`	`+`
	`52`	`+class ResourceWithIdSerializer(serializers.ModelSerializer):`
	`53`	`+ id = PrefixedId(required=False)`
	`54`	`+`
	`55`	`+ class Meta:`
	`56`	`+ fields = ('id', 'username',)`
	`57`	`+ model = get_user_model()`
	`58`	`+`
	`59`	`+`
	`60`	`+def test_build_json_resource_obj_respects_serializer_id():`
	`61`	`+ serializer = ResourceWithIdSerializer(data={'username': 'Alice'})`
	`62`	`+ serializer.is_valid()`
	`63`	`+ resource_instance = serializer.save()`
	`64`	`+ resource = serializer.data`
	`65`	`+`
	`66`	`+ output = {`
	`67`	`+ 'type': 'user',`
	`68`	`+ 'id': 'my-id-1',`
	`69`	`+ 'attributes': {`
	`70`	`+ 'username': 'Alice'`
	`71`	`+ },`
	`72`	`+ }`
	`73`	`+`
	`74`	`+ assert JSONRenderer.build_json_resource_obj(`
	`75`	`+ serializer.fields, resource, resource_instance, 'user') == output`
	`76`	`+`
	`77`	`+`
`44`	`78`	`def test_can_override_methods():`
`45`	`79`	`"""`
`46`	`80`	`Make sure extract_attributes and extract_relationships can be overriden.`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -498,9 +498,16 @@ def build_json_resource_obj(cls, fields, resource, resource_instance, resource_n`
`498`	`498`	`# Determine type from the instance if the underlying model is polymorphic`
`499`	`499`	`if force_type_resolution:`
`500`	`500`	`resource_name = utils.get_resource_type_from_instance(resource_instance)`
	`501`	`+`
	`502`	+ # Allow serializer `id` field to override model pk
	`503`	`+ if 'id' in resource:`
	`504`	`+ resource_id = encoding.force_text(resource['id'])`
	`505`	`+ else:`
	`506`	`+ resource_id = encoding.force_text(resource_instance.pk) if resource_instance else None`
	`507`	`+`
`501`	`508`	`resource_data = [`
`502`	`509`	`('type', resource_name),`
`503`		`- ('id', encoding.force_text(resource_instance.pk) ifresource_instanceelseNone),`
	`510`	`+ ('id', resource_id),`
`504`	`511`	`('attributes', cls.extract_attributes(fields, resource)),`
`505`	`512`	`]`
`506`	`513`	`relationships = cls.extract_relationships(fields, resource, resource_instance)`

Comments

(0)