Merge pull request #863 from telefonicaid/fix/jexl_parser_json_value_attr

fix jexl transformation expression when is  a JSON based value

Author: mrutid

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);
     } catch (e) {
       error = new errors.InvalidExpression(expression);
       if (callback) {
@@ -93,7 +93,10 @@ function extractContext(attributeList) {
 }
 
 function applyExpression(expression, context, typeInformation) {
-    return jexl.evalSync (expression, context);
+    var result;
+    result = jexl.evalSync (expression, context);
+    logger.debug(logContext, 'applyExpression result "[%j]" ', result);
+    return result;
 }
 
 function expressionApplier(context, typeInformation) {
@@ -133,13 +136,16 @@ function expressionApplier(context, typeInformation) {
         else if (attribute.type === 'None') {
             newAttribute.value = null;
         }
-        else if (attribute.type === 'Text') {
+        else if (attribute.type === 'Text' || attribute.type === 'String') {
             newAttribute.value = String(newAttribute.value);
         }
-        else if (attribute.type !== 'StructuredValue') {
+        else if (attribute.type.toLowerCase().includes('structuredvalue') ||
+                 attribute.type.toLowerCase().startsWith('geo') ||
+                 attribute.type.toLowerCase().includes('json') ) {
+            newAttribute.value = newAttribute.value;
+        } else {
             newAttribute.value = String(newAttribute.value);
         }
-
         return newAttribute;
     };
 }
@@ -161,7 +167,11 @@ function contextAvailable(expression, context) {
       if (!keys.includes(element.value) && !isTransform(element.value)) {
         validContext = false;
         logger.warn(logContext, 'For expression "[%s]" context does not have element %s' , expression, element.value);
-      } 
+      }
+      // FIXME: Workaround to allow keys of JSON geopoints
+      if (element.value === 'type' || element.value === 'coordinates') {
+        validContext = true;
+      }
       return validContext === false;
     });
     if(validContext) {