From 5934efa41e08eb085c0f2a776232d0c2d16894af Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Mon, 24 Jun 2019 20:16:03 +0200
Subject: [PATCH] Add last_seen when device publish succeeds.
 https://github.com/Koenkk/zigbee2mqtt/issues/1651

---
 lib/extension/devicePublish.js |  4 ++++
 test/devicePublish.test.js     | 36 ++++++++++++++++++++++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/lib/extension/devicePublish.js b/lib/extension/devicePublish.js
index eca7ca9d5..89d9a751d 100644
--- a/lib/extension/devicePublish.js
+++ b/lib/extension/devicePublish.js
@@ -69,6 +69,10 @@ class DevicePublish {
                 delete msg.state;
             }
 
+            if (settings.get().advanced.last_seen !== 'disable') {
+                msg.last_seen = utils.formatDate(Date.now(), settings.get().advanced.last_seen);
+            }
+
             this.publishEntityState(entity.ID, msg);
         }
     }
diff --git a/test/devicePublish.test.js b/test/devicePublish.test.js
index c81178c0f..d9a59dc11 100644
--- a/test/devicePublish.test.js
+++ b/test/devicePublish.test.js
@@ -1086,7 +1086,11 @@ describe('DevicePublish', () => {
     it('Home Assistant: should set state', async () => {
         zigbee.publish.mockClear();
         publishEntityState.mockClear();
-        jest.spyOn(settings, 'get').mockReturnValue({homeassistant: true, mqtt: {base_topic: 'zigbee2mqtt'}});
+        jest.spyOn(settings, 'get').mockReturnValue({
+            homeassistant: true,
+            mqtt: {base_topic: 'zigbee2mqtt'},
+            advanced: {last_seen: 'disable'},
+        });
         zigbee.getDevice = () => ({modelId: 'RB 185 C'});
         devicePublish.onMQTTMessage('zigbee2mqtt/0x00000001/set', JSON.stringify({state: 'ON'}));
         expect(zigbee.publish).toHaveBeenCalledTimes(1);
@@ -1110,7 +1114,11 @@ describe('DevicePublish', () => {
         zigbee.publish.mockClear();
         publishEntityState.mockClear();
         jest.spyOn(state, 'get').mockReturnValue({state: 'ON'});
-        jest.spyOn(settings, 'get').mockReturnValue({homeassistant: true, mqtt: {base_topic: 'zigbee2mqtt'}});
+        jest.spyOn(settings, 'get').mockReturnValue({
+            homeassistant: true,
+            mqtt: {base_topic: 'zigbee2mqtt'},
+            advanced: {last_seen: 'disable'},
+        });
         zigbee.getDevice = () => ({modelId: 'RB 185 C'});
         devicePublish.onMQTTMessage('zigbee2mqtt/0x00000001/set', JSON.stringify({state: 'ON', color_temp: 100}));
         expect(zigbee.publish).toHaveBeenCalledTimes(1);
@@ -1135,7 +1143,11 @@ describe('DevicePublish', () => {
         zigbee.publish.mockClear();
         publishEntityState.mockClear();
         jest.spyOn(state, 'get').mockReturnValue({state: 'ON'});
-        jest.spyOn(settings, 'get').mockReturnValue({homeassistant: true, mqtt: {base_topic: 'zigbee2mqtt'}});
+        jest.spyOn(settings, 'get').mockReturnValue({
+            homeassistant: true,
+            mqtt: {base_topic: 'zigbee2mqtt'},
+            advanced: {last_seen: 'disable'},
+        });
         zigbee.getDevice = () => ({modelId: 'RB 185 C'});
         devicePublish.onMQTTMessage(
             'zigbee2mqtt/0x00000001/set',
@@ -1163,7 +1175,11 @@ describe('DevicePublish', () => {
         zigbee.publish.mockClear();
         publishEntityState.mockClear();
         jest.spyOn(state, 'get').mockReturnValue({state: 'OFF'});
-        jest.spyOn(settings, 'get').mockReturnValue({homeassistant: true, mqtt: {base_topic: 'zigbee2mqtt'}});
+        jest.spyOn(settings, 'get').mockReturnValue({
+            homeassistant: true,
+            mqtt: {base_topic: 'zigbee2mqtt'},
+            advanced: {last_seen: 'disable'},
+        });
         zigbee.getDevice = () => ({modelId: 'RB 185 C'});
         devicePublish.onMQTTMessage(
             'zigbee2mqtt/0x00000001/set',
@@ -1230,4 +1246,16 @@ describe('DevicePublish', () => {
             null,
             expect.any(Function));
     });
+
+    it('Should publish messages to zigbee devices', async () => {
+        jest.spyOn(settings, 'get').mockReturnValue({
+            mqtt: {base_topic: 'zigbee2mqtt'},
+            advanced: {last_seen: 'ISO_8601'},
+        });
+        publishEntityState.mockClear();
+        zigbee.getDevice = () => ({modelId: 'TRADFRI bulb E27 CWS opal 600lm'});
+        devicePublish.onMQTTMessage('zigbee2mqtt/0x00000001/set', JSON.stringify({brightness: '200'}));
+        expect(publishEntityState).toHaveBeenCalledTimes(1);
+        expect(typeof publishEntityState.mock.calls[0][1].last_seen).toBe('string');
+    });
 });