From 0025254f985e92ada9cee3d20a7e316e0f4a61be Mon Sep 17 00:00:00 2001
From: atrovato <1839717+atrovato@users.noreply.github.com>
Date: Wed, 19 Aug 2020 15:35:51 +0200
Subject: [PATCH] MQTT service: In the "devices in rooms" dashboard box,
 display the feature name of a binary device, not the device name Fixes #787

---
 .../device-features/BinaryDeviceFeature.jsx   |  4 +-
 .../device-in-room/device-features/utils.js   | 12 ++++++
 front/src/config/demo.json                    | 40 +++++++++++++++++--
 server/lib/room/room.getBySelector.js         | 18 ++++++---
 server/test/controllers/room/room.test.js     | 12 ++++++
 5 files changed, 77 insertions(+), 9 deletions(-)
 create mode 100644 front/src/components/boxs/device-in-room/device-features/utils.js

diff --git a/front/src/components/boxs/device-in-room/device-features/BinaryDeviceFeature.jsx b/front/src/components/boxs/device-in-room/device-features/BinaryDeviceFeature.jsx
index 1b3ccf06ab..ce8c28e02c 100644
--- a/front/src/components/boxs/device-in-room/device-features/BinaryDeviceFeature.jsx
+++ b/front/src/components/boxs/device-in-room/device-features/BinaryDeviceFeature.jsx
@@ -1,3 +1,5 @@
+import { getDeviceName } from './utils';
+
 const BinaryDeviceType = ({ children, ...props }) => {
   function updateValue() {
     props.updateValue(
@@ -16,7 +18,7 @@ const BinaryDeviceType = ({ children, ...props }) => {
       <td>
         <i class="fe fe-toggle-right" />
       </td>
-      <td>{props.device.name}</td>
+      <td>{getDeviceName(props.device, props.deviceFeature)}</td>
       <td class="text-right">
         <label class="custom-switch">
           <input
diff --git a/front/src/components/boxs/device-in-room/device-features/utils.js b/front/src/components/boxs/device-in-room/device-features/utils.js
new file mode 100644
index 0000000000..c2218ac939
--- /dev/null
+++ b/front/src/components/boxs/device-in-room/device-features/utils.js
@@ -0,0 +1,12 @@
+import get from 'get-value';
+
+const DISPLAY_FEATURE_NAME_SERVICES = ['mqtt'];
+
+export const getDeviceName = (device, feature) => {
+  const service = get(device, 'service.name');
+  if (service && DISPLAY_FEATURE_NAME_SERVICES.includes(service)) {
+    return feature.name;
+  }
+
+  return device.name;
+};
diff --git a/front/src/config/demo.json b/front/src/config/demo.json
index 29e5817c99..6c8249ad56 100644
--- a/front/src/config/demo.json
+++ b/front/src/config/demo.json
@@ -111,7 +111,8 @@
         },
         {
           "type": "devices-in-room",
-          "room": "living-room"
+          "room": "living-room",
+          "device_features": ["main-lamp-binary", "tv-lamp-binary", "mqtt-living-room-switch", "mqtt-living-room-temp"]
         }
       ],
       [
@@ -224,8 +225,8 @@
         "selector": "tv-lamp",
         "features": [
           {
-            "name": "TV Lamp",
-            "selector": "main-lamp-binary",
+            "name": "TV Lamp feature",
+            "selector": "tv-lamp-binary",
             "category": "light",
             "type": "binary",
             "min": 0,
@@ -253,6 +254,39 @@
             "last_value_changed": "2019-02-12 07:49:07.556 +00:00"
           }
         ]
+      },
+      {
+        "id": "81d637d2-b7f5-4cc3-a39e-2270fd069ee2",
+        "selector": "mqtt-living-room",
+        "name": "MQTT device",
+        "service": {
+          "name": "mqtt"
+        },
+        "features": [
+          {
+            "name": "Main Plug",
+            "selector": "mqtt-living-room-switch",
+            "category": "switch",
+            "type": "binary",
+            "min": 0,
+            "max": 1,
+            "read_only": false,
+            "last_value": 1,
+            "last_value_changed": "2019-02-12 07:49:07.556 +00:00"
+          },
+          {
+            "name": "Window Temp",
+            "selector": "mqtt-living-room-temp",
+            "category": "temperature-sensor",
+            "type": "decimal",
+            "unit": "celsius",
+            "min": -200,
+            "max": 200,
+            "read_only": true,
+            "last_value": 27,
+            "last_value_changed": "2019-02-12 07:49:07.556 +00:00"
+          }
+        ]
       }
     ]
   },
diff --git a/server/lib/room/room.getBySelector.js b/server/lib/room/room.getBySelector.js
index 8e5e67ccd7..7a59af24f4 100644
--- a/server/lib/room/room.getBySelector.js
+++ b/server/lib/room/room.getBySelector.js
@@ -18,6 +18,7 @@ const DEVICE_FEATURES_ATTRIBUTES = [
   'last_value',
   'last_value_changed',
 ];
+const SERVICE_ATTRIBUTES = ['name'];
 
 /**
  * @description Get a room by selector
@@ -34,11 +35,18 @@ async function getBySelector(selector, options) {
       model: db.Device,
       as: 'devices',
       attributes: DEVICE_ATTRIBUTES,
-      include: {
-        model: db.DeviceFeature,
-        as: 'features',
-        attributes: DEVICE_FEATURES_ATTRIBUTES,
-      },
+      include: [
+        {
+          model: db.DeviceFeature,
+          as: 'features',
+          attributes: DEVICE_FEATURES_ATTRIBUTES,
+        },
+        {
+          model: db.Service,
+          as: 'service',
+          attributes: SERVICE_ATTRIBUTES,
+        },
+      ],
     });
   }
   const room = await db.Room.findOne({
diff --git a/server/test/controllers/room/room.test.js b/server/test/controllers/room/room.test.js
index 9299f29a0e..1a1b495773 100644
--- a/server/test/controllers/room/room.test.js
+++ b/server/test/controllers/room/room.test.js
@@ -82,6 +82,18 @@ describe('GET /api/v1/room/:room_selector', () => {
         });
       });
   });
+  it('should get a room by selector with expanded devices', async () => {
+    await authenticatedRequest
+      .get('/api/v1/room/test-room?expand=devices')
+      .expect('Content-Type', /json/)
+      .expect(200)
+      .then((res) => {
+        expect(res.body).to.have.property('devices');
+        res.body.devices.forEach((device) => {
+          expect(device).to.have.property('service');
+        });
+      });
+  });
 });
 
 describe('GET /api/v1/room', () => {