Fix/auto prefetch with m2m #333
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
That works through many to many field descriptors, previous way only worked through many to ones.
Updates the tests to use the optimised queryset views provided in views.py. For these to work, the serializer fields need to match the model names so I have just changed the related_name in the test models. This could be improved elsewhere, with the queryset prefetching based on the serializer. But for the most basic use case, this is fine.
Based on the relation descriptor.
Codecov Report
@@ Coverage Diff @@
## develop #333 +/- ##
==========================================
+ Coverage 91.68% 92.5% +0.82%
==========================================
Files 50 50
Lines 2368 2375 +7
==========================================
+ Hits 2171 2197 +26
+ Misses 197 178 -19
Continue to review full report at Codecov.
|
mblayman
reviewed
May 6, 2017
| @@ -32,7 +36,7 @@ | |||
|
|
|||
| class ModelViewSet(viewsets.ModelViewSet): | |||
| def get_queryset(self, *args, **kwargs): | |||
| qs = super().get_queryset(*args, **kwargs) | |||
| qs = super(ModelViewSet, self).get_queryset(*args, **kwargs) | |||
There was a problem hiding this comment.
Oh, nice! Thanks for this one.
|
@bor3ham thanks for this work. I really like the improved coverage. 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously including relations with the optimised viewset through m2m's would crash as it was not correctly getting the model from the related descriptor
For example from the tests:
The tests already covered the right use case, but were not using the prefetching viewset.
I had to update the test models / serializers slightly to support the auto prefetching (which requires the field names in the serializer match the models). I will create an issue to address this as an improvement