Merge pull request #640 from telefonicaid/task/propage_entity_name_ex…

…p_type_information Task/propage entity name exp and timestamp type information
telefonicaid · Oct 11, 2023 · ea9d8c3 · ea9d8c3
2 parents 1d1c088 + 74b742b
commit ea9d8c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,2 +1,4 @@
-- Fix: ensure service and subservice from device in logs about error proccesing message
+- Fix: ensure service and subservice from device in logs about error proccesing message
+- Fix: use but not store timestamp and entityNameExp from group with autoprovisioned devices (iotagent-node-lib#1504, partially)
 - Fix: remove autocast (iota-node-lib#1501)
+
diff --git a/lib/iotaUtils.js b/lib/iotaUtils.js
@@ -198,6 +198,12 @@ function mergeDeviceWithConfiguration(deviceData, configuration, callback) {
     if (configuration && configuration.explicitAttrs !== undefined && deviceData.explicitAttrs === undefined) {
         deviceData.explicitAttrs = configuration.explicitAttrs;
     }
+    if (configuration && configuration.entityNameExp !== undefined) {
+        deviceData.entityNameExp = configuration.entityNameExp;
+    }
+    if (configuration && configuration.timestamp !== undefined && deviceData.timestamp === undefined) {
+        deviceData.timestamp = configuration.timestamp;
+    }
     config.getLogger().debug(context, 'deviceData after merge with conf: %j', deviceData);
     callback(null, deviceData);
 }
@@ -358,7 +364,7 @@ function createConfigurationNotification(results) {
             configurations[results[i].name] = results[i].value;
         }
     } else {
-        for (var att in results) {
+        for (const att in results) {
             configurations[att] = results[att].value;
         }
     }