Merge pull request #796 from telefonicaid/task/use_apikey_to_search_group_config

use apikey to search group config

Author: fgalan

CHANGES_NEXT_RELEASE

@@ -1,3 +1,5 @@
+- ADD use apikey to search group config at device creation time
+- ADD to use apikey to search group configuration at device registration time
 - Upgrade async dependency from 2.6.1 to 2.6.2
 - Upgrade body-parser dependency from ~1.18.3 to ~1.19.0
 - Upgrade moment dependency from ~2.22.2 to ~2.24.0
@@ -10,4 +12,4 @@
 - Upgrade mocha dev dependency from 5.2.0 to 6.1.4
 - Upgrade nock dev dependency from 10.0.1 to 10.0.6
 - Upgrade timekeeper dev dependency from 2.1.2 to 2.2.0
-- Set Nodejs 8 as minimum version in packages.json (effectively removing Nodev6 from supported versions)
+- Set Nodejs 8 as minimum version in packages.json (effectively removing Nodev6 from supported versions)

lib/services/devices/deviceService.js

@@ -636,6 +636,7 @@ function findConfigurationGroup(deviceObj, callback) {
             deviceObj.service,
             deviceObj.subservice,
             deviceObj.type,
+            deviceObj.apikey,
             handlerGroupFind);
     }
 }

lib/services/groups/groupRegistryMongoDB.js

@@ -303,7 +303,8 @@ exports.create = alarmsInt(constants.MONGO_ALARM, intoTrans(context, createGroup
 exports.list = alarmsInt(constants.MONGO_ALARM, intoTrans(context, listGroups));
 exports.init = alarmsInt(constants.MONGO_ALARM, intoTrans(context, init));
 exports.find = alarmsInt(constants.MONGO_ALARM, intoTrans(context, find));
-exports.findType = alarmsInt(constants.MONGO_ALARM, intoTrans(context, findBy(['service', 'subservice', 'type'])));
+exports.findType = alarmsInt(constants.MONGO_ALARM,
+                             intoTrans(context, findBy(['service', 'subservice', 'type', 'apikey'])));
 exports.findBy = alarmsInt(constants.MONGO_ALARM, intoTrans(context, findBy));
 exports.get = alarmsInt(constants.MONGO_ALARM, intoTrans(context, findBy(['resource', 'apikey'])));
 exports.getType = alarmsInt(constants.MONGO_ALARM, intoTrans(context, findBy(['type'])));

lib/services/northBound/deviceProvisioningServer.js

@@ -106,6 +106,7 @@ function handleProvision(req, res, next) {
 
         callback(null, {
             id: body['device_id'],
+            apikey: body['apikey'],
             type: body['entity_type'],
             name: body['entity_name'],
             service: service,
@@ -141,7 +142,6 @@ function handleProvision(req, res, next) {
     }
 
     logger.debug(context, 'Handling device provisioning request.');
-
     async.map(extractDevices(), provisionSingleDevice, handleProvisioningFinish);
 }