FIX Broken plugin in HASS 2021.12.1

Author: moox-it

custom_components/moox_track/__init__.py

@@ -1,14 +1,10 @@
 """Support for MOOX Track."""
+from http import HTTPStatus
+
 from aiohttp import web
 import voluptuous as vol
 
-from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER
-from homeassistant.const import (
-    ATTR_ID,
-    CONF_WEBHOOK_ID,
-    HTTP_OK,
-    HTTP_UNPROCESSABLE_ENTITY,
-)
+from homeassistant.const import ATTR_ID, CONF_WEBHOOK_ID, Platform
 from homeassistant.helpers import config_entry_flow
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
@@ -25,13 +21,13 @@
     DOMAIN,
 )
 
-PLATFORMS = [DEVICE_TRACKER]
+PLATFORMS = [Platform.DEVICE_TRACKER]
 
 
 TRACKER_UPDATE = f"{DOMAIN}_tracker_update"
 
 
-DEFAULT_ACCURACY = HTTP_OK
+DEFAULT_ACCURACY = 200
 DEFAULT_BATTERY = -1
 
 
@@ -66,7 +62,9 @@ async def handle_webhook(hass, webhook_id, request):
     try:
         data = WEBHOOK_SCHEMA(dict(request.query))
     except vol.MultipleInvalid as error:
-        return web.Response(text=error.error_message, status=HTTP_UNPROCESSABLE_ENTITY)
+        return web.Response(
+            text=error.error_message, status=HTTPStatus.UNPROCESSABLE_ENTITY
+        )
 
     attrs = {
         ATTR_ALTITUDE: data.get(ATTR_ALTITUDE),
@@ -87,7 +85,7 @@ async def handle_webhook(hass, webhook_id, request):
         attrs,
     )
 
-    return web.Response(text=f"Setting location for {device}", status=HTTP_OK)
+    return web.Response(text=f"Setting location for {device}")
 
 
 async def async_setup_entry(hass, entry):

custom_components/moox_track/device_tracker.py

@@ -6,8 +6,12 @@
 from stringcase import camelcase
 import voluptuous as vol
 
-from homeassistant.components.device_tracker import PLATFORM_SCHEMA, SOURCE_TYPE_GPS
+from homeassistant.components.device_tracker import (
+    PLATFORM_SCHEMA as PARENT_PLATFORM_SCHEMA,
+    SOURCE_TYPE_GPS,
+)
 from homeassistant.components.device_tracker.config_entry import TrackerEntity
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_EVENT,
     CONF_HOST,
@@ -70,7 +74,27 @@
 DEFAULT_SCAN_INTERVAL = timedelta(seconds=30)
 SCAN_INTERVAL = DEFAULT_SCAN_INTERVAL
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
+EVENTS = [
+    EVENT_DEVICE_MOVING,
+    EVENT_COMMAND_RESULT,
+    EVENT_DEVICE_FUEL_DROP,
+    EVENT_GEOFENCE_ENTER,
+    EVENT_DEVICE_OFFLINE,
+    EVENT_DRIVER_CHANGED,
+    EVENT_GEOFENCE_EXIT,
+    EVENT_DEVICE_OVERSPEED,
+    EVENT_DEVICE_ONLINE,
+    EVENT_DEVICE_STOPPED,
+    EVENT_MAINTENANCE,
+    EVENT_ALARM,
+    EVENT_TEXT_MESSAGE,
+    EVENT_DEVICE_UNKNOWN,
+    EVENT_IGNITION_OFF,
+    EVENT_IGNITION_ON,
+    EVENT_ALL_EVENTS,
+]
+
+PLATFORM_SCHEMA = PARENT_PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_PASSWORD): cv.string,
         vol.Required(CONF_USERNAME): cv.string,
@@ -87,33 +111,15 @@
         ),
         vol.Optional(CONF_EVENT, default=[]): vol.All(
             cv.ensure_list,
-            [
-                vol.Any(
-                    EVENT_DEVICE_MOVING,
-                    EVENT_COMMAND_RESULT,
-                    EVENT_DEVICE_FUEL_DROP,
-                    EVENT_GEOFENCE_ENTER,
-                    EVENT_DEVICE_OFFLINE,
-                    EVENT_DRIVER_CHANGED,
-                    EVENT_GEOFENCE_EXIT,
-                    EVENT_DEVICE_OVERSPEED,
-                    EVENT_DEVICE_ONLINE,
-                    EVENT_DEVICE_STOPPED,
-                    EVENT_MAINTENANCE,
-                    EVENT_ALARM,
-                    EVENT_TEXT_MESSAGE,
-                    EVENT_DEVICE_UNKNOWN,
-                    EVENT_IGNITION_OFF,
-                    EVENT_IGNITION_ON,
-                    EVENT_ALL_EVENTS,
-                )
-            ],
+            [vol.In(EVENTS)],
         ),
     }
 )
 
 
-async def async_setup_entry(hass: HomeAssistant, entry, async_add_entities):
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities
+):
     """Configure a dispatcher connection based on a config entry."""
 
     @callback
@@ -197,6 +203,8 @@ def __init__(
     ):
         """Initialize."""
 
+        if EVENT_ALL_EVENTS in event_types:
+            event_types = EVENTS
         self._event_types = {camelcase(evt): evt for evt in event_types}
         self._custom_attributes = custom_attributes
         self._scan_interval = scan_interval
@@ -318,7 +326,7 @@ async def import_events(self):
                         "device_moox_track_id": event["deviceId"],
                         "device_name": device_name,
                         "type": event["type"],
-                        "serverTime": event["serverTime"],
+                        "serverTime": event.get("eventTime") or event.get("serverTime"),
                         "attributes": event["attributes"],
                     },
                 )
@@ -394,8 +402,7 @@ async def async_added_to_hass(self):
         if self._latitude is not None or self._longitude is not None:
             return
 
-        state = await self.async_get_last_state()
-        if state is None:
+        if (state := await self.async_get_last_state()) is None:
             self._latitude = None
             self._longitude = None
             self._accuracy = None