From 7cc61d1b861941406455437e82cef09ffb1eb8f6 Mon Sep 17 00:00:00 2001
From: Manu <4445816+tr4nt0r@users.noreply.github.com>
Date: Tue, 14 Jan 2025 14:07:07 +0100
Subject: [PATCH] Skip fetching deactivated shopping lists in Bring integration
 (#135336)

Co-authored-by: Joost Lekkerkerker <joostlek@outlook.com>
---
 homeassistant/components/bring/coordinator.py |  2 +
 homeassistant/components/bring/entity.py      |  2 +-
 tests/components/bring/test_init.py           | 38 ++++++++++++++++++-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/bring/coordinator.py b/homeassistant/components/bring/coordinator.py
index 7678213f117..a8d0a4ec322 100644
--- a/homeassistant/components/bring/coordinator.py
+++ b/homeassistant/components/bring/coordinator.py
@@ -70,6 +70,8 @@ class BringDataUpdateCoordinator(DataUpdateCoordinator[dict[str, BringData]]):
 
         list_dict: dict[str, BringData] = {}
         for lst in lists_response["lists"]:
+            if (ctx := set(self.async_contexts())) and lst["listUuid"] not in ctx:
+                continue
             try:
                 items = await self.bring.get_list(lst["listUuid"])
             except BringRequestException as e:
diff --git a/homeassistant/components/bring/entity.py b/homeassistant/components/bring/entity.py
index 5b6bf975764..a1e0cb2edc0 100644
--- a/homeassistant/components/bring/entity.py
+++ b/homeassistant/components/bring/entity.py
@@ -20,7 +20,7 @@ class BringBaseEntity(CoordinatorEntity[BringDataUpdateCoordinator]):
         bring_list: BringData,
     ) -> None:
         """Initialize the entity."""
-        super().__init__(coordinator)
+        super().__init__(coordinator, bring_list["listUuid"])
 
         self._list_uuid = bring_list["listUuid"]
 
diff --git a/tests/components/bring/test_init.py b/tests/components/bring/test_init.py
index 5ee66999ea4..659a4768600 100644
--- a/tests/components/bring/test_init.py
+++ b/tests/components/bring/test_init.py
@@ -1,7 +1,9 @@
 """Unit tests for the bring integration."""
 
+from datetime import timedelta
 from unittest.mock import AsyncMock
 
+from freezegun.api import FrozenDateTimeFactory
 import pytest
 
 from homeassistant.components.bring import (
@@ -11,11 +13,14 @@ from homeassistant.components.bring import (
     async_setup_entry,
 )
 from homeassistant.components.bring.const import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
+from homeassistant.config_entries import ConfigEntryDisabler, ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr
 
-from tests.common import MockConfigEntry
+from .conftest import UUID
+
+from tests.common import MockConfigEntry, async_fire_time_changed
 
 
 async def setup_integration(
@@ -133,3 +138,32 @@ async def test_config_entry_not_ready_auth_error(
     await hass.async_block_till_done()
 
     assert bring_config_entry.state is ConfigEntryState.SETUP_RETRY
+
+
+@pytest.mark.usefixtures("mock_bring_client")
+async def test_coordinator_skips_deactivated(
+    hass: HomeAssistant,
+    bring_config_entry: MockConfigEntry,
+    freezer: FrozenDateTimeFactory,
+    mock_bring_client: AsyncMock,
+    device_registry: dr.DeviceRegistry,
+) -> None:
+    """Test the coordinator skips fetching lists for deactivated lists."""
+    await setup_integration(hass, bring_config_entry)
+
+    assert bring_config_entry.state is ConfigEntryState.LOADED
+
+    assert mock_bring_client.get_list.await_count == 2
+
+    device = device_registry.async_get_device(
+        identifiers={(DOMAIN, f"{UUID}_b4776778-7f6c-496e-951b-92a35d3db0dd")}
+    )
+    device_registry.async_update_device(device.id, disabled_by=ConfigEntryDisabler.USER)
+
+    mock_bring_client.get_list.reset_mock()
+
+    freezer.tick(timedelta(seconds=90))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    assert mock_bring_client.get_list.await_count == 1