move to setup, remove disabled

Author: tr4nt0r

homeassistant/components/habitica/sensor.py

@@ -261,14 +261,102 @@ async def async_setup_entry(
     """Set up the habitica sensors."""
 
     coordinator = config_entry.runtime_data
+    ent_reg = er.async_get(hass)
+    entities: list[SensorEntity] = []
+    description: SensorEntityDescription
+    for description in SENSOR_DESCRIPTIONS:
+        if description.key is HabitipySensorEntity.HEALTH_MAX:
+            if entity_id := ent_reg.async_get_entity_id(
+                SENSOR_DOMAIN,
+                DOMAIN,
+                f"{config_entry.unique_id}_{description.key}",
+            ):
+                entity_entry = ent_reg.async_get(entity_id)
+                assert entity_entry
+                if entity_entry.disabled:
+                    ent_reg.async_remove(entity_id)
+                    async_delete_issue(
+                        hass,
+                        DOMAIN,
+                        f"deprecated_entity_{description.key}",
+                    )
+                else:
+                    entities.append(HabitipySensor(coordinator, description))
+                    if entity_used_in(hass, entity_id):
+                        async_create_issue(
+                            hass,
+                            DOMAIN,
+                            f"deprecated_entity_{description.key}",
+                            breaks_in_ha_version="2025.8.0",
+                            is_fixable=False,
+                            severity=IssueSeverity.WARNING,
+                            translation_key="deprecated_entity",
+                            translation_placeholders={
+                                "name": str(
+                                    entity_entry.name or entity_entry.original_name
+                                ),
+                                "entity": entity_id,
+                            },
+                        )
+        else:
+            entities.append(HabitipySensor(coordinator, description))
+
+    for description in TASK_SENSOR_DESCRIPTION:
+        if entity_id := ent_reg.async_get_entity_id(
+            SENSOR_DOMAIN,
+            DOMAIN,
+            f"{config_entry.unique_id}_{description.key}",
+        ):
+            entity_entry = ent_reg.async_get(entity_id)
+            assert entity_entry
+            if entity_entry.disabled:
+                ent_reg.async_remove(entity_id)
+                async_delete_issue(
+                    hass,
+                    DOMAIN,
+                    f"deprecated_task_entity_{description.key}",
+                )
+            else:
+                entities.append(HabitipyTaskSensor(coordinator, description))
+                if description.key in (
+                    HabitipySensorEntity.TODOS,
+                    HabitipySensorEntity.DAILIES,
+                ) and entity_used_in(hass, entity_id):
+                    async_create_issue(
+                        hass,
+                        DOMAIN,
+                        f"deprecated_task_entity_{description.key}",
+                        breaks_in_ha_version="2025.2.0",
+                        is_fixable=False,
+                        severity=IssueSeverity.WARNING,
+                        translation_key="deprecated_task_entity",
+                        translation_placeholders={
+                            "task_name": str(
+                                entity_entry.name or entity_entry.original_name
+                            ),
+                            "entity": entity_id,
+                        },
+                    )
+                elif description.key in (
+                    HabitipySensorEntity.REWARDS,
+                    HabitipySensorEntity.HABITS,
+                ) and entity_used_in(hass, entity_id):
+                    async_create_issue(
+                        hass,
+                        DOMAIN,
+                        f"deprecated_task_entity_{description.key}",
+                        breaks_in_ha_version="2025.8.0",
+                        is_fixable=False,
+                        severity=IssueSeverity.WARNING,
+                        translation_key="deprecated_entity",
+                        translation_placeholders={
+                            "name": str(
+                                entity_entry.name or entity_entry.original_name
+                            ),
+                            "entity": entity_id,
+                        },
+                    )
 
-    entities: list[SensorEntity] = [
-        HabitipySensor(coordinator, description) for description in SENSOR_DESCRIPTIONS
-    ]
-    entities.extend(
-        HabitipyTaskSensor(coordinator, description)
-        for description in TASK_SENSOR_DESCRIPTION
-    )
     async_add_entities(entities, True)
 
 
@@ -303,33 +391,7 @@ async def async_added_to_hass(self) -> None:
         """Raise issue when entity is registered and was not disabled."""
         if TYPE_CHECKING:
             assert self.unique_id
-        if entity_id := er.async_get(self.hass).async_get_entity_id(
-            SENSOR_DOMAIN, DOMAIN, self.unique_id
-        ):
-            if (
-                self.enabled
-                and self.entity_description.key is HabitipySensorEntity.HEALTH_MAX
-                and entity_used_in(self.hass, entity_id)
-            ):
-                async_create_issue(
-                    self.hass,
-                    DOMAIN,
-                    f"deprecated_entity_{self.entity_description.key}",
-                    breaks_in_ha_version="2025.8.0",
-                    is_fixable=False,
-                    severity=IssueSeverity.WARNING,
-                    translation_key="deprecated_entity",
-                    translation_placeholders={
-                        "name": str(self.name),
-                        "entity": entity_id,
-                    },
-                )
-            else:
-                async_delete_issue(
-                    self.hass,
-                    DOMAIN,
-                    f"deprecated_entity_{self.entity_description.key}",
-                )
+
         await super().async_added_to_hass()
 
 
@@ -359,56 +421,3 @@ def extra_state_attributes(self) -> Mapping[str, Any] | None:
                     task[map_key] = value
             attrs[str(task_id)] = task
         return attrs
-
-    async def async_added_to_hass(self) -> None:
-        """Raise issue when entity is registered and was not disabled."""
-        if TYPE_CHECKING:
-            assert self.unique_id
-        if entity_id := er.async_get(self.hass).async_get_entity_id(
-            SENSOR_DOMAIN, DOMAIN, self.unique_id
-        ):
-            if (
-                self.enabled
-                and self.entity_description.key
-                in (HabitipySensorEntity.TODOS, HabitipySensorEntity.DAILIES)
-                and entity_used_in(self.hass, entity_id)
-            ):
-                async_create_issue(
-                    self.hass,
-                    DOMAIN,
-                    f"deprecated_task_entity_{self.entity_description.key}",
-                    breaks_in_ha_version="2025.2.0",
-                    is_fixable=False,
-                    severity=IssueSeverity.WARNING,
-                    translation_key="deprecated_task_entity",
-                    translation_placeholders={
-                        "task_name": str(self.name),
-                        "entity": entity_id,
-                    },
-                )
-            elif (
-                self.enabled
-                and self.entity_description.key
-                in (HabitipySensorEntity.REWARDS, HabitipySensorEntity.HABITS)
-                and entity_used_in(self.hass, entity_id)
-            ):
-                async_create_issue(
-                    self.hass,
-                    DOMAIN,
-                    f"deprecated_task_entity_{self.entity_description.key}",
-                    breaks_in_ha_version="2025.8.0",
-                    is_fixable=False,
-                    severity=IssueSeverity.WARNING,
-                    translation_key="deprecated_entity",
-                    translation_placeholders={
-                        "name": str(self.name),
-                        "entity": entity_id,
-                    },
-                )
-            else:
-                async_delete_issue(
-                    self.hass,
-                    DOMAIN,
-                    f"deprecated_task_entity_{self.entity_description.key}",
-                )
-        await super().async_added_to_hass()

tests/components/habitica/snapshots/test_sensor.ambr

@@ -826,6 +826,53 @@
     'state': '0.0',
   })
 # ---
