Revert change on device id format

custom_components/georide/binary_sensor.py

@@ -34,14 +34,14 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
         entities.append(GeoRideNetworkBinarySensorEntity(coordinator, tracker_device))
         entities.append(GeoRideMovingBinarySensorEntity(coordinator, tracker_device))
 
-        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.unique_id] = coordinator
+        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.tracker.tracker_id] = coordinator
     
     coordoned_beacons = georide_context.georide_trackers_beacon_coordoned
     for coordoned_beacon in coordoned_beacons:
         tracker_beacon = coordoned_tracker['tracker_beacon']
         coordinator = coordoned_tracker['coordinator']
         entities.append(GeoRideBeaconUpdatedBinarySensorEntity(coordinator, tracker_beacon))
-        hass.data[GEORIDE_DOMAIN]["devices"][tracker_beacon.unique_id] = coordinator
+        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.beacon.beacon_id] = coordinator
 
 
     async_add_entities(entities, True)
@@ -167,7 +167,7 @@ class GeoRideActiveSubscriptionBinarySensorEntity(GeoRideBinarySensorEntity):
         """state value property"""
         tracker = self._tracker_device.tracker
         if tracker.is_oldsubscription:
-            if .tracker.subscription_id is not None:
+            if tracker.subscription_id is not None:
                 return True
             return False
         else:

custom_components/georide/device.py

@@ -44,7 +44,7 @@ class Device:
         """Return the device info."""
         return {
             "name": self.name,
-            "identifiers": {(GEORIDE_DOMAIN, self._tracker.tracker_id)},
+            "identifiers": self.unique_id,
             "manufacturer": "GeoRide",
             "model": self.model_name,
             "suggested_area": "Garage"
@@ -54,7 +54,7 @@ class Device:
     @property
     def unique_id(self) -> str:
         """Get the unique id."""
-        return {(GEORIDE_DOMAIN, self._tracker.tracker_id)}
+        return f"{GEORIDE_DOMAIN}_{self._tracker.tracker_id}"
 
     def __str__(self) -> str:
         """Get string representation."""
@@ -93,17 +93,17 @@ class DeviceBeacon:
         """Return the device info."""
         return {
             "name": self.name,
-            "identifiers": {(GEORIDE_DOMAIN, self._beacon.beacon_id)},
+            "identifiers": self.unique_id,
             "manufacturer": "GeoRide",
             "model": self.model_name,
             "suggested_area": "Garage"
         }
 
-
     @property
     def unique_id(self) -> str:
         """Get the unique id."""
-        return {(GEORIDE_DOMAIN, "beacon", self._beacon.beacon_id)}
+        
+        return f"{GEORIDE_DOMAIN}_beacon_{self._tracker.tracker_id}"
 
     def __str__(self) -> str:
         """Get string representation."""

custom_components/georide/device_tracker.py

@@ -27,7 +27,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
         tracker_device = coordoned_tracker['tracker_device']
         coordinator = coordoned_tracker['coordinator']
         entity = GeoRideTrackerEntity(coordinator, tracker_device, hass)
-        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.unique_id] = coordinator
+        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.tracker.tracker_id] = coordinator
         entities.append(entity)
 
     async_add_entities(entities)

custom_components/georide/sensor.py

@@ -13,7 +13,7 @@ from homeassistant.helpers.update_coordinator import (
 )
 
 from .const import DOMAIN as GEORIDE_DOMAIN
-from .device import Device
+from .device import Device, DeviceBeacon    
 
 
 _LOGGER = logging.getLogger(__name__) 
@@ -28,7 +28,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
     for coordoned_tracker in coordoned_trackers:
         tracker_device = coordoned_tracker['tracker_device']
         coordinator = coordoned_tracker['coordinator']
-        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.unique_id] = coordinator
+        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.tracker.tracker_id] = coordinator
         entities.append(GeoRideOdometerSensorEntity(coordinator, tracker_device, hass))
         entities.append(GeoRideOdometerKmSensorEntity(coordinator, tracker_device, hass))
         entities.append(GeoRideFixtimeSensorEntity(coordinator, tracker_device))
@@ -41,9 +41,9 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
         tracker_beacon = coordoned_tracker['tracker_beacon']
         coordinator = coordoned_tracker['coordinator']
         entities.append(GeoRideBeaconUpdatedBinarySensorEntity(coordinator, tracker_beacon))
-        hass.data[GEORIDE_DOMAIN]["devices"][tracker_beacon.unique_id] = coordinator
+        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.beacon.beacon_id] = coordinator
 
-    await async_add_entities(entities)
+    async_add_entities(entities)
 
     return True
 

custom_components/georide/siren.py

@@ -6,7 +6,6 @@ import logging
 from typing import Any, Mapping
 
 from homeassistant.components.siren import SirenEntity
-from homeassistant.components.siren import ENTITY_ID_FORMAT
 
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
@@ -18,6 +17,8 @@ import georideapilib.api as GeoRideApi
 from .const import DOMAIN as GEORIDE_DOMAIN
 from .device import Device
 
+ENTITY_ID_FORMAT: Final = GEORIDE_DOMAIN + ".{}"
+
 _LOGGER = logging.getLogger(__name__) 
 
 

custom_components/georide/switch.py

@@ -30,7 +30,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
     for coordoned_tracker in coordoned_trackers:
         tracker_device = coordoned_tracker['tracker_device']
         coordinator = coordoned_tracker['coordinator']
-        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.unique_id] = coordinator
+        hass.data[GEORIDE_DOMAIN]["devices"][tracker_device.tracker.tracker_id] = coordinator
         entities.append(GeoRideLockSwitchEntity(coordinator, tracker_device, hass))
         if tracker_device.tracker.version > 2:
             entities.append(GeoRideEcoModeSwitchEntity(coordinator, tracker_device, hass))