Commit a4ecd9a

committed

Added test, CHANGELOG

1 parent f3a5ea7 commit a4ecd9aCopy full SHA for a4ecd9a

File tree

+22

-3

lines changed

+22

-3

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ any parts of the framework not mentioned in the documentation should generally b`
`20`	`20`	* Don't swallow `filter[]` params when there are several
`21`	`21`	`* Fix DeprecationWarning regarding collections.abc import in Python 3.7`
`22`	`22`	`* Allow OPTIONS request to be used on RelationshipView.`
	`23`	`+* Use DRF code when extracting relation instance. [PR](https://github.com/django-json-api/django-rest-framework-json-api/pull/632)`
`23`	`24`
`24`	`25`	`## [2.7.0] - 2019年01月14日`
`25`	`26`

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,13 @@`
`9`	`9`
`10`	`10`	`class ResourceSerializer(serializers.ModelSerializer):`
`11`	`11`	`version = serializers.SerializerMethodField()`
	`12`	`+ skipped_field = serializers.ReadOnlyField(source='foobar')`
`12`	`13`
`13`	`14`	`def get_version(self, obj):`
`14`	`15`	`return '1.0.0'`
`15`	`16`
`16`	`17`	`class Meta:`
`17`		`- fields = ('username',)`
	`18`	`+ fields = ('username','skipped_field')`
`18`	`19`	`meta_fields = ('version',)`
`19`	`20`	`model = get_user_model()`
`20`	`21`
`@@ -148,3 +149,20 @@ def test_extract_root_meta_invalid_meta():`
`148`	`149`	`serializer = InvalidExtractRootMetaResourceSerializer()`
`149`	`150`	`with pytest.raises(AssertionError):`
`150`	`151`	`JSONRenderer.extract_root_meta(serializer, {})`
	`152`	`+`
	`153`	`+`
	`154`	`+def test_extract_relation_instance():`
	`155`	`+ User = get_user_model()`
	`156`	`+ user = User.objects.create(username='foo')`
	`157`	`+ serializer = ResourceSerializer(instance=user)`
	`158`	`+`
	`159`	`+ got = JSONRenderer.extract_relation_instance(`
	`160`	`+ field=serializer.fields['username'], resource_instance=user`
	`161`	`+ )`
	`162`	`+ expected = 'foo'`
	`163`	`+ assert got == expected`
	`164`	`+`
	`165`	`+ got = JSONRenderer.extract_relation_instance(`
	`166`	`+ field=serializer.fields['skipped_field'], resource_instance=user`
	`167`	`+ )`
	`168`	`+ assert got is None`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ def extract_relationships(cls, fields, resource, resource_instance):`
`299`	`299`	`return utils._format_object(data)`
`300`	`300`
`301`	`301`	`@classmethod`
`302`		`- def extract_relation_instance(cls, field_name, field, resource_instance, serializer):`
	`302`	`+ def extract_relation_instance(cls, field, resource_instance):`
`303`	`303`	`"""`
`304`	`304`	`Determines what instance represents given relation and extracts it.`
`305`	`305`
`@@ -351,7 +351,7 @@ def extract_included(cls, fields, resource, resource_instance, included_resource`
`351`	`351`	`continue`
`352`	`352`
`353`	`353`	`relation_instance = cls.extract_relation_instance(`
`354`		`- field_name, field, resource_instance, current_serializer`
	`354`	`+ field, resource_instance`
`355`	`355`	`)`
`356`	`356`	`if isinstance(relation_instance, Manager):`
`357`	`357`	`relation_instance = relation_instance.all()`

Comments

(0)