+# name: test_sensors[sensor.test_user_health_max-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': None,
+    'config_entry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'sensor',
+    'entity_category': None,
+    'entity_id': 'sensor.test_user_health_max',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': 'Max. health',
+    'platform': 'habitica',
+    'previous_unique_id': None,
+    'supported_features': 0,
+    'translation_key': <HabitipySensorEntity.HEALTH_MAX: 'health_max'>,
+    'unique_id': 'a380546a-94be-4b8e-8a0b-23e0d5c03303_health_max',
+    'unit_of_measurement': 'HP',
+  })
+# ---
+# name: test_sensors[sensor.test_user_health_max-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'friendly_name': 'test-user Max. health',
+      'unit_of_measurement': 'HP',
+    }),
+    'context': <ANY>,
+    'entity_id': 'sensor.test_user_health_max',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': '50',
+  })
+# ---
 # name: test_sensors[sensor.test_user_intelligence-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
@@ -977,53 +1024,6 @@
     'state': '50.9',
   })
 # ---
-# name: test_sensors[sensor.test_user_max_health-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.test_user_max_health',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Max. health',
-    'platform': 'habitica',
-    'previous_unique_id': None,
-    'supported_features': 0,
-    'translation_key': <HabitipySensorEntity.HEALTH_MAX: 'health_max'>,
-    'unique_id': 'a380546a-94be-4b8e-8a0b-23e0d5c03303_health_max',
-    'unit_of_measurement': 'HP',
-  })
-# ---
-# name: test_sensors[sensor.test_user_max_health-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'test-user Max. health',
-      'unit_of_measurement': 'HP',
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.test_user_max_health',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '50',
-  })
-# ---
 # name: test_sensors[sensor.test_user_max_mana-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({

tests/components/habitica/test_sensor.py

@@ -8,6 +8,7 @@
 
 from homeassistant.components.habitica.const import DOMAIN
 from homeassistant.components.habitica.sensor import HabitipySensorEntity
+from homeassistant.components.sensor.const import DOMAIN as SENSOR_DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
@@ -26,7 +27,33 @@ def sensor_only() -> Generator[None]:
         yield
 
 
-@pytest.mark.usefixtures("habitica", "entity_registry_enabled_by_default")
+@pytest.fixture
+def inject_deprecated_entities(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+) -> Generator[None]:
+    """Inject deprecated entities to entity registry."""
+
+    entity_registry = er.async_get(hass)
+    for entity in (
+        ("test_user_dailies", "dailys"),
+        ("test_user_to_do_s", "todos"),
+        ("test_user_habits", "habits"),
+        ("test_user_rewards", "rewards"),
+        ("test_user_health_max", "health_max"),
+    ):
+        entity_registry.async_get_or_create(
+            SENSOR_DOMAIN,
+            DOMAIN,
+            f"a380546a-94be-4b8e-8a0b-23e0d5c03303_{entity[1]}",
+            suggested_object_id=entity[0],
+            disabled_by=None,
+        )
+
+
+@pytest.mark.usefixtures(
+    "habitica", "entity_registry_enabled_by_default", "inject_deprecated_entities"
+)
 async def test_sensors(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
@@ -44,14 +71,18 @@ async def test_sensors(
     await snapshot_platform(hass, entity_registry, snapshot, config_entry.entry_id)
 
 
-@pytest.mark.usefixtures("habitica", "entity_registry_enabled_by_default")
+@pytest.mark.usefixtures(
+    "habitica", "entity_registry_enabled_by_default", "inject_deprecated_entities"
+)
 async def test_sensor_deprecation_issue(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,
     issue_registry: ir.IssueRegistry,
+    entity_registry: er.EntityRegistry,
 ) -> None:
     """Test task sensor deprecation issue."""
 
+    assert entity_registry is not None
     with patch(
         "homeassistant.components.habitica.sensor.entity_used_in", return_value=True
     ):