iotagent-node-lib 3.0.0 → 3.2.0

package/lib/services/ngsi/entities-NGSI-LD.js

@@ -410,16 +410,6 @@ function addLinkedEntities(typeInformation, json) {
     });
 }
 
-/**
- * Determines if a value is of type float
- *
- * @param      {String}   value       Value to be analyzed
- * @return     {boolean}              True if float, False otherwise.
- */
-function isFloat(value) {
-    return !isNaN(value) && value.toString().indexOf('.') !== -1;
-}
-
 /**
  * Makes an update in the Device's entity in the context broker, with the values given in the 'attributes' array.
  * This array should comply to the NGSI-LD's attribute format.
@@ -535,7 +525,7 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
                 }
             }
             // This context is just to calculate explicitAttrs when is an expression
-            let ctxt = expressionPlugin.extractContext(attributesCtxt.concat(idTypeSSSList), typeInformation);
+            let ctxt = expressionPlugin.extractContext(attributesCtxt.concat(idTypeSSSList));
             // typeInformation.active attrs with expressions expanded by current ctxt
             if (typeInformation.active) {
                 typeInformation.active.forEach(function (att) {
@@ -547,10 +537,7 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
                                 type: att.type
                             };
                             attributesCtxt.push(expandedAttr);
-                            ctxt = expressionPlugin.extractContext(
-                                attributesCtxt.concat(idTypeSSSList),
-                                typeInformation
-                            );
+                            ctxt = expressionPlugin.extractContext(attributesCtxt.concat(idTypeSSSList));
                         }
                     }
                 });
@@ -689,7 +676,7 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
         });
     }
     attributesCtxt = attributesCtxt.concat(idTypeSSSList);
-    const ctxt = expressionPlugin.extractContext(attributesCtxt, typeInformation);
+    const ctxt = expressionPlugin.extractContext(attributesCtxt);
     logger.debug(context, 'sendUpdateValueNgsiLD \n initial ctxt %j ', ctxt);
 
     // Sort currentEntity to get first attrs without expressions (checking attrs in typeInformation.active)
@@ -791,47 +778,12 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
                     }
                 } catch (e) {
                     logger.error(context, 'sendUpdateValueNgsiLD \n apply expression exception %j \n', e);
-                    if (!expressionPlugin.checkJexl(typeInformation)) {
-                        return callback(e); // just throw error with legacy parser for backward compatiblity
-                    } else {
-                        res = ctxt[attr.name]; // TBD: add reference to test
-                    }
-                }
-                if (!expressionPlugin.checkJexl(typeInformation)) {
-                    // legacy expression plugin: Involves some legacy checks performed by applierExpression
-                    if (
-                        res &&
-                        res !== 'undefined' &&
-                        res !== 'null' &&
-                        (typeof res === 'string' || res instanceof String) &&
-                        !res.includes('NaN')
-                    ) {
-                        newAttr.value = res;
-                        if (newAttr.type === 'Number' && isFloat(newAttr.value)) {
-                            newAttr.value = Number.parseFloat(newAttr.value);
-                        } else if (newAttr.type === 'Number' && !Number.isNaN(Number.parseInt(newAttr.value))) {
-                            newAttr.value = Number.parseInt(newAttr.value);
-                        } else if (newAttr.type === 'Boolean') {
-                            newAttr.value = newAttr.value === 'true' || newAttr.value === '1';
-                        } else if (newAttr.type === 'None') {
-                            newAttr.value = null;
-                        }
-                    } else if (isNaN(res) || res === 'undefined' || res === 'null') {
-                        logger.debug(
-                            context,
-                            'sendUpdateValueNgsiLD \n apply expression result: isNaN || undefined || null'
-                        );
-                        if (res === 'null' && newAttr.type === 'None') {
-                            newAttr.value = null;
-                        } else {
-                            delete payload[0][j]; // remove measure attr
-                            attr = undefined; // stop process attr
-                        }
-                    }
-                } else {
-                    // jexl expression plugin
-                    newAttr.value = res;
+                    res = ctxt[attr.name]; // TBD: add reference to test
                 }
+
+                // jexl expression plugin
+                newAttr.value = res;
+
                 logger.debug(
                     context,
                     'sendUpdateValueNgsiLD \n apply expression result %j \n newAttr %j',
@@ -973,23 +925,9 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
     ) {
         if (timestampValue) {
             // timeInstant is provided as measure
-            if (Object.keys(payload[0]).length > 3) {
+            if (Object.keys(payload[0]).length > 1) {
                 // include metadata with TimeInstant in attrs when TimeInstant is provided as measure in all entities
-                payload[0] = NGSIv2.addTimestamp(
-                    payload[0],
-                    typeInformation.timezone,
-                    timestampValue,
-                    false // skipMetadataAtt
-                );
-            } else {
-                // Do not include metadata with TimeInstant in attrs when TimeInstant is provided as measure
-                // and no more entities
-                payload[0] = NGSIv2.addTimestamp(
-                    payload[0],
-                    typeInformation.timezone,
-                    timestampValue,
-                    true // skipMetadataAtt
-                );
+                payload[0] = NGSIv2.addTimestamp(payload[0], typeInformation.timezone, timestampValue);
             }
         } else {
             // jshint maxdepth:5
@@ -1062,5 +1000,9 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
 
 exports.convertAttrNGSILD = convertAttrNGSILD;
 exports.formatAsNGSILD = formatAsNGSILD;
-exports.sendUpdateValue = sendUpdateValueNgsiLD;
+exports.sendUpdateValue = function (entityName, attributes, typeInformation, token, callback) {
+    NGSIUtils.applyMiddlewares(NGSIUtils.updateMiddleware, attributes, typeInformation, () => {
+        return sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, callback);
+    });
+};
 exports.sendQueryValue = sendQueryValueNgsiLD;