Merge pull request #1153 from telefonicaid/task/add_updating_device_handler

Task/add updating device handler

Author: fgalan

CHANGES_NEXT_RELEASE

@@ -1 +1,3 @@
+- ADD: allow update polling devide field (iota-json#602)
+- ADD: support for add and update device handler (iota-json#602)
 - ADD: support both WARN and WARNING log levels (#1146)

lib/fiware-iotagent-lib.js

@@ -325,6 +325,7 @@ exports.setDataQueryHandler = contextServer.setQueryHandler;
 exports.setConfigurationHandler = contextServer.setConfigurationHandler;
 exports.setRemoveConfigurationHandler = contextServer.setRemoveConfigurationHandler;
 exports.setProvisioningHandler = contextServer.setProvisioningHandler;
+exports.setUpdatingHandler = contextServer.setUpdatingHandler;
 exports.setRemoveDeviceHandler = contextServer.setRemoveDeviceHandler;
 exports.setNotificationHandler = contextServer.setNotificationHandler;
 exports.addUpdateMiddleware = ngsi.addUpdateMiddleware;

lib/services/devices/deviceRegistryMongoDB.js

@@ -289,6 +289,7 @@ function update(device, callback) {
             data.internalAttributes = device.internalAttributes;
             data.commands = device.commands;
             data.endpoint = device.endpoint;
+            data.polling = device.polling;
             data.name = device.name;
             data.type = device.type;
             data.apikey = device.apikey;

lib/services/northBound/deviceProvisioningServer.js

@@ -34,6 +34,7 @@ const context = {
 };
 const apply = async.apply;
 let provisioningHandler;
+let updatingHandler;
 let removeDeviceHandler;
 let updateDeviceTemplate;
 let createDeviceTemplate;
@@ -53,6 +54,7 @@ const provisioningAPITranslation = {
     protocol: 'protocol',
     transport: 'transport',
     endpoint: 'endpoint',
+    polling: 'polling',
     attributes: 'active',
     commands: 'commands',
     lazy: 'lazy',
@@ -204,6 +206,7 @@ function toProvisioningAPIFormat(device) {
         timezone: device.timezone,
         timestamp: device.timestamp,
         endpoint: device.endpoint,
+        polling: device.polling,
         transport: device.transport,
         attributes: device.active ? device.active.map(attributeToProvisioningAPIFormat) : undefined,
         lazy: device.lazy ? device.lazy.map(attributeToProvisioningAPIFormat) : undefined,
@@ -317,6 +320,14 @@ function handleRemoveDevice(req, res, next) {
  * This middleware handles updates in the provisioning devices. The only attribute
  */
 function handleUpdateDevice(req, res, next) {
+    function applyUpdatingHandler(device, callback) {
+        if (updatingHandler) {
+            updatingHandler(device, callback);
+        } else {
+            callback(null, device);
+        }
+    }
+
     if (req.body.device_id) {
         next(new errors.BadRequest("Can't change the ID of a preprovisioned device"));
     } else {
@@ -338,12 +349,19 @@ function handleUpdateDevice(req, res, next) {
                     if (req.body.entity_name || req.body.entity_type) {
                         isTypeOrNameUpdated = true;
                     }
-                    deviceService.updateRegister(newDevice, isTypeOrNameUpdated, function handleDeviceUpdate(error) {
-                        if (error) {
-                            next(error);
-                        } else {
-                            res.status(204).json({});
-                        }
+                    async.waterfall([apply(applyUpdatingHandler, newDevice)], function handleUpdating(
+                        error,
+                        newDeviceUpdated
+                    ) {
+                        deviceService.updateRegister(newDeviceUpdated, isTypeOrNameUpdated, function handleDeviceUpdate(
+                            error
+                        ) {
+                            if (error) {
+                                next(error);
+                            } else {
+                                res.status(204).json({});
+                            }
+                        });
                     });
                 } else {
                     next(new errors.DeviceNotFound(req.params.deviceId));
@@ -392,6 +410,10 @@ function setProvisioningHandler(newHandler) {
     provisioningHandler = newHandler;
 }
 
+function setUpdatingHandler(newHandler) {
+    updatingHandler = newHandler;
+}
+
 function setRemoveDeviceHandler(newHandler) {
     removeDeviceHandler = newHandler;
 }
@@ -409,6 +431,7 @@ function clear(callback) {
 exports.setConfiguration = setConfiguration;
 exports.loadContextRoutes = intoTrans(context, loadContextRoutes);
 exports.setProvisioningHandler = intoTrans(context, setProvisioningHandler);
+exports.setUpdatingHandler = intoTrans(context, setUpdatingHandler);
 exports.setRemoveDeviceHandler = intoTrans(context, setRemoveDeviceHandler);
 exports.addDeviceProvisionMiddleware = addDeviceProvisionMiddleware;
 exports.clear = clear;

lib/services/northBound/northboundServer.js

@@ -31,6 +31,7 @@ const domainUtils = require('../common/domain');
 const middlewares = require('../common/genericMiddleware');
 const intoTrans = domainUtils.intoTrans;
 const deviceProvisioning = require('./deviceProvisioningServer');
+const deviceUpdating = require('./deviceProvisioningServer');
 const groupProvisioning = require('./deviceGroupAdministrationServer');
 const logger = require('logops');
 const context = {
@@ -116,6 +117,7 @@ exports.setNotificationHandler = intoTrans(context, contextServer.setNotificatio
 exports.setConfigurationHandler = intoTrans(context, groupProvisioning.setConfigurationHandler);
 exports.setRemoveConfigurationHandler = intoTrans(context, groupProvisioning.setRemoveConfigurationHandler);
 exports.setProvisioningHandler = intoTrans(context, deviceProvisioning.setProvisioningHandler);
+exports.setUpdatingHandler = intoTrans(context, deviceUpdating.setUpdatingHandler);
 exports.setRemoveDeviceHandler = intoTrans(context, deviceProvisioning.setRemoveDeviceHandler);
 exports.addDeviceProvisionMiddleware = deviceProvisioning.addDeviceProvisionMiddleware;
 exports.addConfigurationProvisionMiddleware = groupProvisioning.addConfigurationProvisionMiddleware;