Adding tests and cleanup

Author: bashlyss

AUTHORS

@@ -2,6 +2,7 @@ Adam Wróbel <https://adamwrobel.com>
 Adam Ziolkowski <adam@adsized.com>
 Alan Crosswell <alan@columbia.edu>
 Anton Shutik <shutikanton@gmail.com>
+Ashley Loewen <github@ashleycodes.tech>
 Asif Saif Uddin <auvipy@gmail.com>
 Beni Keller <beni@matraxi.ch>
 Boris Pleshakov <koordinator.kun@gmail.com>

rest_framework_json_api/utils.py

@@ -211,21 +211,15 @@ def get_related_resource_type(relation):
         relation_model = relation.model
     elif hasattr(relation, "get_queryset") and relation.get_queryset() is not None:
         relation_model = relation.get_queryset().model
-    elif (
-        getattr(relation, "many", False)
-        and hasattr(relation.child, "Meta")
-        and hasattr(relation.child.Meta, "model")
-    ):
-        # For ManyToMany relationships, get the model from the child
-        # serializer of the list serializer
-        relation_model = relation.child.Meta.model
-    elif (
-        hasattr(relation, "child_relation")
-        and hasattr(relation.child_relation, "model")
-    ):
+    elif hasattr(relation, "child_relation"):
         # For ManyRelatedField relationships, get the model from the child relationship
-        relation_model = relation.child_relation.model
-    else:
+        try:
+            return get_related_resource_type(relation.child_relation)
+        except AttributeError:
+            # Some read only relationships fail to get it directly, fall through to
+            # get via the parent
+            pass
+    if not relation_model:
         parent_serializer = relation.parent
         parent_model = None
         if isinstance(parent_serializer, PolymorphicModelSerializer):

tests/models.py

@@ -39,3 +39,14 @@ class ForeignKeySource(DJAModel):
     target = models.ForeignKey(
         ForeignKeyTarget, related_name="sources", on_delete=models.CASCADE
     )
+
+
+class NestedRelationshipSource(DJAModel):
+    m2m_source = models.ManyToManyField(ManyToManySource, related_name="nested_source")
+    fk_source = models.ForeignKey(
+        ForeignKeySource, related_name="nested_source", on_delete=models.CASCADE
+    )
+    m2m_target = models.ManyToManyField(ManyToManySource, related_name="nested_source")
+    fk_target = models.ForeignKey(
+        ForeignKeySource, related_name="nested_source", on_delete=models.CASCADE
+    )

tests/test_utils.py

@@ -25,6 +25,7 @@
     ForeignKeyTarget,
     ManyToManySource,
     ManyToManyTarget,
+    NestedRelationshipSource,
 )
 from tests.serializers import BasicModelSerializer
 
@@ -313,6 +314,52 @@ class Meta:
     assert get_related_resource_type(field) == output
 
 
+@pytest.mark.parametrize(
+    "model_class,field,output,related_field_kwargs",
+    [
+        (
+            NestedRelationshipSource,
+            "m2m_source.targets",
+            "ManyToManyTarget",
+            {"many": True, "queryset": ManyToManyTarget.objects.all()},
+        ),
+        (
+            NestedRelationshipSource,
+            "m2m_target.sources.",
+            "ManyToManySource",
+            {"many": True, "queryset": ManyToManySource.objects.all()},
+        ),
+        (
+            NestedRelationshipSource,
+            "fk_source.target",
+            "ForeignKeyTarget",
+            {"many": True, "queryset": ForeignKeyTarget.objects.all()},
+        ),
+        (
+            NestedRelationshipSource,
+            "fk_target.source",
+            "ForeignKeySource",
+            {"many": True, "queryset": ForeignKeySource.objects.all()},
+        ),
+    ],
+)
+def test_get_related_resource_type_nested_source(
+    model_class, field, output, related_field_kwargs
+):
+    class RelatedResourceTypeSerializer(serializers.ModelSerializer):
+        relationship = serializers.ResourceRelatedField(
+            source=field, **related_field_kwargs
+        )
+
+        class Meta:
+            model = model_class
+            fields = ("relationship",)
+
+    serializer = RelatedResourceTypeSerializer()
+    field = serializer.fields["relationship"]
+    assert get_related_resource_type(field) == output
+
+
 @pytest.mark.parametrize(
     "related_field_kwargs,output",
     [