Use current serializer class

Author: SafaAlfulaij

example/serializers.py

@@ -111,8 +111,8 @@ def __init__(self, *args, **kwargs):
     comments = relations.ResourceRelatedField(many=True, read_only=True)
     # many related hyperlinked from model
     comments_hyperlinked = relations.HyperlinkedRelatedField(
-        related_link_view_name="entry-related",
-        related_link_related_name="comments",
+        related_link_view_name="entry-comments",
+        related_link_url_kwarg="entry_pk",
         self_link_view_name="entry-relationships",
         many=True,
         read_only=True,

example/tests/integration/test_non_paginated_responses.py

@@ -42,7 +42,7 @@ def test_multiple_entries_no_pagination(multiple_entries, client):
                     },
                     "commentsHyperlinked": {
                         "links": {
-                            "related": "http://testserver/entries/1/comments/",
+                            "related": "http://testserver/entries/1/comments",
                             "self": "http://testserver/entries/1/relationships/comments_hyperlinked",
                         }
                     },
@@ -97,7 +97,7 @@ def test_multiple_entries_no_pagination(multiple_entries, client):
                     },
                     "commentsHyperlinked": {
                         "links": {
-                            "related": "http://testserver/entries/2/comments/",
+                            "related": "http://testserver/entries/2/comments",
                             "self": "http://testserver/entries/2/relationships/comments_hyperlinked",
                         }
                     },

example/tests/integration/test_pagination.py

@@ -42,7 +42,7 @@ def test_pagination_with_single_entry(single_entry, client):
                     },
                     "commentsHyperlinked": {
                         "links": {
-                            "related": "http://testserver/entries/1/comments/",
+                            "related": "http://testserver/entries/1/comments",
                             "self": "http://testserver/entries/1/relationships/comments_hyperlinked",
                         }
                     },

example/tests/test_filters.py

@@ -491,7 +491,7 @@ def test_search_keywords(self):
                         "commentsHyperlinked": {
                             "links": {
                                 "self": "http://testserver/entries/7/relationships/comments_hyperlinked",  # noqa: E501
-                                "related": "http://testserver/entries/7/comments/",
+                                "related": "http://testserver/entries/7/comments",
                             }
                         },
                         "suggested": {

example/tests/test_views.py

@@ -651,7 +651,7 @@ def test_get_object_gives_correct_entry(self):
                     "commentsHyperlinked": {
                         "links": {
                             "related": "http://testserver/entries/{}"
-                            "/comments/".format(self.second_entry.id),
+                            "/comments".format(self.second_entry.id),
                             "self": "http://testserver/entries/{}/relationships"
                             "/comments_hyperlinked".format(self.second_entry.id),
                         }

example/urls.py

@@ -45,6 +45,11 @@
         BlogViewSet.as_view({"get": "retrieve"}),
         name="entry-blog",
     ),
+    url(
+        r"entries/(?P<entry_pk>[^/.]+)/comments$",
+        CommentViewSet.as_view({"get": "list"}),
+        name="entry-comments",
+    ),
     url(
         r"entries/(?P<entry_pk>[^/.]+)/authors$",
         AuthorViewSet.as_view({"get": "list"}),
@@ -55,11 +60,6 @@
         EntryViewSet.as_view({"get": "retrieve"}),
         name="entry-featured",
     ),
-    url(
-        r"^entries/(?P<pk>[^/.]+)/(?P<related_field>\w+)/$",
-        EntryViewSet.as_view({"get": "retrieve_related"}),
-        name="entry-related",
-    ),
     url(
         r"^authors/(?P<pk>[^/.]+)/(?P<related_field>\w+)/$",
         AuthorViewSet.as_view({"get": "retrieve_related"}),

example/urls_test.py

@@ -52,6 +52,11 @@
         BlogViewSet.as_view({"get": "retrieve"}),
         name="entry-blog",
     ),
+    re_path(
+        r"^entries/(?P<entry_pk>[^/.]+)/comments$",
+        CommentViewSet.as_view({"get": "list"}),
+        name="entry-comments",
+    ),
     re_path(
         r"^entries/(?P<entry_pk>[^/.]+)/suggested/$",
         EntryViewSet.as_view({"get": "list"}),
@@ -72,11 +77,6 @@
         EntryViewSet.as_view({"get": "retrieve"}),
         name="entry-featured",
     ),
-    re_path(
-        r"^entries/(?P<pk>[^/.]+)/(?P<related_field>\w+)/$",
-        EntryViewSet.as_view({"get": "retrieve_related"}),
-        name="entry-related",
-    ),
     re_path(
         r"^authors/(?P<pk>[^/.]+)/(?P<related_field>\w+)/$",
         AuthorViewSet.as_view({"get": "retrieve_related"}),

rest_framework_json_api/relations.py

@@ -27,7 +27,6 @@
     "related_link_view_name",
     "related_link_lookup_field",
     "related_link_url_kwarg",
-    "related_link_related_name",
 ]
 
 
@@ -69,8 +68,6 @@ def __init__(self, self_link_view_name=None, related_link_view_name=None, **kwar
             "related_link_url_kwarg", self.related_link_lookup_field
         )
 
-        self.related_link_related_name = kwargs.pop("related_link_related_name", None)
-
         # We include this simply for dependency injection in tests.
         # We can't add it as a class attributes or it would expect an
         # implicit `self` argument to be passed.
@@ -122,11 +119,6 @@ def get_links(self, obj=None, lookup_field="pk"):
         self_kwargs.update({"related_field": format_link_segment(field_name)})
         self_link = self.get_url("self", self.self_link_view_name, self_kwargs, request)
 
-        if self.related_link_related_name:
-            self_kwargs.update(
-                {"related_field": format_link_segment(self.related_link_related_name)}
-            )
-
         # Assuming RelatedField will be declared in two ways:
         # 1. url(r'^authors/(?P<pk>[^/.]+)/(?P<related_field>\w+)/$',
         #         AuthorViewSet.as_view({'get': 'retrieve_related'}))

rest_framework_json_api/schemas/openapi.py

@@ -357,15 +357,14 @@ def _expand_related(self, path, method, view, view_endpoints):
             )
             if related_view:
                 action = self._field_is_one_or_many(field, view)
-                if action:
-                    result.append(
-                        (
-                            path.replace("{related_field}", field),
-                            method,
-                            related_view,
-                            action,
-                        )
+                result.append(
+                    (
+                        path.replace("{related_field}", field),
+                        method,
+                        related_view,
+                        action,
                     )
+                )
 
         return result
 
@@ -393,9 +392,6 @@ def _find_related_view(self, view_endpoints, related_serializer, parent_view):
 
     def _field_is_one_or_many(self, field, view):
         serializer = view.get_serializer()
-        if field not in serializer.fields:
-            return None
-
         if isinstance(serializer.fields[field], ManyRelatedField):
             return "list"
         else: