Cleaning up code and add changelog

Author: sliverc

CHANGELOG.md

@@ -13,6 +13,7 @@ any parts of the framework not mentioned in the documentation should generally b
 ### Fixed
 
 * Fixed invalid relationship pointer in error objects when field naming formatting is used.
+* Properly resolved related resource type when nested source field is defined.
 
 ## [5.0.0] - 2022-01-03
 

tests/models.py

@@ -41,7 +41,7 @@ class ForeignKeySource(DJAModel):
     )
 
 
-class NestedRelationshipSource(DJAModel):
+class NestedRelatedSource(DJAModel):
     m2m_source = models.ManyToManyField(ManyToManySource, related_name="nested_source")
     fk_source = models.ForeignKey(
         ForeignKeySource, related_name="nested_source", on_delete=models.CASCADE

tests/test_utils.py

@@ -25,7 +25,7 @@
     ForeignKeyTarget,
     ManyToManySource,
     ManyToManyTarget,
-    NestedRelationshipSource,
+    NestedRelatedSource,
 )
 from tests.serializers import BasicModelSerializer
 
@@ -315,48 +315,44 @@ class Meta:
 
 
 @pytest.mark.parametrize(
-    "model_class,field,output,related_field_kwargs",
+    "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
+def test_get_related_resource_type_from_nested_source(
+    db, field, output, related_field_kwargs
 ):
     class RelatedResourceTypeSerializer(serializers.ModelSerializer):
-        relationship = serializers.ResourceRelatedField(
+        relation = serializers.ResourceRelatedField(
             source=field, **related_field_kwargs
         )
 
         class Meta:
-            model = model_class
-            fields = ("relationship",)
+            model = NestedRelatedSource
+            fields = ("relation",)
 
     serializer = RelatedResourceTypeSerializer()
-    field = serializer.fields["relationship"]
+    field = serializer.fields["relation"]
     assert get_related_resource_type(field) == output