Merge pull request #990 from telefonicaid/task/fix_proper_expression_plugin_parser_in_multientity_plugin

check and set proper expression plugin to use in multientity

Author: fgalan

CHANGES_NEXT_RELEASE

@@ -1,3 +1,4 @@
+Fix: ensure use proper expression parser in multientity plugin (#989)
 Fix: ensure registrationId is updated when defice with commands is updated 
 Add: return apikey in GET device if device was provisioned with explicit apikey (#977)
 Add: allow update device `apikey` using Update (put) API (#978)

lib/plugins/expressionParser.js

@@ -27,8 +27,12 @@
 
 const Parser = require('jison').Parser;
 const errors = require('../errors');
+const logger = require('logops');
 const config = require('../commonConfig');
 const _ = require('underscore');
+const logContext = {
+    op: 'IoTAgentNGSI.Expression'
+};
 const grammar = {
     lex: {
         rules: [
@@ -159,7 +163,7 @@ 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);
     return expressionResult;
 }
 

lib/plugins/jexlParser.js

@@ -46,7 +46,7 @@ function parse(expression, context, callback) {
 
     try {
         result = jexl.evalSync(expression, context);
-        logger.debug(logContext, 'parse expression result "[%j]" ', result);
+        logger.debug(logContext, 'parse expression "[%j]" over "[%j]" result "[%j]" ', expression, context, result);
     } catch (e) {
         error = new errors.InvalidExpression(expression);
         if (callback) {
@@ -68,7 +68,10 @@ function extractContext(attributeList) {
     let value;
 
     for (let i = 0; i < attributeList.length; i++) {
-        if (!Number.isNaN(Number.parseFloat(attributeList[i].value)) && !Number.isInteger(Number.parseFloat(attributeList[i].value))) {
+        if (
+            !Number.isNaN(Number.parseFloat(attributeList[i].value)) &&
+            !Number.isInteger(Number.parseFloat(attributeList[i].value))
+        ) {
             value = Number.parseFloat(attributeList[i].value);
         } else if (!Number.isNaN(Number.parseInt(attributeList[i].value))) {
             value = Number.parseInt(attributeList[i].value);
@@ -94,8 +97,9 @@ function extractContext(attributeList) {
 
 function applyExpression(expression, context, typeInformation) {
     const result = jexl.evalSync(expression, context);
-    logger.debug(logContext, 'applyExpression result "[%j]" ', result);
-    return result;
+    logger.debug(logContext, 'applyExpression "[%j]" over "[%j]" result "[%j]" ', expression, context, result);
+    let expressionResult = result !== undefined ? result : expression;
+    return expressionResult;
 }
 
 function expressionApplier(context, typeInformation) {

lib/plugins/multiEntity.js

@@ -28,7 +28,8 @@
 
 const _ = require('underscore');
 const constants = require('../constants');
-const parser = require('./expressionParser');
+const legacyParser = require('./expressionParser');
+const jexlParser = require('./jexlParser');
 const config = require('../commonConfig');
 /* eslint-disable-next-line  no-unused-vars */
 const logger = require('logops');
@@ -40,6 +41,26 @@ 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'
+    ) {
+        return true;
+    } else if (config.getConfig().defaultExpressionLanguage === 'jexl' && !typeInformation.expressionLanguage) {
+        return true;
+    } else if (
+        config.getConfig().defaultExpressionLanguage === 'legacy' &&
+            typeInformation.expressionLanguage &&
+            typeInformation.expressionLanguage === 'jexl'
+    ) {
+        return true;
+    }
+    return false;
+}
+
 function hasEntityName(item) {
     return item.entity_name;
 }
@@ -109,7 +130,10 @@ function generateNewCEsNgsi1(entity, newEntities, entityTypes, typeInformation,
     let newEntityAttributes;
     let newEntityAttributeNames;
     let entityName;
-
+    let parser = legacyParser;
+    if (checkJexl(typeInformation)) {
+        parser = jexlParser;
+    }
     function filterByEntityName(entityName) {
         return function (item) {
             return item.entity_name === entityName;
@@ -158,7 +182,10 @@ function generateNewCEsNgsi2(entity, newEntities, entityTypes, typeInformation,
     let newEntityAttributeNames;
     let newEntityAttributeObjectIds;
     let entityName;
-
+    let parser = legacyParser;
+    if (checkJexl(typeInformation)) {
+        parser = jexlParser;
+    }
     function filterByEntityName(entityName) {
         return function (item) {
             return item.entity_name === entityName;