uses previous device in device update handler

telefonicaid · May 22, 2024 · baae52f · baae52f
1 parent 84af6f9
commit baae52f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/lib/bindings/AMQPBinding.js b/lib/bindings/AMQPBinding.js
@@ -246,7 +246,7 @@ function deviceProvisioningHandler(device, callback) {
  *
  * @param {Object} device           Device object containing all the information about the provisioned device.
  */
-function deviceUpdatingHandler(device, callback) {
+function deviceUpdatingHandler(device, oldDevice, callback) {
     callback(null, device);
 }
 

diff --git a/lib/bindings/ARGOBinding.js b/lib/bindings/ARGOBinding.js
@@ -522,7 +522,7 @@ function deviceProvisioningHandler(device, callback) {
  *
  * @param {Object} device           Device object containing all the information about the updated device.
  */
-function deviceUpdatingHandler(device, callback) {
+function deviceUpdatingHandler(device, oldDevice, callback) {
     return callback(null, device);
 }
 

diff --git a/lib/bindings/HTTPBinding.js b/lib/bindings/HTTPBinding.js
@@ -546,18 +546,20 @@ function deviceProvisioningHandler(device, callback) {
  *
  * @param {Object} device           Device object containing all the information about the updated device.
  */
-function deviceUpdatingHandler(device, callback) {
-    config.getLogger().debug(context, 'httpbinding.deviceUpdatingHandler device %j', device);
+function deviceUpdatingHandler(newDevice, oldDevice, callback) {
+    config
+        .getLogger()
+        .debug(context, 'httpbinding.deviceUpdatingHandler newDevice %j oldDevice %j', newDevice, oldDevice);
     let group = {};
-    iotAgentLib.getConfigurationSilently(config.getConfig().iota.defaultResource || '', device.apikey, function (
+    iotAgentLib.getConfigurationSilently(config.getConfig().iota.defaultResource || '', oldDevice.apikey, function (
         error,
         foundGroup
     ) {
         if (!error) {
             group = foundGroup;
         }
         config.getLogger().debug(context, 'httpbinding.deviceUpdatingHandler group %j', group);
-        setPollingAndDefaultTransport(device, group, callback);
+        setPollingAndDefaultTransport(newDevice, group, callback);
     });
 }
 

diff --git a/lib/bindings/MQTTBinding.js b/lib/bindings/MQTTBinding.js
@@ -345,7 +345,7 @@ function deviceProvisioningHandler(device, callback) {
  *
  * @param {Object} device           Device object containing all the information about the provisioned device.
  */
-function deviceUpdatingHandler(device, callback) {
+function deviceUpdatingHandler(device, oldDevice, callback) {
     callback(null, device);
 }
 

diff --git a/lib/iotagent-json.js b/lib/iotagent-json.js
@@ -101,6 +101,7 @@ function updateHandler(id, type, attributes, service, subservice, callback) {
  * @param {Object} device           Device provisioning information.
  */
 function deviceProvisioningHandler(device, callback) {
+    config.getLogger().debug(context, 'deviceProvisioningHandler for device %j', device);
     transportSelector.applyFunctionFromBinding([device], 'deviceProvisioningHandler', null, function (error, devices) {
         if (error) {
             callback(error);
@@ -111,13 +112,18 @@ function deviceProvisioningHandler(device, callback) {
 }
 
 /**
- * Calls all the device updating handlers for each transport protocol binding whenever a new device is updated
+ * Calls all the device updating handlers for each transport protocol binding whenever a device is updated
  * in the Agent.
  *
  * @param {Object} device           Device updating information.
  */
-function deviceUpdatingHandler(device, callback) {
-    transportSelector.applyFunctionFromBinding([device], 'deviceUpdatingHandler', null, function (error, devices) {
+function deviceUpdatingHandler(newDevice, oldDevice, callback) {
+    config.getLogger().debug(context, 'deviceUpdatingHandler for newDevice %j oldDevice %j', newDevice, oldDevice);
+    // Maybe get apikey from group ?
+    transportSelector.applyFunctionFromBinding([newDevice, oldDevice], 'deviceUpdatingHandler', null, function (
+        error,
+        devices
+    ) {
         if (error) {
             callback(error);
         } else {