update dropDatabase

lib/model/dbConn.js

@@ -83,8 +83,9 @@ function init(host, db, port, options, callback) {
 
         mongoose
             .connect(url, options)
-            .then((connection) => {
-                defaultDb = connection.connection;
+            .then(() => {
+                //defaultDb = connection.connection;
+                defaultDb = mongoose.connection;
                 logger.info(context, 'Successfully connected to MongoDB.');
                 loadModels();
                 callback();

lib/services/commands/commandRegistryMongoDB.js

@@ -22,7 +22,8 @@
  */
 
 const logger = require('logops');
-const dbService = require('../../model/dbConn');
+//const dbService = require('../../model/dbConn');
+const mongoose = require('mongoose');
 const intoTrans = require('../common/domain').intoTrans;
 const errors = require('../../errors');
 const Command = require('../../model/Command');
@@ -92,9 +93,17 @@ function updateCommand(service, subservice, deviceId, command, callback) {
         } else {
             commandDAO.value = command.value;
 
-            commandDAO.save(function (error) {
-                callback(error, commandDAO.toObject());
-            });
+            commandDAO
+                .save({})
+                .then((commandDAOs) => {
+                    callback(null, commandDAOs.toObject());
+                })
+                .catch((error) => {
+                    callback(error);
+                });
+            // commandDAO.save(function (error) {
+            //     callback(error, commandDAO.toObject());
+            // });
         }
     });
 }
@@ -114,15 +123,24 @@ function createCommand(service, subservice, deviceId, command, callback) {
 
     logger.debug(context, 'Storing command for deviceId [%s] with name [%s]', deviceId, command.name);
 
-    commandObj.save(function saveHandler(error, commandDAO) {
-        if (error) {
+    commandObj
+        .save({})
+        .then((commandDAO) => {
+            callback(null, commandDAO.toObject());
+        })
+        .catch((error) => {
             logger.debug(context, 'Error storing command information: %s', error);
-
             callback(new errors.InternalDbError(error));
-        } else {
-            callback(null, commandDAO.toObject());
-        }
-    });
+        });
+    // commandObj.save(function saveHandler(error, commandDAO) {
+    //     if (error) {
+    //         logger.debug(context, 'Error storing command information: %s', error);
+
+    //         callback(new errors.InternalDbError(error));
+    //     } else {
+    //         callback(null, commandDAO.toObject());
+    //     }
+    // });
 }
 
 function addCommand(service, subservice, deviceId, command, callback) {
@@ -310,7 +328,15 @@ function removeFromDate(creationDate, callback) {
 }
 
 function clear(callback) {
-    dbService.db.db.dropDatabase(callback);
+    //dbService.db.db.dropDatabase(callback);
+    mongoose.connection
+        .dropDatabase()
+        .then(() => {
+            callback(null);
+        })
+        .catch((error) => {
+            callback(error);
+        });
 }
 
 function init(newConfig, callback) {

lib/services/devices/deviceRegistryMongoDB.js

@@ -22,7 +22,8 @@
  */
 
 const logger = require('logops');
-const dbService = require('../../model/dbConn');
+//const dbService = require('../../model/dbConn');
+const mongoose = require('mongoose');
 const config = require('../../commonConfig');
 const fillService = require('./../common/domain').fillService;
 const alarmsInt = require('../common/alarmManagement').intercept;
@@ -423,7 +424,15 @@ function update(previousDevice, device, callback) {
  * Cleans all the information in the database, leaving it in a clean state.
  */
 function clear(callback) {
-    dbService.db.db.dropDatabase(callback);
+    //dbService.db.db.dropDatabase(callback);
+    mongoose.connection
+        .dropDatabase()
+        .then(() => {
+            callback(null);
+        })
+        .catch((error) => {
+            callback(error);
+        });
 }
 
 function itemToObject(i) {

lib/services/groups/groupRegistryMongoDB.js

@@ -24,7 +24,7 @@
  */
 
 const logger = require('logops');
-const dbService = require('../../model/dbConn');
+//const dbService = require('../../model/dbConn');
 const intoTrans = require('../common/domain').intoTrans;
 const fillService = require('./../common/domain').fillService;
 const alarmsInt = require('../common/alarmManagement').intercept;
@@ -191,7 +191,7 @@ function listGroups(service, limit, offset, callback) {
         logger.debug('results of query: %j', results);
         callback(error, {
             count: results[1],
-            devices: results[0].map(toObjectFn)
+            services: results[0].map(toObjectFn)
         });
     });
     // async.series(
@@ -274,7 +274,7 @@ function find(service, subservice, callback) {
                 cb(error);
             });
     }
-    function funcQueryCount(callback) {
+    function funcQueryCount(cb) {
         queryCount
             .exec({})
             .then((res) => {
@@ -287,7 +287,7 @@ function find(service, subservice, callback) {
     async.series([funcQuery, funcQueryCount], function (error, results) {
         callback(error, {
             count: results[1],
-            devices: results[0].map(toObjectFn)
+            services: results[0].map(toObjectFn)
         });
     });
     // async.series(
@@ -425,7 +425,15 @@ function init(newConfig, callback) {
 }
 
 function clear(callback) {
-    dbService.db.db.dropDatabase(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));