Trying to refactor the tracker entity_status

custom_components/georide/binary_sensor.py

@@ -1,15 +1,24 @@
-""" odometter sensor for GeoRide object """
+""" binary_sensor for GeoRide object """
 
 import logging
 
+from datetime import timedelta
+from typing import Any, Mapping
+
 from homeassistant.core import callback
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.components.binary_sensor import ENTITY_ID_FORMAT
 
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+)
+
 import georideapilib.api as GeoRideApi
 import georideapilib.objects as GeoRideTracker
 
 from .const import DOMAIN as GEORIDE_DOMAIN
+from .const import MIN_UNTIL_REFRESH
 
 
 _LOGGER = logging.getLogger(__name__) 
@@ -20,6 +29,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
     if token is None:
         return False
 
+    update_interval = timedelta(seconds=1)
     trackers = await hass.async_add_executor_job(GeoRideApi.get_trackers,token)
     entities = []
     for tracker in trackers:
@@ -27,13 +37,11 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
             hass,
             _LOGGER,
             name=tracker.tracker_name,
-            update_method=georide_context.get_tracker,
-            update_interval=update_interval,
+            update_method=georide_context.refresh_trackers,
+            update_interval=update_interval
         )
-        stolen_entity = GeoRideStolenBinarySensorEntity(coordinator,
-                                                        coordinator)
-        crashed_entity = GeoRideCrashedBinarySensorEntity(hass,
-                                                          tracker)
+        stolen_entity = GeoRideStolenBinarySensorEntity(coordinator, tracker)
+        crashed_entity = GeoRideCrashedBinarySensorEntity(coordinator, tracker)
         entities.append(stolen_entity)
         entities.append(crashed_entity)
         hass.data[GEORIDE_DOMAIN]["devices"][tracker.tracker_id] = coordinator
@@ -43,23 +51,22 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
     return True
 
 
-class GeoRideBinarySensorEntity( CoordinatorEntity,B inarySensorEntity):
+class GeoRideBinarySensorEntity(CoordinatorEntity, BinarySensorEntity):
     """Represent a tracked device."""
-    def __init__(self, coordinator: DataUpdateCoordinator[Mapping[str, Any]], tracker: GeoRideTracker,  get_token_callback, get_tracker_callback):
+    def __init__(self, coordinator: DataUpdateCoordinator[Mapping[str, Any]], tracker: GeoRideTracker):
         """Set up Georide entity."""
         super().__init__(coordinator)
         self._tracker = tracker
-        self._get_token_callback = get_token_callback
-        self._get_tracker_callback = get_tracker_callback
         self._name = tracker.tracker_name
 
         self.entity_id = ENTITY_ID_FORMAT.format("is_stolen") + "." + str(tracker.tracker_id)
-        self._state = 0
+        self._state = None
+        self._data = False
 
     @property
     def unique_id(self):
         """Return the unique ID."""
-        return self._tracker_id
+        return self._tracker.tracker_id
 
     @property
     def name(self):
@@ -67,26 +74,16 @@ class GeoRideBinarySensorEntity( CoordinatorEntity,B inarySensorEntity):
         return self._name
 
     @property
-    def state(self):
-        return self._state
-    
-    @property
-    def get_token_callback(self):
-        """ GeoRide switch token callback method """
-        return self._get_token_callback
-    
-    @property
-    def get_tracker_callback(self):
-        """ GeoRide switch token callback method """
-        return self._get_tracker_callback
-    
+    def is_on(self):
+        """state value property"""
+        return self._data
 
     @property
     def device_info(self):
         """Return the device info."""
         return {
             "name": self.name,
-            "identifiers": {(GEORIDE_DOMAIN, self._tracker_id)},
+            "identifiers": {(GEORIDE_DOMAIN, self._tracker.tracker_id)},
             "manufacturer": "GeoRide"
         }
 
@@ -95,20 +92,22 @@ class GeoRideStolenBinarySensorEntity(GeoRideBinarySensorEntity):
 
     def __init__(self, coordinator: DataUpdateCoordinator[Mapping[str, Any]], tracker: GeoRideTracker):
         """Set up Georide entity."""
-        super().__init__(coordinator, tracker, hass, get_tracker_callback,get_tracker_callback)
+        super().__init__(coordinator, tracker)
+        self.entity_id = ENTITY_ID_FORMAT.format("is_stolen") + "." + str(tracker.tracker_id)
 
-        self.entity_id = ENTITY_ID_FORMAT.format("is_stolen") + "." + str(tracker_id)
-
-     async def async_update(self):
+    async def async_update(self):
         """ update the current tracker"""
-        _LOGGER.info('update')
+        _LOGGER.debug('update')
         self._name = self._tracker.tracker_name
-        self._state = self._tracker.is_stolen
+        self._data = self._tracker.is_stolen
 
     @property
     def unique_id(self):
         """Return the unique ID."""
-        return f"is_stolen_{self._tracker_id}"
+        return f"is_stolen_{self._tracker.tracker_id}"
+
+  
+
 
 
 class GeoRideCrashedBinarySensorEntity(GeoRideBinarySensorEntity):
@@ -117,15 +116,15 @@ class GeoRideCrashedBinarySensorEntity(GeoRideBinarySensorEntity):
     def __init__(self, coordinator: DataUpdateCoordinator[Mapping[str, Any]], tracker: GeoRideTracker):
         """Set up Georide entity."""
         super().__init__(coordinator, tracker)
-        self.entity_id = ENTITY_ID_FORMAT.format("is_crashed") + "." + str(tracker_id)
+        self.entity_id = ENTITY_ID_FORMAT.format("is_crashed") + "." + str(tracker.tracker_id)
 
     async def async_update(self):
         """ update the current tracker"""
-        _LOGGER.info('update')
+        _LOGGER.debug('update')
         self._name = self._tracker.tracker_name
-        self._state = self._tracker.is_crashed
+        self._data = self._tracker.is_crashed
 
     @property
     def unique_id(self):
         """Return the unique ID."""
-        return f"is_crashed_{self._tracker_id}"
+        return f"is_crashed_{self._tracker.tracker_id}"