Commit 311385e

authored

Include meta section for SerializerMethodResourceRelatedField(many=True) (#1162)

Fixes #572

1 parent 71508ef commit 311385eCopy full SHA for 311385e

File tree

+12

-0

lines changed

+12

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ any parts of the framework not mentioned in the documentation should generally b`
`40`	`40`	`return value.name`
`41`	`41`	```
`42`	`42`
	`43`	+* `SerializerMethodResourceRelatedField(many=True)` relationship data now includes a meta section.
	`44`	`+`
`43`	`45`	`### Fixed`
`44`	`46`
`45`	`47`	* Refactored handling of the `sort` query parameter to fix duplicate declaration in the generated schema definition

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ def test_multiple_entries_no_pagination(multiple_entries, client):`
`51`	`51`	`"related": "http://testserver/entries/1/suggested/",`
`52`	`52`	`"self": "http://testserver/entries/1/relationships/suggested",`
`53`	`53`	`},`
	`54`	`+ "meta": {"count": 1},`
`54`	`55`	`},`
`55`	`56`	`"suggestedHyperlinked": {`
`56`	`57`	`"links": {`
`@@ -106,6 +107,7 @@ def test_multiple_entries_no_pagination(multiple_entries, client):`
`106`	`107`	`"related": "http://testserver/entries/2/suggested/",`
`107`	`108`	`"self": "http://testserver/entries/2/relationships/suggested",`
`108`	`109`	`},`
	`110`	`+ "meta": {"count": 1},`
`109`	`111`	`},`
`110`	`112`	`"suggestedHyperlinked": {`
`111`	`113`	`"links": {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ def test_pagination_with_single_entry(single_entry, client):`
`51`	`51`	`"related": "http://testserver/entries/1/suggested/",`
`52`	`52`	`"self": "http://testserver/entries/1/relationships/suggested",`
`53`	`53`	`},`
	`54`	`+ "meta": {"count": 0},`
`54`	`55`	`},`
`55`	`56`	`"suggestedHyperlinked": {`
`56`	`57`	`"links": {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -512,6 +512,7 @@ def test_search_keywords(self):`
`512`	`512`	`{"type": "entries", "id": "11"},`
`513`	`513`	`{"type": "entries", "id": "12"},`
`514`	`514`	`],`
	`515`	`+ "meta": {"count": 11},`
`515`	`516`	`},`
`516`	`517`	`"suggestedHyperlinked": {`
`517`	`518`	`"links": {`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`from rest_framework_json_api import utils`
`20`	`20`	`from rest_framework_json_api.relations import (`
`21`	`21`	`HyperlinkedMixin,`
	`22`	`+ ManySerializerMethodResourceRelatedField,`
`22`	`23`	`ResourceRelatedField,`
`23`	`24`	`SkipDataMixin,`
`24`	`25`	`)`
`@@ -152,6 +153,11 @@ def extract_relationships(cls, fields, resource, resource_instance):`
`152`	`153`	`if not isinstance(field, SkipDataMixin):`
`153`	`154`	`relation_data.update({"data": resource.get(field_name)})`
`154`	`155`
	`156`	`+ if isinstance(field, ManySerializerMethodResourceRelatedField):`
	`157`	`+ relation_data.update(`
	`158`	`+ {"meta": {"count": len(resource.get(field_name))}}`
	`159`	`+ )`
	`160`	`+`
`155`	`161`	`data.update({field_name: relation_data})`
`156`	`162`	`continue`
`157`	`163`

Comments

(0)