Commit ea6cbfc

author

Oliver Sauder

committed

Add changelog entry for patch RelationshipView patch

1 parent dfaa30d commit ea6cbfcCopy full SHA for ea6cbfc

File tree

3 files changed

+19

-11

lines changed

CHANGELOG.md
example/tests
- test_views.py
rest_framework_json_api
- views.py

3 files changed

+19

-11

lines changed

`‎CHANGELOG.md‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ any parts of the framework not mentioned in the documentation should generally b`
`23`	`23`	`### Fixed`
`24`	`24`
`25`	`25`	* Pass context from `PolymorphicModelSerializer` to child serializers to support fields which require a `request` context such as `url`.
	`26`	+* Avoid patch on `RelationshipView` deleting relationship instance when constraint would allow null ([#242](https://github.com/django-json-api/django-rest-framework-json-api/issues/242))
`26`	`27`
`27`	`28`
`28`	`29`	`## [2.6.0] - 2018年09月20日`

`‎example/tests/test_views.py‎`

Lines changed: 13 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`from . import TestBase`
`13`	`13`	`from .. import views`
`14`		`-from example.factories import AuthorFactory, EntryFactory, CommentFactory`
	`14`	`+from example.factories import AuthorFactory, CommentFactory, EntryFactory`
`15`	`15`	`from example.models import Author, Blog, Comment, Entry`
`16`	`16`	`from example.serializers import AuthorBioSerializer, AuthorTypeSerializer, EntrySerializer`
`17`	`17`	`from example.views import AuthorViewSet`
`@@ -240,10 +240,14 @@ def test_new_comment_data_patch_to_many_relationship(self):`
`240`	`240`	`previous_response = {`
`241`	`241`	`'data': [`
`242`	`242`	`{'type': 'comments',`
`243`		`- 'id': f'{self.second_comment.id}'`
	`243`	`+ 'id': str(self.second_comment.id)`
`244`	`244`	`}`
`245`	`245`	`],`
`246`		`- 'links': {'self': f'http://testserver/authors/{self.author.id}/relationships/comment_set'}`
	`246`	`+ 'links': {`
	`247`	`+ 'self': 'http://testserver/authors/{}/relationships/comment_set'.format(`
	`248`	`+ self.author.id`
	`249`	`+ )`
	`250`	`+ }`
`247`	`251`	`}`
`248`	`252`
`249`	`253`	`response = self.client.get(url)`
`@@ -256,14 +260,18 @@ def test_new_comment_data_patch_to_many_relationship(self):`
`256`	`260`	`'id': f'{comment.id}'`
`257`	`261`	`}`
`258`	`262`	`],`
`259`		`- 'links': {'self': f'http://testserver/authors/{self.author.id}/relationships/comment_set'}`
	`263`	`+ 'links': {`
	`264`	`+ 'self': 'http://testserver/authors/{}/relationships/comment_set'.format(`
	`265`	`+ self.author.id`
	`266`	`+ )`
	`267`	`+ }`
`260`	`268`	`}`
`261`	`269`
`262`	`270`	`response = self.client.patch(url, data=request_data)`
`263`	`271`	`assert response.status_code == 200`
`264`	`272`	`assert response.json() == new_patched_response`
`265`	`273`
`266`		`- assert Comment.objects.filter(id=self.second_comment.id).exists`
	`274`	`+ assert Comment.objects.filter(id=self.second_comment.id).exists()`
`267`	`275`
`268`	`276`
`269`	`277`	`class TestRelatedMixin(APITestCase):`

`‎rest_framework_json_api/views.py‎`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ def get(self, request, args, *kwargs):`
`254`	`254`	`def remove_relationships(self, instance_manager, field):`
`255`	`255`	`field_object = getattr(instance_manager, field)`
`256`	`256`
`257`		`- if getattr(field_object, "null"):`
	`257`	`+ if field_object.null:`
`258`	`258`	`for obj in instance_manager.all():`
`259`	`259`	`setattr(obj, field_object.name, None)`
`260`	`260`	`obj.save()`
`@@ -273,16 +273,15 @@ def patch(self, request, args, *kwargs):`
`273`	`273`	`data=request.data, model_class=related_model_class, many=True`
`274`	`274`	`)`
`275`	`275`	`serializer.is_valid(raise_exception=True)`
`276`		`- # related_instance_or_manager.all().delete()`
`277`	`276`
`278`	`277`	`# for to one`
`279`	`278`	`if hasattr(related_instance_or_manager, "field"):`
`280`		`- related_instance_or_manager = self.remove_relationships(instance_manager=related_instance_or_manager,`
`281`		`- field="field")`
	`279`	`+ related_instance_or_manager = self.remove_relationships(`
	`280`	`+ instance_manager=related_instance_or_manager, field="field")`
`282`	`281`	`# for to many`
`283`	`282`	`else:`
`284`		`- related_instance_or_manager = self.remove_relationships(instance_manager=related_instance_or_manager,`
`285`		`- field="target_field")`
	`283`	`+ related_instance_or_manager = self.remove_relationships(`
	`284`	`+ instance_manager=related_instance_or_manager, field="target_field")`
`286`	`285`
`287`	`286`	`# have to set bulk to False since data isn't saved yet`
`288`	`287`	`class_name = related_instance_or_manager.__class__.__name__`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ea6cbfc

File tree

3 files changed

3 files changed

`‎CHANGELOG.md‎`

`‎example/tests/test_views.py‎`

`‎rest_framework_json_api/views.py‎`

0 commit comments