Add area name to all services/events

Author: andrew-codechimp

custom_components/battery_notes/coordinator.py

@@ -34,6 +34,7 @@
 
 from .common import validate_is_float
 from .const import (
+    ATTR_AREA_NAME,
     ATTR_BATTERY_LAST_REPLACED,
     ATTR_BATTERY_LEVEL,
     ATTR_BATTERY_LOW,
@@ -476,6 +477,7 @@ def battery_low_template_state(self, value):
                 {
                     ATTR_DEVICE_ID: self.device_id or "",
                     ATTR_SOURCE_ENTITY_ID: self.source_entity_id or "",
+                    ATTR_AREA_NAME: self.area_name,
                     ATTR_DEVICE_NAME: self.device_name,
                     ATTR_BATTERY_LOW: self.battery_low,
                     ATTR_BATTERY_LOW_THRESHOLD: self.battery_low_threshold,
@@ -509,6 +511,7 @@ def battery_low_template_state(self, value):
                     {
                         ATTR_DEVICE_ID: self.device_id or "",
                         ATTR_SOURCE_ENTITY_ID: self.source_entity_id or "",
+                        ATTR_AREA_NAME: self.area_name,
                         ATTR_DEVICE_NAME: self.device_name,
                         ATTR_BATTERY_LOW: self.battery_low,
                         ATTR_BATTERY_LOW_THRESHOLD: self.battery_low_threshold,
@@ -544,6 +547,7 @@ def battery_low_binary_state(self, value):
                 {
                     ATTR_DEVICE_ID: self.device_id or "",
                     ATTR_SOURCE_ENTITY_ID: self.source_entity_id or "",
+                    ATTR_AREA_NAME: self.area_name,
                     ATTR_DEVICE_NAME: self.device_name,
                     ATTR_BATTERY_LOW: self.battery_low,
                     ATTR_BATTERY_LOW_THRESHOLD: self.battery_low_threshold,
@@ -577,6 +581,7 @@ def battery_low_binary_state(self, value):
                     {
                         ATTR_DEVICE_ID: self.device_id or "",
                         ATTR_SOURCE_ENTITY_ID: self.source_entity_id or "",
+                        ATTR_AREA_NAME: self.area_name,
                         ATTR_DEVICE_NAME: self.device_name,
                         ATTR_BATTERY_LOW: self.battery_low,
                         ATTR_BATTERY_LOW_THRESHOLD: self.battery_low_threshold,
@@ -630,6 +635,7 @@ def current_battery_level(self, value):
                     {
                         ATTR_DEVICE_ID: self.device_id or "",
                         ATTR_SOURCE_ENTITY_ID: self.source_entity_id or "",
+                        ATTR_AREA_NAME: self.area_name,
                         ATTR_DEVICE_NAME: self.device_name,
                         ATTR_BATTERY_LOW: self.battery_low,
                         ATTR_BATTERY_LOW_THRESHOLD: self.battery_low_threshold,
@@ -666,6 +672,7 @@ def current_battery_level(self, value):
                         {
                             ATTR_DEVICE_ID: self.device_id or "",
                             ATTR_SOURCE_ENTITY_ID: self.source_entity_id or "",
+                            ATTR_AREA_NAME: self.area_name,
                             ATTR_DEVICE_NAME: self.device_name,
                             ATTR_BATTERY_LOW: self.battery_low,
                             ATTR_BATTERY_LOW_THRESHOLD: self.battery_low_threshold,

custom_components/battery_notes/services.py

@@ -146,6 +146,7 @@ async def _async_battery_replaced(call: ServiceCall) -> ServiceResponse:  # noqa
                         {
                             ATTR_DEVICE_ID: coordinator.device_id or "",
                             ATTR_SOURCE_ENTITY_ID: coordinator.source_entity_id or "",
+                            ATTR_AREA_NAME: coordinator.area_name,
                             ATTR_DEVICE_NAME: coordinator.device_name,
                             ATTR_BATTERY_TYPE_AND_QUANTITY: coordinator.battery_type_and_quantity,
                             ATTR_BATTERY_TYPE: coordinator.battery_type,
@@ -203,6 +204,7 @@ async def _async_battery_replaced(call: ServiceCall) -> ServiceResponse:  # noqa
                         {
                             ATTR_DEVICE_ID: coordinator.device_id or "",
                             ATTR_SOURCE_ENTITY_ID: coordinator.source_entity_id or "",
+                            ATTR_AREA_NAME: coordinator.area_name,
                             ATTR_DEVICE_NAME: coordinator.device_name,
                             ATTR_BATTERY_TYPE_AND_QUANTITY: coordinator.battery_type_and_quantity,
                             ATTR_BATTERY_TYPE: coordinator.battery_type,
@@ -272,8 +274,8 @@ async def _async_battery_last_replaced(call: ServiceCall) -> ServiceResponse:
                                 ATTR_DEVICE_ID: coordinator.device_id or "",
                                 ATTR_SOURCE_ENTITY_ID: coordinator.source_entity_id
                                 or "",
-                                ATTR_DEVICE_NAME: coordinator.device_name,
                                 ATTR_AREA_NAME: coordinator.area_name,
+                                ATTR_DEVICE_NAME: coordinator.device_name,
                                 ATTR_BATTERY_TYPE_AND_QUANTITY: coordinator.battery_type_and_quantity,
                                 ATTR_BATTERY_TYPE: coordinator.battery_type,
                                 ATTR_BATTERY_QUANTITY: coordinator.battery_quantity,
@@ -354,8 +356,8 @@ async def _async_battery_last_reported(call: ServiceCall) -> ServiceResponse:
                                 ATTR_DEVICE_ID: coordinator.device_id or "",
                                 ATTR_SOURCE_ENTITY_ID: coordinator.source_entity_id
                                 or "",
-                                ATTR_DEVICE_NAME: coordinator.device_name,
                                 ATTR_AREA_NAME: coordinator.area_name,
+                                ATTR_DEVICE_NAME: coordinator.device_name,
                                 ATTR_BATTERY_TYPE_AND_QUANTITY: coordinator.battery_type_and_quantity,
                                 ATTR_BATTERY_TYPE: coordinator.battery_type,
                                 ATTR_BATTERY_QUANTITY: coordinator.battery_quantity,