Send update from the scratch

CHANGES_NEXT_RELEASE

@@ -1,3 +1,5 @@
+- Large refactor of IOTA Lib code to make it simpler
+- Remove: time compression support
 - Remove: autocast (including env var IOTA_AUTOCAST) (#1498)
 - Fix: use but not store timestamp and explicitAttrs from group with autoprovisioned devices (#1504, partially)
 - Fix: MongoDB connection authentication (user and password were not actually used) (#1510)

lib/plugins/jexlParser.js

@@ -103,16 +103,16 @@ function applyExpression(expression, context, typeInformation) {
     // Delete null values from context. Related:
     // https://github.com/telefonicaid/iotagent-node-lib/issues/1440
     // https://github.com/TomFrost/Jexl/issues/133
-    deleteNulls(context);
+    deleteNullsAndNaN(context);
     const result = parse(expression, context);
     logger.debug(logContext, 'applyExpression "[%j]" over "[%j]" result "[%j]" ', expression, context, result);
     const expressionResult = result !== undefined ? result : expression;
     return expressionResult;
 }
 
-function deleteNulls(object) {
+function deleteNullsAndNaN(object) {
     for (let key in object) {
-        if (object[key] === null) {
+        if (object[key] === null || Number.isNaN(object[key])) {
             delete object[key];
         }
     }

lib/services/ngsi/entities-NGSI-LD.js

@@ -41,11 +41,87 @@ const _ = require('underscore');
 const context = {
     op: 'IoTAgentNGSI-LD'
 };
-const NGSIv2 = require('./entities-NGSI-v2');
 const NGSIUtils = require('./ngsiUtils');
 
 const NGSI_LD_URN = 'urn:ngsi-ld:';
 
+/**
+ * Adds timestamp to ngsi payload entities accoding to timezone, and an optional timestampvalue.
+ *
+ * @param      {Object}   payload         NGSIv2 payload with one or more entities
+ * @param      String     timezone        TimeZone value (optional)
+ * @param      String     timestampValue  Timestamp value (optional). If not provided current timestamp is used
+ * @param     Boolean     skipMetadataAtt  An optional flag to indicate if timestamp should be added to each metadata attribute. Default is false
+ * @return     {Object}                   NGSIv2 payload entities with timestamp
+ */
+function addTimestamp(payload, timezone, timestampValue) {
+    function addTimestampEntity(entity, timezone, timestampValue) {
+        const timestamp = {
+            type: constants.TIMESTAMP_TYPE_NGSI2
+        };
+
+        if (timestampValue) {
+            timestamp.value = timestampValue;
+        } else if (!timezone) {
+            timestamp.value = new Date().toISOString();
+        } else {
+            timestamp.value = moment().tz(timezone).format('YYYY-MM-DD[T]HH:mm:ss.SSSZ');
+        }
+
+        function addMetadata(attribute) {
+            let timestampFound = false;
+
+            if (!attribute.metadata) {
+                attribute.metadata = {};
+            }
+
+            for (let i = 0; i < attribute.metadata.length; i++) {
+                if (attribute.metadata[i] === constants.TIMESTAMP_ATTRIBUTE) {
+                    if (
+                        attribute.metadata[constants.TIMESTAMP_ATTRIBUTE].type === constants.TIMESTAMP_TYPE_NGSI2 &&
+                        attribute.metadata[constants.TIMESTAMP_ATTRIBUTE].value === timestamp.value
+                    ) {
+                        timestampFound = true;
+                        break;
+                    }
+                }
+            }
+
+            if (!timestampFound) {
+                attribute.metadata[constants.TIMESTAMP_ATTRIBUTE] = timestamp;
+            }
+
+            return attribute;
+        }
+        let keyCount = 0;
+        for (const key in entity) {
+            /* eslint-disable-next-line  no-prototype-builtins */
+            if (entity.hasOwnProperty(key) && key !== 'id' && key !== 'type') {
+                addMetadata(entity[key]);
+                keyCount += 1;
+            }
+        }
+        // Add timestamp just to entity with attrs: multientity plugin could
+        // create empty entities just with id and type.
+        if (keyCount > 0) {
+            entity[constants.TIMESTAMP_ATTRIBUTE] = timestamp;
+        }
+
+        return entity;
+    }
+
+    if (payload instanceof Array) {
+        for (let i = 0; i < payload.length; i++) {
+            if (!utils.isTimestampedNgsi2(payload[i])) {
+                payload[i] = addTimestampEntity(payload[i], timezone, timestampValue);
+            }
+        }
+
+        return payload;
+    }
+    return addTimestampEntity(payload, timezone, timestampValue);
+}
+
 /**
  * Amends an NGSIv2 attribute to NGSI-LD format
  * All native JSON types are respected and cast as Property values
@@ -843,7 +919,7 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
                             ? config.getConfig().timestamp
                             : timestampValue !== undefined
                     ) {
-                        newEntity = NGSIv2.addTimestamp(newEntity, typeInformation.timezone, timestampValue);
+                        newEntity = addTimestamp(newEntity, typeInformation.timezone, timestampValue);
                         logger.debug(context, 'sendUpdateValueNgsiLD \n timestamped newEntity=%j', newEntity);
                     }
                     payload.push(newEntity);
@@ -927,14 +1003,14 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
             // timeInstant is provided as measure
             if (Object.keys(payload[0]).length > 1) {
                 // include metadata with TimeInstant in attrs when TimeInstant is provided as measure in all entities
-                payload[0] = NGSIv2.addTimestamp(payload[0], typeInformation.timezone, timestampValue);
+                payload[0] = addTimestamp(payload[0], typeInformation.timezone, timestampValue);
             }
         } else {
             // jshint maxdepth:5
             for (let n = 0; n < payload.length; n++) {
                 if (!utils.isTimestampedNgsi2(payload[n])) {
                     // legacy check needed?
-                    payload[n] = NGSIv2.addTimestamp(payload[n], typeInformation.timezone);
+                    payload[n] = addTimestamp(payload[n], typeInformation.timezone);
                     // jshint maxdepth:5
                 } else if (!utils.IsValidTimestampedNgsi2(payload[n])) {
                     // legacy check needed?