From 654e111c23e02195886f617353f4cea7fd3bb242 Mon Sep 17 00:00:00 2001
From: Christopher Fenner <9592452+CFenner@users.noreply.github.com>
Date: Sun, 19 Jan 2025 13:39:38 +0100
Subject: [PATCH] Fix fan speed in auto mode in ViCare integration (#134256)

---
 homeassistant/components/vicare/fan.py    |  9 +++++++--
 homeassistant/components/vicare/sensor.py |  9 +++------
 homeassistant/components/vicare/utils.py  |  5 +++++
 tests/components/vicare/test_utils.py     | 23 +++++++++++++++++++++++
 4 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 tests/components/vicare/test_utils.py

diff --git a/homeassistant/components/vicare/fan.py b/homeassistant/components/vicare/fan.py
index 69aa8396fea..fc18bdbd8da 100644
--- a/homeassistant/components/vicare/fan.py
+++ b/homeassistant/components/vicare/fan.py
@@ -28,7 +28,7 @@ from homeassistant.util.percentage import (
 
 from .entity import ViCareEntity
 from .types import ViCareConfigEntry, ViCareDevice
-from .utils import get_device_serial
+from .utils import filter_state, get_device_serial
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -143,15 +143,20 @@ class ViCareFan(ViCareEntity, FanEntity):
 
     def update(self) -> None:
         """Update state of fan."""
+        level: str | None = None
         try:
             with suppress(PyViCareNotSupportedFeatureError):
                 self._attr_preset_mode = VentilationMode.from_vicare_mode(
                     self._api.getActiveMode()
                 )
             with suppress(PyViCareNotSupportedFeatureError):
+                level = filter_state(self._api.getVentilationLevel())
+            if level is not None and level in ORDERED_NAMED_FAN_SPEEDS:
                 self._attr_percentage = ordered_list_item_to_percentage(
-                    ORDERED_NAMED_FAN_SPEEDS, self._api.getActiveProgram()
+                    ORDERED_NAMED_FAN_SPEEDS, VentilationProgram(level)
                 )
+            else:
+                self._attr_percentage = 0
         except RequestConnectionError:
             _LOGGER.error("Unable to retrieve data from ViCare server")
         except ValueError:
diff --git a/homeassistant/components/vicare/sensor.py b/homeassistant/components/vicare/sensor.py
index 1dade9ddda7..ba0191c5cd2 100644
--- a/homeassistant/components/vicare/sensor.py
+++ b/homeassistant/components/vicare/sensor.py
@@ -49,6 +49,7 @@ from .const import (
 from .entity import ViCareEntity
 from .types import ViCareConfigEntry, ViCareDevice, ViCareRequiredKeysMixin
 from .utils import (
+    filter_state,
     get_burners,
     get_circuits,
     get_compressors,
@@ -796,7 +797,7 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
         translation_key="photovoltaic_status",
         device_class=SensorDeviceClass.ENUM,
         options=["ready", "production"],
-        value_getter=lambda api: _filter_states(api.getPhotovoltaicStatus()),
+        value_getter=lambda api: filter_state(api.getPhotovoltaicStatus()),
     ),
     ViCareSensorEntityDescription(
         key="room_temperature",
@@ -815,7 +816,7 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
     ViCareSensorEntityDescription(
         key="ventilation_level",
         translation_key="ventilation_level",
-        value_getter=lambda api: _filter_states(api.getVentilationLevel().lower()),
+        value_getter=lambda api: filter_state(api.getVentilationLevel().lower()),
         device_class=SensorDeviceClass.ENUM,
         options=["standby", "levelone", "leveltwo", "levelthree", "levelfour"],
     ),
@@ -943,10 +944,6 @@ COMPRESSOR_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
 )
 
 
-def _filter_states(state: str) -> str | None:
-    return None if state in ("nothing", "unknown") else state
-
-
 def _build_entities(
     device_list: list[ViCareDevice],
 ) -> list[ViCareSensor]:
diff --git a/homeassistant/components/vicare/utils.py b/homeassistant/components/vicare/utils.py
index 120dad83113..a2c31df4259 100644
--- a/homeassistant/components/vicare/utils.py
+++ b/homeassistant/components/vicare/utils.py
@@ -128,3 +128,8 @@ def get_compressors(device: PyViCareDevice) -> list[PyViCareHeatingDeviceCompone
     except AttributeError as error:
         _LOGGER.debug("No compressors found: %s", error)
     return []
+
+
+def filter_state(state: str) -> str | None:
+    """Remove invalid states."""
+    return None if state in ("nothing", "unknown") else state
diff --git a/tests/components/vicare/test_utils.py b/tests/components/vicare/test_utils.py
new file mode 100644
index 00000000000..13ca77f2792
--- /dev/null
+++ b/tests/components/vicare/test_utils.py
@@ -0,0 +1,23 @@
+"""Test ViCare utils."""
+
+import pytest
+
+from homeassistant.components.vicare.utils import filter_state
+
+
+@pytest.mark.parametrize(
+    ("state", "expected_result"),
+    [
+        (None, None),
+        ("unknown", None),
+        ("nothing", None),
+        ("levelOne", "levelOne"),
+    ],
+)
+async def test_filter_state(
+    state: str | None,
+    expected_result: str | None,
+) -> None:
+    """Test filter_state."""
+
+    assert filter_state(state) == expected_result