Working on relationships views

Author: jsenecal

example/tests/test_views.py

@@ -1,4 +1,5 @@
 from django.utils import timezone
+from rest_framework.reverse import reverse
 from rest_framework.test import APITestCase
 
 from rest_framework_json_api.utils import format_relation_name
@@ -8,7 +9,6 @@
 
 
 class TestRelationshipView(APITestCase):
-
     def setUp(self):
         self.blog = Blog.objects.create(name='Some Blog', tagline="It's a blog")
         self.entry = Entry.objects.create(
@@ -23,7 +23,8 @@ def setUp(self):
         )
 
     def test_get_entry_relationship_blog(self):
-        response = self.client.get('/entries/{}/relationships/blog'.format(self.entry.id))
+        url = reverse('entry-relationships', kwargs={'pk': self.entry.id, 'related_field': 'blog'})
+        response = self.client.get(url)
         expected_data = {'type': format_relation_name('Blog'), 'id': str(self.entry.blog.id)}
 
         assert response.data == expected_data

example/urls.py

@@ -1,8 +1,7 @@
 from django.conf.urls import include, url
 from rest_framework import routers
 
-from example.views import BlogViewSet, EntryViewSet, AuthorViewSet, EntryRelationshipView, BlogRelationshipView
-
+from example.views import BlogViewSet, EntryViewSet, AuthorViewSet
 
 router = routers.DefaultRouter(trailing_slash=False)
 
@@ -12,8 +11,4 @@
 
 urlpatterns = [
     url(r'^', include(router.urls)),
-
-    url(r'^entries/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)', EntryRelationshipView.as_view()),
-    url(r'^blogs/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)', BlogRelationshipView.as_view())
-
 ]

example/urls_test.py

@@ -1,7 +1,7 @@
 from django.conf.urls import include, url
 from rest_framework import routers
 
-from example.views import BlogViewSet, EntryViewSet, AuthorViewSet
+from example.views import BlogViewSet, EntryViewSet, AuthorViewSet, EntryRelationshipView, BlogRelationshipView
 from .api.resources.identity import Identity, GenericIdentity
 
 router = routers.DefaultRouter(trailing_slash=False)
@@ -19,5 +19,13 @@
     # old tests
     url(r'identities/default/(?P<pk>\d+)',
         GenericIdentity.as_view(), name='user-default'),
+
+
+    url(r'^entries/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
+        EntryRelationshipView.as_view(),
+        name='entry-relationships'),
+    url(r'^blogs/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
+        BlogRelationshipView.as_view(),
+        name='blog-relationships'),
 ]
 

rest_framework_json_api/views.py

@@ -1,17 +1,20 @@
+from django.db.models import Model, QuerySet
+from django.db.models.manager import BaseManager
 from rest_framework import generics
 from rest_framework.response import Response
+from rest_framework.renderers import JSONRenderer
 from rest_framework_json_api.serializers import ResourceIdentifierObjectSerializer
 from rest_framework.exceptions import NotFound
 
 
 class RelationshipView(generics.GenericAPIView):
     serializer_class = ResourceIdentifierObjectSerializer
+    renderer_classes = (JSONRenderer, )
 
     def get(self, request, *args, **kwargs):
         related_instance = self.get_related_instance(kwargs)
-        serializer_class = self.get_serializer_class()
-        serializer = serializer_class(instance=related_instance)
-        return Response(serializer.data)
+        serializer_instance = self.instantiate_serializer(related_instance)
+        return Response(serializer_instance.data)
 
     def put(self, request, *args, **kwargs):
         return Response()
@@ -30,3 +33,15 @@ def get_related_instance(self, kwargs):
             return getattr(self.get_object(), kwargs['related_field'])
         except AttributeError:
             raise NotFound
+
+    def instantiate_serializer(self, instance):
+        serializer_class = self.get_serializer_class()
+        if isinstance(instance, Model):
+            return serializer_class(instance=instance)
+        else:
+            if isinstance(instance, (QuerySet, BaseManager)):
+                instance = instance.all()
+
+            return serializer_class(instance=instance, many=True)
+
+