fix(cbc): align with confirmed API contract for entity data response

REST API team confirmed: - metadata.entityId is the correct field name (was entityName) - content.item / content.items struct is correct (already was) - ?appTenantId= query param is correct (already was) Since metadata.entityId equals the entity_id already known from the URL path, drop the metadata read entirely — entity_id is used directly. Remove the now-redundant resolved_id fallback and the deleted test_falls_back_to_path_entity_id_without_metadata test. Strip stale metadata fields from remaining mock response bodies.
soumyadey · Sep 13, 2026 · Sep 14, 2026 · Sep 14, 2026 · Sep 16, 2026 · Sep 18, 2026
commit 12ff0de69a6e82980dedffffab85582e91db022c
@@ -348,7 +348,6 @@ def _fetch_entity_data(
         )
         body = self._request("GET", url).json()
 
-        api_meta = body.get("metadata", {}) if isinstance(body, dict) else {}
         content = body.get("content", {}) if isinstance(body, dict) else {}
         shape = body.get("contentShape") if isinstance(body, dict) else None
         if shape == "OBJECT":
@@ -357,8 +356,7 @@ def _fetch_entity_data(
             # ARRAY / UNSPECIFIED / absent — items may be absent or empty.
             raw_data = content.get("items", [])
 
-        resolved_id = api_meta.get("entityName") or entity_id
-        return ConfigEntity(entity_id=resolved_id, data=EntityData(raw_data))
+        return ConfigEntity(entity_id=entity_id, data=EntityData(raw_data))
 
     def _configurations_url(self, base_url: str, path: str = "") -> str:
         base = base_url.rstrip("/")

@@ -186,10 +186,6 @@ def test_reads_array_content_items(self):
         client, mock_http = _make_client()
         mock_http.request.return_value = _mock_response(
             json_body={
-                "metadata": {
-                    "entityName": "tax-category",
-                    "configurationObjectId": "tax-config",
-                },
                 "contentShape": "ARRAY",
                 "content": {"items": [{"code": "STD"}], "adaptedKeys": []},
             }
@@ -208,10 +204,6 @@ def test_reads_object_content_item(self):
         client, mock_http = _make_client()
         mock_http.request.return_value = _mock_response(
             json_body={
-                "metadata": {
-                    "entityName": "globalSettings",
-                    "configurationObjectId": "pmc-settings",
-                },
                 "contentShape": "OBJECT",
                 "content": {"item": {"maxRetries": 3, "timeoutSeconds": 30}},
             }
@@ -229,7 +221,7 @@ def test_reads_object_content_item(self):
     def test_defaults_to_empty_list_when_content_absent(self):
         client, mock_http = _make_client()
         mock_http.request.return_value = _mock_response(
-            json_body={"metadata": {"entityName": "policy"}, "contentShape": "ARRAY"}
+            json_body={"contentShape": "ARRAY"}
         )
         result = client._fetch_entity_data(
             "https://cbc.example.ondemand.com",
@@ -240,20 +232,6 @@ def test_defaults_to_empty_list_when_content_absent(self):
         )
         assert result.data.as_list() == []
 
-    def test_falls_back_to_path_entity_id_without_metadata(self):
-        client, mock_http = _make_client()
-        mock_http.request.return_value = _mock_response(
-            json_body={"contentShape": "ARRAY", "content": {"items": []}}
-        )
-        result = client._fetch_entity_data(
-            "https://cbc.example.ondemand.com",
-            "app-tenant",
-            "cv1",
-            "tax-config",
-            "tax-rate",
-        )
-        assert result.entity_id == "tax-rate"
-
 
 # ---------------------------------------------------------------------------
 # DefaultClient — get_configuration
@@ -292,7 +270,6 @@ def test_uses_explicit_consumption_version(self):
         )
         data_response = _mock_response(
             json_body={
-                "metadata": {"entityName": "payment-mode"},
                 "contentShape": "ARRAY",
                 "content": {"items": [{"k": "v"}]},
             }