From 3d744f032fb1b9042f027d3fd544b64e543a2354 Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Thu, 31 Jul 2025 12:35:13 +0200
Subject: [PATCH] Make _EventDeviceRegistryUpdatedData_Remove JSON serializable
 (#149734)

---
 homeassistant/helpers/device_registry.py |  4 ++--
 homeassistant/helpers/entity_registry.py |  6 +++---
 tests/helpers/test_device_registry.py    | 20 ++++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py
index bc6e7c810bf..c8b4428a7cc 100644
--- a/homeassistant/helpers/device_registry.py
+++ b/homeassistant/helpers/device_registry.py
@@ -156,7 +156,7 @@ class _EventDeviceRegistryUpdatedData_Remove(TypedDict):
 
     action: Literal["remove"]
     device_id: str
-    device: DeviceEntry
+    device: dict[str, Any]
 
 
 class _EventDeviceRegistryUpdatedData_Update(TypedDict):
@@ -1319,7 +1319,7 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
         self.hass.bus.async_fire_internal(
             EVENT_DEVICE_REGISTRY_UPDATED,
             _EventDeviceRegistryUpdatedData_Remove(
-                action="remove", device_id=device_id, device=device
+                action="remove", device_id=device_id, device=device.dict_repr
             ),
         )
         self.async_schedule_save()
diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py
index 7051521b805..d972b421fc4 100644
--- a/homeassistant/helpers/entity_registry.py
+++ b/homeassistant/helpers/entity_registry.py
@@ -1103,13 +1103,13 @@ class EntityRegistry(BaseRegistry):
             entities = async_entries_for_device(
                 self, event.data["device_id"], include_disabled_entities=True
             )
-            removed_device = event.data["device"]
+            removed_device_dict = event.data["device"]
             for entity in entities:
                 config_entry_id = entity.config_entry_id
                 if (
-                    config_entry_id in removed_device.config_entries
+                    config_entry_id in removed_device_dict["config_entries"]
                     and entity.config_subentry_id
-                    in removed_device.config_entries_subentries[config_entry_id]
+                    in removed_device_dict["config_entries_subentries"][config_entry_id]
                 ):
                     self.async_remove(entity.entity_id)
                 else:
diff --git a/tests/helpers/test_device_registry.py b/tests/helpers/test_device_registry.py
index 23a451dd06c..a66684c94e3 100644
--- a/tests/helpers/test_device_registry.py
+++ b/tests/helpers/test_device_registry.py
@@ -1652,7 +1652,7 @@ async def test_removing_config_entries(
     assert update_events[4].data == {
         "action": "remove",
         "device_id": entry3.id,
-        "device": entry3,
+        "device": entry3.dict_repr,
     }
 
 
@@ -1725,12 +1725,12 @@ async def test_deleted_device_removing_config_entries(
     assert update_events[3].data == {
         "action": "remove",
         "device_id": entry.id,
-        "device": entry2,
+        "device": entry2.dict_repr,
     }
     assert update_events[4].data == {
         "action": "remove",
         "device_id": entry3.id,
-        "device": entry3,
+        "device": entry3.dict_repr,
     }
 
     device_registry.async_clear_config_entry(config_entry_1.entry_id)
@@ -1976,7 +1976,7 @@ async def test_removing_config_subentries(
     assert update_events[7].data == {
         "action": "remove",
         "device_id": entry.id,
-        "device": entry,
+        "device": entry.dict_repr,
     }
 
 
@@ -2106,7 +2106,7 @@ async def test_deleted_device_removing_config_subentries(
     assert update_events[4].data == {
         "action": "remove",
         "device_id": entry.id,
-        "device": entry4,
+        "device": entry4.dict_repr,
     }
 
     device_registry.async_clear_config_subentry(config_entry_1.entry_id, None)
@@ -2930,7 +2930,7 @@ async def test_update_remove_config_entries(
     assert update_events[6].data == {
         "action": "remove",
         "device_id": entry3.id,
-        "device": entry3,
+        "device": entry3.dict_repr,
     }
 
 
@@ -3208,7 +3208,7 @@ async def test_update_remove_config_subentries(
     assert update_events[7].data == {
         "action": "remove",
         "device_id": entry_id,
-        "device": entry_before_remove,
+        "device": entry_before_remove.dict_repr,
     }
 
 
@@ -3551,7 +3551,7 @@ async def test_restore_device(
     assert update_events[2].data == {
         "action": "remove",
         "device_id": entry.id,
-        "device": entry,
+        "device": entry.dict_repr,
     }
     assert update_events[3].data == {
         "action": "create",
@@ -3874,7 +3874,7 @@ async def test_restore_shared_device(
     assert update_events[3].data == {
         "action": "remove",
         "device_id": entry.id,
-        "device": updated_device,
+        "device": updated_device.dict_repr,
     }
     assert update_events[4].data == {
         "action": "create",
@@ -3883,7 +3883,7 @@ async def test_restore_shared_device(
     assert update_events[5].data == {
         "action": "remove",
         "device_id": entry.id,
-        "device": entry2,
+        "device": entry2.dict_repr,
     }
     assert update_events[6].data == {
         "action": "create",