Merge pull request #1029 from telefonicaid/fix/use_expressionLanguage…

…_from_group use expresionLanguage from group if not defined
telefonicaid · May 5, 2021 · 440e0f2 · 440e0f2
2 parents 211670a + 4052cc5
commit 440e0f2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,3 +1,4 @@
+- 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)
 - Add: add getTypeSilently for device group and use in device registration to avoid false mongo alarm
 - Fix: group command is not provisioned in device when entity_type is different (#1011)

diff --git a/lib/services/devices/deviceService.js b/lib/services/devices/deviceService.js
@@ -172,6 +172,9 @@ function mergeDeviceWithConfiguration(fields, defaults, deviceData, configuratio
     if (configuration && configuration.ngsiVersion) {
         deviceData.ngsiVersion = configuration.ngsiVersion;
     }
+    if (configuration && configuration.expressionLanguage && deviceData.expressionLanguage === undefined) {
+        deviceData.expressionLanguage = configuration.expressionLanguage;
+    }
 
     logger.debug(context, 'deviceData after merge with conf: %j', deviceData);
     callback(null, deviceData);
@@ -562,6 +565,9 @@ function findOrCreate(deviceId, group, callback) {
             if ('ngsiVersion' in group && group.ngsiVersion !== undefined) {
                 newDevice.ngsiVersion = group.ngsiVersion;
             }
+            if ('expressionLanguage' in group && group.expressionLanguage !== undefined) {
+                newDevice.expressionLanguage = group.expressionLanguage;
+            }
             registerDevice(newDevice, function (error, device) {
                 callback(error, device, group);
             });

diff --git a/lib/services/devices/devices-NGSI-v2.js b/lib/services/devices/devices-NGSI-v2.js
@@ -363,6 +363,9 @@ function updateRegisterDeviceNgsi2(deviceObj, entityInfoUpdated, callback) {
             if ('explicitAttrs' in newDevice && newDevice.explicitAttrs !== undefined) {
                 oldDevice.explicitAttrs = newDevice.explicitAttrs;
             }
+            if ('expressionLanguage' in newDevice && newDevice.expressionLanguage !== undefined) {
+                oldDevice.expressionLanguage = newDevice.expressionLanguage;
+            }
 
             oldDevice.endpoint = newDevice.endpoint || oldDevice.endpoint;