From 8d27ca1e21547978a38d702346a9089e80204d10 Mon Sep 17 00:00:00 2001
From: Manu <4445816+tr4nt0r@users.noreply.github.com>
Date: Wed, 30 Jul 2025 19:59:01 +0200
Subject: [PATCH] Fix `KeyError` in friends coordinator (#149684)

---
 .../components/playstation_network/coordinator.py         | 8 +++++---
 tests/components/playstation_network/conftest.py          | 8 ++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/playstation_network/coordinator.py b/homeassistant/components/playstation_network/coordinator.py
index c447e8dc503..977632de23b 100644
--- a/homeassistant/components/playstation_network/coordinator.py
+++ b/homeassistant/components/playstation_network/coordinator.py
@@ -6,7 +6,7 @@ from abc import abstractmethod
 from dataclasses import dataclass
 from datetime import timedelta
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from psnawp_api.core.psnawp_exceptions import (
     PSNAWPAuthenticationError,
@@ -29,7 +29,7 @@ from homeassistant.exceptions import (
 )
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_ACCOUNT_ID, DOMAIN
+from .const import DOMAIN
 from .helpers import PlaystationNetwork, PlaystationNetworkData
 
 _LOGGER = logging.getLogger(__name__)
@@ -176,7 +176,9 @@ class PlaystationNetworkFriendDataCoordinator(
 
     def _setup(self) -> None:
         """Set up the coordinator."""
-        self.user = self.psn.psn.user(account_id=self.subentry.data[CONF_ACCOUNT_ID])
+        if TYPE_CHECKING:
+            assert self.subentry.unique_id
+        self.user = self.psn.psn.user(account_id=self.subentry.unique_id)
         self.profile = self.user.profile()
 
     async def _async_setup(self) -> None:
diff --git a/tests/components/playstation_network/conftest.py b/tests/components/playstation_network/conftest.py
index ab4edc0e3f4..bfbdc9a72bd 100644
--- a/tests/components/playstation_network/conftest.py
+++ b/tests/components/playstation_network/conftest.py
@@ -14,11 +14,7 @@ from psnawp_api.models.trophies import (
 )
 import pytest
 
-from homeassistant.components.playstation_network.const import (
-    CONF_ACCOUNT_ID,
-    CONF_NPSSO,
-    DOMAIN,
-)
+from homeassistant.components.playstation_network.const import CONF_NPSSO, DOMAIN
 from homeassistant.config_entries import ConfigSubentryData
 
 from tests.common import MockConfigEntry
@@ -40,7 +36,7 @@ def mock_config_entry() -> MockConfigEntry:
         unique_id=PSN_ID,
         subentries_data=[
             ConfigSubentryData(
-                data={CONF_ACCOUNT_ID: "fren-psn-id"},
+                data={},
                 subentry_id="ABCDEF",
                 subentry_type="friend",
                 title="PublicUniversalFriend",