Merge branch 'master' into task/add_typeInformation_in_errors

CHANGES_NEXT_RELEASE

@@ -1,3 +1,4 @@
-- ADD: Log and return device/group information when EntityGenericError TypeNotFound DeviceNotFound BadTimestamp BadGeocoordinates CommandNotFound GroupNotFound MissingAttributes DuplicateDeviceId and DuplicateGroup errors
+- Add: log and return device/group information when EntityGenericError, TypeNotFound, DeviceNotFound, BadTimestamp, BadGeocoordinates, CommandNotFound, GroupNotFound, MissingAttributes, DuplicateDeviceId and DuplicateGroup errors
+- Hardening: simplify implementation so typeInformation contains global config values (#1515)
 - Add: `POST /iot/op/delete` operation to delete multiple devices at once (#1578)
 - Fix: store device subscriptions updates (#1086)

doc/api.md

@@ -1765,7 +1765,8 @@ Example:
 _**Response code**_
 
 -   `204` `OK` if successful.
--   `404` `NOT FOUND` if one or several devices were not found in the database. Note that although a 404 error is returned the existing devices are deleted.
+-   `404` `NOT FOUND` if one or several devices were not found in the database. Note that although a 404 error is
+    returned the existing devices are deleted.
 -   `500` `SERVER ERROR` if there was any error not considered above.
 
 ## Miscellaneous API

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

@@ -31,7 +31,6 @@ const request = require('../../request-shim');
 const alarms = require('../common/alarmManagement');
 const errors = require('../../errors');
 const pluginUtils = require('../../plugins/pluginUtils');
-const config = require('../../commonConfig');
 const constants = require('../../constants');
 const jexlParser = require('../../plugins/jexlParser');
 const expressionPlugin = require('../../plugins/expressionPlugin');
@@ -309,11 +308,9 @@ function sendUpdateValueNgsi2(entityName, measures, typeInformation, token, call
     jexlctxt = reduceAttrToPlainObject(idTypeSSSList, jexlctxt);
 
     //Managing timestamp (mustInsertTimeInstant flag to decide if we should insert Timestamp later on)
-    const mustInsertTimeInstant =
-        typeInformation.timestamp !== undefined
-            ? typeInformation.timestamp
-            : config.getConfig().timestamp !== undefined
-            ? config.getConfig().timestamp
+    const mustInsertTimeInstant = 
+        typeInformation.timestamp !== undefined 
+            ? typeInformation.timestamp 
             : false;
 
     if (mustInsertTimeInstant) {

lib/services/ngsi/ngsiService.js

@@ -144,9 +144,9 @@ function executeWithDeviceInformation(operationFunction) {
             // For preregistered devices, augment the existing deviceInformation with selected attributes.
             if (!callback) {
                 callback = deviceInformation;
-                typeInformation = deviceGroup || configDeviceInfo;
+                typeInformation = deviceGroup || { ...config.getConfig(), ...configDeviceInfo };
             } else {
-                typeInformation = deviceInformation;
+                typeInformation = { ...config.getConfig(), ...deviceInformation };
                 attributeList.forEach((key) => {
                     typeInformation[key] =
                         typeInformation[key] || (deviceGroup || {})[key] || (configDeviceInfo || {})[key];