simplify block

Author: AlvaroVega

lib/services/devices/devices-NGSI-v2.js

@@ -216,51 +216,50 @@ function createInitialEntityHandlerNgsi2(deviceData, newDevice, callback) {
  */
 function createInitialEntityNgsi2(newDevice, deviceObj, callback) {
     logger.debug(context, 'createInitialEntityNgsiv2 called with newDevice: %j', newDevice);
-    if (
-        (!newDevice.cmdMode && (!config.getConfig().cmdMode || config.getConfig().cmdMode === 'legacy')) ||
-        (newDevice && newDevice.cmdMode === 'legacy')
-    ) {
+
+    const cmdModeConfig = config.getConfig().cmdMode;
+
+    const isLegacy =
+        (!newDevice.cmdMode && (!cmdModeConfig || cmdModeConfig === 'legacy')) || newDevice.cmdMode === 'legacy';
+    if (isLegacy) {
         logger.debug(context, 'Old cmdMode with newDevice: %j', deviceObj);
-        callback(null, deviceObj);
-    } else {
-        // Creates initial entity when commands by sucriptions, to ensure commands appears in entity with null value
-        // (including a check so if device has no commands, no entity is created)
-        if (newDevice.commands.length > 0) {
-            const options = {
-                url: config.getConfig().contextBroker.url + '/v2/entities?options=upsert',
-                method: 'POST',
-                json: {
-                    id: String(newDevice.name),
-                    type: newDevice.type
-                },
-                headers: {
-                    'fiware-service': newDevice.service,
-                    'fiware-servicepath': newDevice.subservice,
-                    'fiware-correlator': (domain.active && domain.active.corr) || uuid.v4()
-                }
-            };
-            if (newDevice.cbHost && newDevice.cbHost.indexOf('://') !== -1) {
-                options.url = newDevice.cbHost + '/v2/entities?options=upsert';
-            } else if (newDevice.cbHost && newDevice.cbHost.indexOf('://') === -1) {
-                options.url = 'http://' + newDevice.cbHost + '/v2/entities?options=upsert';
-            }
-            jsonConcat(options.json, formatCommandsBySubsNgsi2(newDevice.commands));
-            logger.debug(context, 'Creating initial entity due to commands by subs with newDevice: %j', newDevice);
-            logger.debug(
-                context,
-                'Creating initial entity in the Context Broker:\n %s',
-                JSON.stringify(options, null, 4)
-            );
-            utils.executeWithSecurity(
-                options,
-                newDevice,
-                createInitialEntityHandlerNgsi2(newDevice, deviceObj, callback)
-            );
-        } else {
-            logger.debug(context, 'No initial entity due to no commands by subs in newDevice: %j', newDevice);
-            callback(null, deviceObj);
-        }
+        return callback(null, deviceObj);
     }
+
+    if (!Array.isArray(newDevice.commands) || newDevice.commands.length === 0) {
+        logger.debug(context, 'No initial entity due to no commands by subs in newDevice: %j', newDevice);
+        return callback(null, deviceObj);
+    }
+
+    const entityPayload = {
+        id: String(newDevice.name),
+        type: newDevice.type
+    };
+    jsonConcat(entityPayload, formatCommandsBySubsNgsi2(newDevice.commands));
+
+    let url = config.getConfig().contextBroker.url + '/v2/entities?options=upsert';
+    if (newDevice.cbHost) {
+        url = newDevice.cbHost.includes('://')
+            ? newDevice.cbHost + '/v2/entities?options=upsert'
+            : 'http://' + newDevice.cbHost + '/v2/entities?options=upsert';
+    }
+
+    const headers = {
+        'fiware-correlator': (domain.active && domain.active.corr) || uuid.v4()
+    };
+    if (newDevice.service) headers['fiware-service'] = newDevice.service;
+    if (newDevice.subservice) headers['fiware-servicepath'] = newDevice.subservice;
+
+    const options = { url, method: 'POST', json: entityPayload, headers };
+
+    logger.debug(context, 'Creating initial entity due to commands by subs with newDevice: %j', newDevice);
+    logger.debug(context, 'Creating initial entity in the Context Broker:\n %s', JSON.stringify(options, null, 4));
+
+    return utils.executeWithSecurity(
+        options,
+        newDevice,
+        createInitialEntityHandlerNgsi2(newDevice, deviceObj, callback)
+    );
 }
 
 /**