iotagent-node-lib 4.5.0 → 4.7.0

package/lib/services/groups/groupRegistryMongoDB.js

@@ -24,7 +24,7 @@
  */
 
 const logger = require('logops');
-const dbService = require('../../model/dbConn');
+const mongoose = require('mongoose');
 const intoTrans = require('../common/domain').intoTrans;
 const fillService = require('./../common/domain').fillService;
 const alarmsInt = require('../common/alarmManagement').intercept;
@@ -61,28 +61,11 @@ const attributeList = [
     'defaultEntityNameConjunction',
     'ngsiVersion',
     'entityNameExp',
-    'payloadType'
+    'payloadType',
+    'useCBflowControl',
+    'storeLastMeasure'
 ];
 
-/**
- * Generates a handler for the save device group operations. The handler will take the customary error and the saved
- * device group as the parameters (and pass the serialized DAO as the callback value).
- *
- * @return {Function}       The generated handler.
- */
-function saveGroupHandler(groupDAO, callback) {
-    /* eslint-disable-next-line no-unused-vars */
-    return function saveHandler(error, result) {
-        if (error) {
-            logger.debug(fillService(context, groupDAO), 'Error storing device group information: %s', error);
-
-            callback(new errors.InternalDbError(error));
-        } else {
-            callback(null, groupDAO.toObject());
-        }
-    };
-}
-
 function createGroup(group, callback) {
     /* eslint-disable-next-line  new-cap */
     const groupObj = new Group.model();
@@ -99,9 +82,12 @@ function createGroup(group, callback) {
         groupObj.apikey,
         groupObj.resource
     );
-
-    groupObj.save(function saveHandler(error, groupDAO) {
-        if (error) {
+    groupObj
+        .save({})
+        .then((groupDAO) => {
+            callback(null, groupDAO.toObject());
+        })
+        .catch((error) => {
             if (error.code === 11000) {
                 logger.debug(
                     context,
@@ -109,17 +95,12 @@ function createGroup(group, callback) {
                     group.resource,
                     group.apikey
                 );
-
                 callback(new errors.DuplicateGroup(group));
             } else {
                 logger.debug(context, 'Error storing device group information: %s', error);
-
                 callback(new errors.InternalDbError(error));
             }
-        } else {
-            callback(null, groupDAO.toObject());
-        }
-    });
+        });
 }
 
 /**
@@ -141,7 +122,7 @@ function listGroups(service, limit, offset, callback) {
     }
 
     const query = Group.model.find(condition).sort();
-
+    const queryCount = Group.model.countDocuments(condition);
     if (limit) {
         query.limit(parseInt(limit, 10));
     }
@@ -149,16 +130,32 @@ function listGroups(service, limit, offset, callback) {
     if (offset) {
         query.skip(parseInt(offset, 10));
     }
-
-    async.series(
-        [query.exec.bind(query), Group.model.countDocuments.bind(Group.model, condition)],
-        function (error, results) {
-            callback(error, {
-                count: results[1],
-                services: results[0].map(toObjectFn)
+    function funcQuery(cb) {
+        query
+            .exec({})
+            .then((res) => {
+                cb(null, res);
+            })
+            .catch((error) => {
+                cb(error);
             });
-        }
-    );
+    }
+    function funcQueryCount(cb) {
+        queryCount
+            .exec({})
+            .then((res) => {
+                cb(null, res);
+            })
+            .catch((error) => {
+                cb(error);
+            });
+    }
+    async.series([funcQuery, funcQueryCount], function (error, results) {
+        callback(error, {
+            count: results[1],
+            services: results[0].map(toObjectFn)
+        });
+    });
 }
 
 function getById(id, callback) {
@@ -168,21 +165,22 @@ function getById(id, callback) {
     const query = Group.model.findOne({ _id: id });
     query.select({ __v: 0 });
 
-    query.lean().exec(function handleGet(error, data) {
-        if (error) {
+    query
+        .exec({})
+        .then((data) => {
+            if (data) {
+                context = fillService(context, data);
+                logger.debug(context, 'Device group data found: %j', data);
+                callback(null, data);
+            } else {
+                logger.debug(context, 'Device group [%s] not found.', id);
+                callback(new errors.DeviceGroupNotFound(id));
+            }
+        })
+        .catch((error) => {
             logger.debug(context, 'Internal MongoDB Error getting group: %s', error);
-
             callback(new errors.InternalDbError(error));
-        } else if (data) {
-            context = fillService(context, data);
-            logger.debug(context, 'Device group data found: %j', data);
-            callback(null, data);
-        } else {
-            logger.debug(context, 'Device group [%s] not found.', id);
-
-            callback(new errors.DeviceGroupNotFound(id));
-        }
-    });
+        });
 }
 
 /**
@@ -203,34 +201,56 @@ function find(service, subservice, callback) {
     condition.subservice = subservice;
 
     const query = Group.model.find(condition).sort();
-
-    async.series(
-        [query.exec.bind(query), Group.model.countDocuments.bind(Group.model, condition)],
-        function (error, results) {
-            callback(error, {
-                count: results[1],
-                services: results[0].map(toObjectFn)
+    const queryCount = Group.model.countDocuments(condition);
+    function funcQuery(cb) {
+        query
+            .exec({})
+            .then((res) => {
+                cb(null, res);
+            })
+            .catch((error) => {
+                cb(error);
             });
-        }
-    );
+    }
+    function funcQueryCount(cb) {
+        queryCount
+            .exec({})
+            .then((res) => {
+                cb(null, res);
+            })
+            .catch((error) => {
+                cb(error);
+            });
+    }
+    async.series([funcQuery, funcQueryCount], function (error, results) {
+        callback(error, {
+            count: results[1],
+            services: results[0].map(toObjectFn)
+        });
+    });
 }
 
 function findOneInMongoDB(queryObj, fields, callback) {
     const query = Group.model.findOne(queryObj);
     query.select({ __v: 0 });
-    query.lean().exec(function handleGet(error, data) {
-        if (error) {
+    query.lean();
+
+    query
+        .exec({})
+        .then((data) => {
+            if (data) {
+                context = fillService(context, data);
+                logger.debug(context, 'Device group data found: %j', data);
+                callback(null, data);
+            } else {
+                logger.debug(context, 'Device group for fields [%j] not found: [%j]', fields, queryObj);
+                callback(new errors.DeviceGroupNotFound(fields, queryObj));
+            }
+        })
+        .catch((error) => {
             logger.debug(context, 'Internal MongoDB Error getting group: %s', error);
             callback(new errors.InternalDbError(error));
-        } else if (data) {
-            context = fillService(context, data);
-            logger.debug(context, 'Device group data found: %j', data);
-            callback(null, data);
-        } else {
-            logger.debug(context, 'Device group for fields [%j] not found: [%j]', fields, queryObj);
-            callback(new errors.DeviceGroupNotFound(fields, queryObj));
-        }
-    });
+        });
 }
 
 function findBy(fields) {
@@ -269,7 +289,15 @@ function update(id, body, callback) {
             /* eslint-disable-next-line  new-cap */
             const groupObj = new Group.model(group);
             groupObj.isNew = false;
-            groupObj.save(saveGroupHandler(groupObj, callback));
+            groupObj
+                .save({})
+                .then((groupDAO) => {
+                    callback(null, groupDAO.toObject());
+                })
+                .catch((error) => {
+                    logger.debug(fillService(context, group), 'Error storing device group information: %s', error);
+                    callback(new errors.InternalDbError(error));
+                });
         }
     });
 }
