rename sub callbacks

lib/services/configurationData.js

@@ -70,7 +70,7 @@ function createGetWithFields(fields) {
         logger.debug('Looking for configuration with params %j and query %j', fields, queryObj);
 
         const query = Configuration.model.find(queryObj);
-        const query2 = Configuration.model.countDocuments(queryObj);
+        const queryCount = Configuration.model.countDocuments(queryObj);
         if (limit) {
             query.limit(parseInt(limit, 10));
         }
@@ -79,28 +79,28 @@ function createGetWithFields(fields) {
             query.skip(parseInt(offset, 10));
         }
 
-        function func1(callback) {
+        function funcQuery(cb) {
             query
                 .exec({})
                 .then((res) => {
-                    callback(null, res);
+                    cb(null, res);
                 })
                 .catch((error) => {
-                    callback(error);
+                    cb(error);
                 });
         }
-        function func2(callback) {
-            query2
+        function funcQueryCount(cb) {
+            queryCount
                 .exec({})
                 .then((res) => {
-                    callback(null, res);
+                    cb(null, res);
                 })
                 .catch((error) => {
-                    callback(error);
+                    cb(error);
                 });
         }
 
-        async.series([func1, func2], function (error, results) {
+        async.series([funcQuery, funcQueryCount], function (error, results) {
             if (!error && results && results.length === 2) {
                 callback(null, {
                     services: results[0],

lib/services/protocolData.js

@@ -146,18 +146,18 @@ function save(logger, newProtocol, callback) {
                 );
             }
             /* eslint-disable no-inner-declarations */
-            function func1(callback) {
+            function funcSave(cb) {
                 protocolObj
                     .save({})
                     .then((res) => {
-                        callback(null, res);
+                        cb(null, res);
                     })
                     .catch((error) => {
-                        callback(error);
+                        cb(error);
                     });
             }
             /* eslint-enable no-inner-declarations */
-            actions.push(func1);
+            actions.push(funcSave);
             async.series(actions, callback);
         }
     });

lib/services/protocols.js

@@ -34,15 +34,15 @@ function readProtocolList(req, res, next) {
     logger.debug('List protocols request with args %j', JSON.stringify(req.query));
 
     const query = Protocol.model.find(condition).sort();
-    const query2 = Protocol.model.countDocuments(condition);
+    const queryCount = Protocol.model.countDocuments(condition);
     if (req.query && req.query.limit) {
         query.limit(parseInt(req.query.limit, 10));
     }
 
     if (req.query && req.query.offset) {
         query.skip(parseInt(req.query.offset, 10));
     }
-    function func1(callback) {
+    function funcQuery(callback) {
         query
             .exec({})
             .then((res) => {
@@ -52,8 +52,8 @@ function readProtocolList(req, res, next) {
                 callback(error);
             });
     }
-    function func2(callback) {
-        query2
+    function funcQueryCount(callback) {
+        queryCount
             .exec({})
             .then((res) => {
                 callback(null, res);
@@ -62,7 +62,7 @@ function readProtocolList(req, res, next) {
                 callback(error);
             });
     }
-    async.series([func1, func2], function (error, results) {
+    async.series([funcQuery, funcQueryCount], function (error, results) {
         if (error) {
             logger.error('error: %j', error);
             next(error);