From 7d281fd22447e3d27fa45930ae355d8ae2b6e124 Mon Sep 17 00:00:00 2001
From: Adam Mills <adam@armills.info>
Date: Thu, 31 Aug 2017 10:29:18 -0400
Subject: [PATCH] Skip automatic events older than latest data (#9230)

* Skip automatic events older than latest data

* Update test
---
 .../components/device_tracker/automatic.py    | 30 ++++++++++++++-----
 .../device_tracker/test_automatic.py          |  3 ++
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/device_tracker/automatic.py b/homeassistant/components/device_tracker/automatic.py
index a4495926f82..6ae038fd41c 100644
--- a/homeassistant/components/device_tracker/automatic.py
+++ b/homeassistant/components/device_tracker/automatic.py
@@ -205,6 +205,7 @@ class AutomaticData(object):
         self.hass = hass
         self.devices = devices
         self.vehicle_info = {}
+        self.vehicle_seen = {}
         self.client = client
         self.session = session
         self.async_see = async_see
@@ -236,6 +237,14 @@ class AutomaticData(object):
                 return
             yield from self.get_vehicle_info(vehicle)
 
+        if event.created_at < self.vehicle_seen[event.vehicle.id]:
+            # Skip events received out of order
+            _LOGGER.debug("Skipping out of order event. Event Created %s. "
+                          "Last seen event: %s.", event.created_at,
+                          self.vehicle_seen[event.vehicle.id])
+            return
+        self.vehicle_seen[event.vehicle.id] = event.created_at
+
         kwargs = self.vehicle_info[event.vehicle.id]
         if kwargs is None:
             # Ignored device
@@ -323,15 +332,17 @@ class AutomaticData(object):
         if self.devices is not None and name not in self.devices:
             self.vehicle_info[vehicle.id] = None
             return
-        else:
-            self.vehicle_info[vehicle.id] = kwargs = {
-                ATTR_DEV_ID: vehicle.id,
-                ATTR_HOST_NAME: name,
-                ATTR_MAC: vehicle.id,
-                ATTR_ATTRIBUTES: {
-                    ATTR_FUEL_LEVEL: vehicle.fuel_level_percent,
-                }
+
+        self.vehicle_info[vehicle.id] = kwargs = {
+            ATTR_DEV_ID: vehicle.id,
+            ATTR_HOST_NAME: name,
+            ATTR_MAC: vehicle.id,
+            ATTR_ATTRIBUTES: {
+                ATTR_FUEL_LEVEL: vehicle.fuel_level_percent,
             }
+        }
+        self.vehicle_seen[vehicle.id] = \
+            vehicle.updated_at or vehicle.created_at
 
         if vehicle.latest_location is not None:
             location = vehicle.latest_location
@@ -352,4 +363,7 @@ class AutomaticData(object):
             kwargs[ATTR_GPS] = (location.lat, location.lon)
             kwargs[ATTR_GPS_ACCURACY] = location.accuracy_m
 
+            if trips[0].ended_at >= self.vehicle_seen[vehicle.id]:
+                self.vehicle_seen[vehicle.id] = trips[0].ended_at
+
         return kwargs
diff --git a/tests/components/device_tracker/test_automatic.py b/tests/components/device_tracker/test_automatic.py
index d572791168c..d40c1518ffa 100644
--- a/tests/components/device_tracker/test_automatic.py
+++ b/tests/components/device_tracker/test_automatic.py
@@ -1,5 +1,6 @@
 """Test the automatic device tracker platform."""
 import asyncio
+from datetime import datetime
 import logging
 from unittest.mock import patch, MagicMock
 import aioautomatic
@@ -71,10 +72,12 @@ def test_valid_credentials(
     vehicle.display_name = 'mock_display_name'
     vehicle.fuel_level_percent = 45.6
     vehicle.latest_location = None
+    vehicle.updated_at = datetime(2017, 8, 13, 1, 2, 3)
 
     trip.end_location.lat = 45.567
     trip.end_location.lon = 34.345
     trip.end_location.accuracy_m = 5.6
+    trip.ended_at = datetime(2017, 8, 13, 1, 2, 4)
 
     @asyncio.coroutine
     def get_session(*args, **kwargs):