Merge branch 'master' into task/remove_casts_by_type_after_apply_expression

Author: fgalan

CHANGES_NEXT_RELEASE

@@ -1,4 +1,5 @@
 - Fix: Do not transform attribute value using attribute type after apply expression plugin JEXL (#1036)
+- Fix: check entityId is valid after apply expression in multientity plugin (#1039)
 - Fix: check access to data in fillService facility
 - Fix: use expressionLanguage defined in group is not defined at device level (#1027)
 - Fix: ensure service of groups, device and commands is stored in mongo in lowercase (#1023)

lib/plugins/expressionParser.js

@@ -107,6 +107,7 @@ function parse(expression, context, type, callback) {
 
         try {
             result = parser.parse(expression);
+            logger.debug(logContext, 'parse expression "[%j]" over "[%j]" result "[%j]" ', expression, context, result);
         } catch (e) {
             error = new errors.InvalidExpression(expression);
 
@@ -129,12 +130,12 @@ function extractContext(attributeList) {
     const context = {};
 
     for (let i = 0; i < attributeList.length; i++) {
-      if (attributeList[i].name) {
-          context[attributeList[i].name] = attributeList[i].value;
-      }
-      if (attributeList[i].object_id) {
-          context[attributeList[i].object_id] = attributeList[i].value;
-      }
+        if (attributeList[i].name) {
+            context[attributeList[i].name] = attributeList[i].value;
+        }
+        if (attributeList[i].object_id) {
+            context[attributeList[i].object_id] = attributeList[i].value;
+        }
     }
 
     return context;
@@ -163,7 +164,13 @@ function applyExpression(expression, context, typeInformation) {
     for (let i = 0; i < substitutions.length; i++) {
         expressionResult = expressionResult.replace(substitutions[i].original, substitutions[i].value);
     }
-    logger.debug(logContext, 'applyExpression "[%j]" over "[%j]" result "[%j]" ',  expression, context, expressionResult);
+    logger.debug(
+        logContext,
+        'applyExpression "[%j]" over "[%j]" result "[%j]" ',
+        expression,
+        context,
+        expressionResult
+    );
     return expressionResult;
 }
 
@@ -206,12 +213,26 @@ function expressionApplier(context, typeInformation) {
 }
 
 function contextAvailable(expression, context) {
-    const variables = expression.match(/@[a-zA-Z0-9]+/g).map(function (item) {
-        return item.substr(1);
-    });
-    const keys = Object.keys(context);
-
-    return _.difference(variables, keys).length === 0;
+    let error;
+    try {
+        const variables = expression.match(/@[a-zA-Z0-9]+/g).map(function (item) {
+            return item.substr(1);
+        });
+        const keys = Object.keys(context);
+        let validContext = _.difference(variables, keys).length === 0;
+        if (!validContext) {
+            logger.warn(
+                logContext,
+                'For expression "[%s]" context "[%j]" does not have element to match',
+                expression,
+                context
+            );
+        }
+        return validContext;
+    } catch (e) {
+        error = new errors.InvalidExpression(expression);
+        throw error;
+    }
 }
 
 function processExpressionAttributes(typeInformation, list, context) {

lib/plugins/multiEntity.js

@@ -41,20 +41,19 @@ const utils = require('./pluginUtils');
 /* eslint-disable-next-line  no-unused-vars */
 const aliasPlugin = require('./attributeAlias');
 
-
 function checkJexl(typeInformation) {
     if (
         config.getConfig().defaultExpressionLanguage === 'jexl' &&
-            typeInformation.expressionLanguage &&
-            typeInformation.expressionLanguage !== 'legacy'
+        typeInformation.expressionLanguage &&
+        typeInformation.expressionLanguage !== 'legacy'
     ) {
         return true;
     } else if (config.getConfig().defaultExpressionLanguage === 'jexl' && !typeInformation.expressionLanguage) {
         return true;
     } else if (
         config.getConfig().defaultExpressionLanguage === 'legacy' &&
-            typeInformation.expressionLanguage &&
-            typeInformation.expressionLanguage === 'jexl'
+        typeInformation.expressionLanguage &&
+        typeInformation.expressionLanguage === 'jexl'
     ) {
         return true;
     }
@@ -65,6 +64,11 @@ function hasEntityName(item) {
     return item.entity_name;
 }
 
+function ensureEntityId(entityName, originalEntityName) {
+    // ensure no return null, 0, false, NaN and other invalids entityIDs
+    return entityName ? entityName : originalEntityName;
+}
+
 /**
  * Return a list of all the attributes that don't have a multientity option. It considers NGSIv1.
  *
@@ -87,20 +91,23 @@ function filterOutMultientitiesNgsi1(originalAttrs, meAttributes) {
  */
 function filterOutMultientitiesNgsi2(originalAttrs, meAttributes) {
     const result = {};
-    const meNamesList = _.pluck( meAttributes, 'name');
-    const meObjectsList = _.pluck( meAttributes, 'object_id');
+    const meNamesList = _.pluck(meAttributes, 'name');
+    const meObjectsList = _.pluck(meAttributes, 'object_id');
     let toBeFilteredByObj = [];
 
     for (const att in originalAttrs) {
         if (originalAttrs.hasOwnProperty(att)) {
             if (!_.contains(meNamesList, att)) {
                 result[att] = originalAttrs[att];
             }
-            if (originalAttrs[att].hasOwnProperty('multi')){
-              let cleanAttributes = _.union([_.clone(originalAttrs[att])], originalAttrs[att].multi);
-              delete cleanAttributes[0].multi;
-              cleanAttributes = _.map(cleanAttributes, function(val){ val['name'] = att; return val; });
-              toBeFilteredByObj = _.union(toBeFilteredByObj, cleanAttributes);
+            if (originalAttrs[att].hasOwnProperty('multi')) {
+                let cleanAttributes = _.union([_.clone(originalAttrs[att])], originalAttrs[att].multi);
+                delete cleanAttributes[0].multi;
+                cleanAttributes = _.map(cleanAttributes, function (val) {
+                    val['name'] = att;
+                    return val;
+                });
+                toBeFilteredByObj = _.union(toBeFilteredByObj, cleanAttributes);
             }
         }
     }
@@ -157,7 +164,7 @@ function generateNewCEsNgsi1(entity, newEntities, entityTypes, typeInformation,
         result.push({
             type: entityTypes[newEntities[i]],
             isPattern: 'false',
-            id: entityName,
+            id: ensureEntityId(entityName, newEntities[i]),
             attributes: newEntityAttributes
         });
     }
@@ -231,7 +238,7 @@ function generateNewCEsNgsi2(entity, newEntities, entityTypes, typeInformation,
         entityName = parser.applyExpression(newEntities[i], ctx, typeInformation);
 
         newEntityAttributes.type = entityTypes[newEntities[i]];
-        newEntityAttributes.id = entityName;
+        newEntityAttributes.id = ensureEntityId(entityName, newEntities[i]);
 
         result.push(newEntityAttributes);
     }

lib/services/northBound/contextServer-NGSI-v2.js

@@ -204,7 +204,7 @@ function handleUpdateNgsi2(req, res, next) {
             [apply(async.map, req.body.entities, apply(generateUpdateActionsNgsi2, req)), reduceActions, async.series],
             function (error, result) {
                 if (error) {
-                    logger.debug(context, 'There was an error handling the update action: %s.', error);
+                    logger.debug(context, 'There was an error handling the update action: %j.', error);
 
                     next(error);
                 } else {