From 5c77acbdb714f87c1960e85c0f9c7b960bedc720 Mon Sep 17 00:00:00 2001
From: Matthieu <matthieu@duval-dev.fr>
Date: Sun, 11 Apr 2021 17:14:40 +0200
Subject: [PATCH] Fire more home assistant event

---
 custom_components/georide/__init__.py | 22 +++++++++++++++++++++-
 custom_components/georide/switch.py   |  2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/custom_components/georide/__init__.py b/custom_components/georide/__init__.py
index 55f926e..69f5713 100644
--- a/custom_components/georide/__init__.py
+++ b/custom_components/georide/__init__.py
@@ -287,6 +287,13 @@ class GeoRideContext:
                 tracker.locked_latitude = data['lockedLatitude']
                 tracker.locked_longitude = data['lockedLongitude']
                 tracker.is_locked = data['isLocked']
+
+                event_data = {
+                    "device_id": tracker.tracker_id,
+                    "type": "on_lock",
+                }
+                self._hass.bus.async_fire(f"{DOMAIN}_event", event_data)
+
                 asyncio.run_coroutine_threadsafe(
                     coordinator.async_request_refresh(), self._hass.loop
                 ).result()
@@ -302,6 +309,13 @@ class GeoRideContext:
             coordinator = coordoned_tracker['coordinator']
             if tracker.tracker_id == data['trackerId']:
                 tracker.status = data['status']
+
+                event_data = {
+                    "device_id": tracker.tracker_id,
+                    "type": "on_device",
+                }
+                self._hass.bus.async_fire(f"{DOMAIN}_event", event_data)
+
                 asyncio.run_coroutine_threadsafe(
                     coordinator.async_request_refresh(), self._hass.loop
                 ).result()
@@ -334,7 +348,7 @@ class GeoRideContext:
 
                 event_data = {
                     "device_id": tracker.tracker_id,
-                    "type": data.name,
+                    "type": f"alarm_{data.name}",
                 }
                 self._hass.bus.async_fire(f"{DOMAIN}_event", event_data)
                 asyncio.run_coroutine_threadsafe(
@@ -355,6 +369,12 @@ class GeoRideContext:
                 tracker.moving = data['moving']
                 tracker.speed = data['speed']
                 tracker.fixtime = data['fixtime']
+
+                event_data = {
+                    "device_id": tracker.tracker_id,
+                    "type": "position",
+                }
+                self._hass.bus.async_fire(f"{DOMAIN}_event", event_data)
                 asyncio.run_coroutine_threadsafe(
                     coordinator.async_request_refresh(), self._hass.loop
                 ).result()
diff --git a/custom_components/georide/switch.py b/custom_components/georide/switch.py
index 57f44be..71c3f11 100644
--- a/custom_components/georide/switch.py
+++ b/custom_components/georide/switch.py
@@ -82,7 +82,7 @@ class GeoRideLockSwitchEntity(CoordinatorEntity, SwitchEntity):
     @property
     def unique_id(self):
         """Return the unique ID."""
-        return f"lock_{self._tracker_device.tracker_id}"
+        return f"lock_{self._tracker_device.tracker.tracker_id}"
 
     @property
     def name(self):