update CNR

telefonicaid · Nov 7, 2023 · 3bcfdf3 · 3bcfdf3
1 parent 888bdf2
commit 3bcfdf3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,3 +1,4 @@
+- Add: allow to send NGSIv2 and NGSILD as measures depending on payloadType (#778)
 - Fix: binary data representation when sending data through HTTP & MQTT (#690)
 - Fix: ensure service and subservice from device in logs about error proccesing message
 - Remove: legacy code about unused parsedMessageError flag
diff --git a/lib/bindings/HTTPBinding.js b/lib/bindings/HTTPBinding.js
@@ -317,7 +317,7 @@ function handleIncomingMeasure(req, res, next) {
                 for (const i in payloadDataArr) {
                     values = commonBindings.extractAttributes(device, payloadDataArr[i], device.payloadType);
                     if (values[0][0]) {
-                        // Check multimeasure from a ngsiv2 entities array
+                        // Check multimeasure from a ngsiv2/ngsild entities array
                         attributeArr = attributeArr.concat(values);
                     } else {
                         attributeArr.push(values);

diff --git a/lib/commonBindings.js b/lib/commonBindings.js
@@ -96,9 +96,9 @@ function extractAttributes(device, current, payloadType) {
     let values = [];
 
     const ctxt = fillService(context, device);
-    config.getLogger().debug(ctxt, 'extractAttributes NGSIV2 current %j payloadType %j', current, payloadType);
+    config.getLogger().debug(ctxt, 'extractAttributes current %j payloadType %j', current, payloadType);
 
-    if (payloadType === constants.PAYLOAD_NGSIv2 || payloadType === constants.PAYLOAD_NGSILD) {
+    if (payloadType && [constants.PAYLOAD_NGSIv2, constants.PAYLOAD_NGSILD].includes(payloadType.toLowerCase())) {
         let arrayEntities = [];
         if (current.hasOwnProperty('actionType') && current.hasOwnProperty('entities')) {
             arrayEntities = current['entities'];
@@ -110,14 +110,14 @@ function extractAttributes(device, current, payloadType) {
             for (const k in entity) {
                 // skip id and type
                 if (entity.hasOwnProperty(k) && !['id', 'type'].includes(k)) {
-                    if (payloadType === constants.PAYLOAD_NGSIv2) {
+                    if (payloadType.toLowerCase() === constants.PAYLOAD_NGSIv2) {
                         valuesEntity.push({
                             name: k,
                             type: entity[k].type,
                             value: entity[k].value,
                             metadata: entity[k].metadata ? entity[k].metadata : undefined
                         });
-                    } else if (payloadType === constants.PAYLOAD_NGSILD) {
+                    } else if (payloadType.toLowerCase() === constants.PAYLOAD_NGSILD) {
                         if (k === '@context') {
                             valuesEntity.push({
                                 name: k,