Merge pull request #693 from telefonicaid/fix/expand_var_object_value

fix when expanding a var which is a object in action of rule
telefonicaid · Jun 22, 2022 · 120999c · 120999c
2 parents 3604ad4 + e3cc560
commit 120999c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,3 +1,4 @@
+- Fix: expanding an object variable in action of rule (#692)
 - Fix: for EPL with context + insert + select rule (without expression) (#652)
 - Fix: format of internalCurrentTime fixed to ISO 8601
 - Fix: typo in non signal event internalCurentTime -> internalCurrentTime

diff --git a/lib/models/noSignal.js b/lib/models/noSignal.js
@@ -94,6 +94,7 @@ function alertFunc(nsLineRule, entity) {
         if (lastTime !== undefined && lastTime !== null) {
             event.lastTime = lastTime;
         }
+        logger.debug(context, 'event available is %j', event);
         var delay;
         if (config.isMaster) {
             delay = 0;

diff --git a/lib/models/updateAction.js b/lib/models/updateAction.js
@@ -295,7 +295,7 @@ function processOptionParams(action, event) {
     });
     changes.id = myutils.expandVar(action.parameters.id, event);
     changes.type = myutils.expandVar(action.parameters.type, event);
-
+    logger.debug('processOptionParams changes: %j', changes);
     return changes;
 }
 

diff --git a/lib/myutils.js b/lib/myutils.js
@@ -53,10 +53,19 @@ function logErrorIf(err, message, context) {
 
 function expandVar(val, mapping, trycast) {
     if (typeof val === 'string') {
+        var expanded = false;
+        var valObj = null;
         Object.keys(mapping).forEach(function(p) {
             val = val.replace(new RegExp('\\$\\{' + p + '\\}', 'g'), mapping[p]);
+            // javascript replace always return a string: we need to keep object value
+            if (!expanded && val === '[object Object]') {
+                valObj = mapping[p]; // for cases where mapping[p] is an object like { type: 'Point', coordinates: [] }
+                expanded = true;
+            }
         });
-        var expanded = false;
+        if (valObj) {
+            val = valObj;
+        }
         if (trycast) {
             try {
                 // Check if "${num}" and expand it as real value, non string