Jul 23, 2024 · Jul 22, 2024 · Jul 23, 2024 · Jul 23, 2024 · Jul 23, 2024
diff --git a/AUTHORS b/AUTHORS
 David Vogt <david.vogt@adfinis-sygroup.ch>
 Felix Viernickel <felix@gedankenspieler.org>
 Greg Aker <greg@gregaker.net>
 Humayun Ahmad <humayunahbh@gmail.com>
 Jamie Bliss <astronouth7303@gmail.com>
 Jason Housley <housleyjk@gmail.com>
 Jeppe Fihl-Pearson <jeppe@tenzer.dk>
diff --git a/CHANGELOG.md b/CHANGELOG.md
 Note that in line with[Django REST framework policy](https://www.django-rest-framework.org/topics/release-notes/),
 any parts of the framework not mentioned in the documentation should generally be considered private API, and may be subject to change.

 ##[Unreleased]

 ###Fixed

 * Handled zero as a valid ID for resource (regression since 6.1.0)

 ##[7.0.2] - 2024-06-28

 ###Fixed
diff --git a/rest_framework_json_api/utils.py b/rest_framework_json_api/utils.py
 def get_resource_id(resource_instance, resource):
    """Returns the resource identifier for a given instance (`id` takes priority over `pk`)."""
    if resource and "id" in resource:
        return resource["id"] and encoding.force_str(resource["id"]) or None
        _id = resource["id"]
        return encoding.force_str(_id) if _id is not None else None
    if resource_instance:
        return (
            hasattr(resource_instance, "pk")
            and encoding.force_str(resource_instance.pk)
            or None
        )
        pk = getattr(resource_instance, "pk", None)
        return encoding.force_str(pk) if pk is not None else None
    return None


diff --git a/tests/test_utils.py b/tests/test_utils.py
        (None, {"id":11},"11"),
        (object(), {"pk":11},None),
        (BasicModel(id=6), {"id":11},"11"),
        (BasicModel(id=0),None,"0"),
        (None, {"id":0},"0"),
        (
 BasicModel(id=0),
            {"id":0},
 "0",
        ),
    ],
 )
 deftest_get_resource_id(resource_instance,resource,expected):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,6 +15,7 @@ David Guillot, for Contexte <dguillot@contexte.com>
		David Vogt <david.vogt@adfinis-sygroup.ch>
		Felix Viernickel <felix@gedankenspieler.org>
		Greg Aker <greg@gregaker.net>
		Humayun Ahmad <humayunahbh@gmail.com>
		Jamie Bliss <astronouth7303@gmail.com>
		Jason Housley <housleyjk@gmail.com>
		Jeppe Fihl-Pearson <jeppe@tenzer.dk>
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
		Note that in line with[Django REST framework policy](https://www.django-rest-framework.org/topics/release-notes/),
		any parts of the framework not mentioned in the documentation should generally be considered private API, and may be subject to change.

		##[Unreleased]

		###Fixed

		* Handled zero as a valid ID for resource (regression since 6.1.0)

		##[7.0.2] - 2024-06-28

		###Fixed
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -307,13 +307,11 @@ def get_resource_type_from_serializer(serializer):
		def get_resource_id(resource_instance, resource):
		"""Returns the resource identifier for a given instance (`id` takes priority over `pk`)."""
		if resource and "id" in resource:
		return resource["id"] and encoding.force_str(resource["id"]) or None
		_id = resource["id"]
		return encoding.force_str(_id) if _id is not None else None
		if resource_instance:
		return (
		hasattr(resource_instance, "pk")
		and encoding.force_str(resource_instance.pk)
		or None
		)
		pk = getattr(resource_instance, "pk", None)
		return encoding.force_str(pk) if pk is not None else None
		return None


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -403,6 +403,13 @@ class SerializerWithoutResourceName(serializers.Serializer):
		(None, {"id":11},"11"),
		(object(), {"pk":11},None),
		(BasicModel(id=6), {"id":11},"11"),
		(BasicModel(id=0),None,"0"),
		(None, {"id":0},"0"),
		(
		BasicModel(id=0),
		{"id":0},
		"0",
		),
		],
		)
		deftest_get_resource_id(resource_instance,resource,expected):
Expand Down