@@ -281,16 +309,18 @@ function remove(id, callback) {
         if (error) {
             callback(error);
         } else {
-            Group.model.deleteOne({ _id: id }, function (error) {
-                if (error) {
-                    logger.debug(context, 'Internal MongoDB Error getting device: %s', error);
+            const query = Group.model.deleteOne({ _id: id });
+            query
+                .exec({})
+                .then(() => {
+                    logger.debug(context, 'Device group [%s] successfully removed.', id);
+                    callback(null, deviceGroup);
+                })
+                .catch((error) => {
+                    logger.debug(context, 'Internal MongoDB Error getting device group: %s', error);
 
                     callback(new errors.InternalDbError(error));
-                } else {
-                    logger.debug(context, 'Device [%s] successfully removed.', id);
-                    callback(null, deviceGroup);
-                }
-            });
+                });
         }
     });
 }
@@ -300,7 +330,14 @@ function init(newConfig, callback) {
 }
 
 function clear(callback) {
-    dbService.db.db.dropDatabase(callback);
+    mongoose.connection
+        .dropDatabase()
+        .then(() => {
+            callback(null);
+        })
+        .catch((error) => {
+            callback(error);
+        });
 }
 
 exports.create = alarmsInt(constants.MONGO_ALARM + '_01', intoTrans(context, createGroup));

package/lib/services/groups/groupService.js

@@ -123,7 +123,7 @@ function listGroups(service, limit, offset, callback) {
 }
 
 function checkServiceIdentity(service, subservice, deviceGroup, callback) {
-    if (deviceGroup.service === service && deviceGroup.subservice === subservice) {
+    if (deviceGroup.service === service.toLowerCase() && deviceGroup.subservice === subservice) {
         callback(null, deviceGroup);
     } else {
         callback(new errors.MismatchedService(service, subservice));