From ffe0c1cd58c92ebf42bf48c8e88df120aa5fd6bb Mon Sep 17 00:00:00 2001
From: Robert Svensson <Kane610@users.noreply.github.com>
Date: Mon, 23 Nov 2020 09:22:44 +0100
Subject: [PATCH] Add device id to deconz_event (#43552)

---
 homeassistant/components/deconz/deconz_event.py | 5 ++++-
 tests/components/deconz/test_deconz_event.py    | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/deconz/deconz_event.py b/homeassistant/components/deconz/deconz_event.py
index 968ab3cee39..7ba372bf685 100644
--- a/homeassistant/components/deconz/deconz_event.py
+++ b/homeassistant/components/deconz/deconz_event.py
@@ -1,7 +1,7 @@
 """Representation of a deCONZ remote."""
 from pydeconz.sensor import Switch
 
-from homeassistant.const import CONF_EVENT, CONF_ID, CONF_UNIQUE_ID
+from homeassistant.const import CONF_DEVICE_ID, CONF_EVENT, CONF_ID, CONF_UNIQUE_ID
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.util import slugify
@@ -94,6 +94,9 @@ class DeconzEvent(DeconzBase):
             CONF_EVENT: self._device.state,
         }
 
+        if self.device_id:
+            data[CONF_DEVICE_ID] = self.device_id
+
         if self._device.gesture is not None:
             data[CONF_GESTURE] = self._device.gesture
 
diff --git a/tests/components/deconz/test_deconz_event.py b/tests/components/deconz/test_deconz_event.py
index e1492fb0fcf..14faf1a938c 100644
--- a/tests/components/deconz/test_deconz_event.py
+++ b/tests/components/deconz/test_deconz_event.py
@@ -77,6 +77,7 @@ async def test_deconz_events(hass):
         "id": "switch_1",
         "unique_id": "00:00:00:00:00:00:00:01",
         "event": 2000,
+        "device_id": gateway.events[0].device_id,
     }
 
     gateway.api.sensors["3"].update({"state": {"buttonevent": 2000}})
@@ -88,6 +89,7 @@ async def test_deconz_events(hass):
         "unique_id": "00:00:00:00:00:00:00:03",
         "event": 2000,
         "gesture": 1,
+        "device_id": gateway.events[2].device_id,
     }
 
     gateway.api.sensors["4"].update({"state": {"gesture": 0}})
@@ -99,6 +101,7 @@ async def test_deconz_events(hass):
         "unique_id": "00:00:00:00:00:00:00:04",
         "event": 1000,
         "gesture": 0,
+        "device_id": gateway.events[3].device_id,
     }
 
     gateway.api.sensors["5"].update(
@@ -113,6 +116,7 @@ async def test_deconz_events(hass):
         "event": 6002,
         "angle": 110,
         "xy": [0.5982, 0.3897],
+        "device_id": gateway.events[4].device_id,
     }
 
     await hass.config_entries.async_unload(config_entry.entry_id)