Fix energy_sensor_id sensors correctly included in group (#2152)

bramstroker · Mar 23, 2024 · 2006116 · 2006116
1 parent 4183e0c
commit 2006116
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/custom_components/powercalc/sensor.py b/custom_components/powercalc/sensor.py
@@ -768,7 +768,7 @@ async def create_individual_sensors(
             return EntitiesBucket()
 
         # Create energy sensor which integrates the power sensor
-        if sensor_config.get(CONF_CREATE_ENERGY_SENSOR):
+        if sensor_config.get(CONF_CREATE_ENERGY_SENSOR) or CONF_ENERGY_SENSOR_ID in sensor_config:
             energy_sensor = await create_energy_sensor(
                 hass,
                 sensor_config,

diff --git a/tests/sensors/test_group.py b/tests/sensors/test_group.py
@@ -38,6 +38,7 @@
     ATTR_ENTITIES,
     ATTR_IS_GROUP,
     CONF_CREATE_ENERGY_SENSOR,
+    CONF_CREATE_ENERGY_SENSORS,
     CONF_CREATE_GROUP,
     CONF_CREATE_UTILITY_METERS,
     CONF_DISABLE_EXTENDED_ATTRIBUTES,
@@ -1453,10 +1454,12 @@ async def test_additional_energy_sensors(hass: HomeAssistant) -> None:
             {
                 CONF_CREATE_GROUP: "TestGroup",
                 CONF_IGNORE_UNAVAILABLE_STATE: True,
+                CONF_CREATE_ENERGY_SENSOR: True,
                 CONF_ENTITIES: [
                     {
                         CONF_ENTITY_ID: "fan.ceiling_fan",
                         CONF_FIXED: {CONF_POWER: 50},
+                        CONF_CREATE_ENERGY_SENSOR: True,
                     },
                     {
                         CONF_POWER_SENSOR_ID: "sensor.furnace_power",
@@ -1465,6 +1468,9 @@ async def test_additional_energy_sensors(hass: HomeAssistant) -> None:
                 ],
             },
         ],
+        {
+            CONF_CREATE_ENERGY_SENSORS: False,
+        },
     )
 
     power_state = hass.states.get("sensor.testgroup_power")