From 928569eba2ae0f98dfd67f6282b296d245e6d358 Mon Sep 17 00:00:00 2001
From: Humayun Ahmad <humayunah619@gmail.com>
Date: Tue, 23 Jul 2024 02:55:39 +0500
Subject: [PATCH] handle zero as valid pk/id in get_resource_id util method -
 update tests to include cases where ID is zero

---
 AUTHORS                          |  1 +
 CHANGELOG.md                     |  1 +
 rest_framework_json_api/utils.py | 10 ++++++----
 tests/test_utils.py              |  7 +++++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 7f4a8237..2f7e4d7f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -52,3 +52,4 @@ Tim Selman <timcbaoth@gmail.com>
 Tom Glowka <glowka.tom@gmail.com>
 Ulrich Schuster <ulrich.schuster@mailworks.org>
 Yaniv Peer <yanivpeer@gmail.com>
+Humayun Ahmad <humayunahbh@gmail.com>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c3c7720..b5759b17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ any parts of the framework not mentioned in the documentation should generally b
 
 * Allow overwriting of url field again (regression since 7.0.0)
 * Ensured that no fields are rendered when sparse fields is set to an empty value. (regression since 7.0.0)
+* Handled zero as a valid ID in `get_resource_id` function.
 
 ## [7.0.1] - 2024-06-06
 
diff --git a/rest_framework_json_api/utils.py b/rest_framework_json_api/utils.py
index e12080ac..25f78872 100644
--- a/rest_framework_json_api/utils.py
+++ b/rest_framework_json_api/utils.py
@@ -307,12 +307,14 @@ 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
+        return (
+            encoding.force_str(resource["id"]) if resource["id"] is not None else None
+        )
     if resource_instance:
         return (
-            hasattr(resource_instance, "pk")
-            and encoding.force_str(resource_instance.pk)
-            or None
+            encoding.force_str(resource_instance.pk)
+            if hasattr(resource_instance, "pk") and resource_instance.pk is not None
+            else None
         )
     return None
 
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 4e103ae2..a3beb12e 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -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",
+        ),
     ],
 )
 def test_get_resource_id(resource_instance, resource, expected):