adminmate-express-mongoose 1.3.10 → 1.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminmate-express-mongoose",
-  "version": "1.3.10",
+  "version": "1.3.12",
   "description": "Adminmate Express/Mongoose connector",
   "author": "Marc Delalonde",
   "homepage": "http://adminmate.io",

package/src/controllers/chart-ranking.js

@@ -87,10 +87,12 @@ module.exports = _conf => {
       const parentIds = repartitionData.map(d => d.key);
       const parentData = await currentModel.find({ _id: parentIds }).select(data.field).lean();
 
+      const parentMap = new Map(parentData.map(p => [p._id.toString(), p]));
+
       repartitionData.forEach(d => {
         d.item_model = data.model;
         d.item_id = d.key;
-        const parent = parentData.find(p => p._id.toString() === d.key.toString());
+        const parent = parentMap.get(d.key.toString());
         if (parent) {
           d.key = parent[data.field];
         }

package/src/controllers/chart-time.js

@@ -115,16 +115,23 @@ module.exports = _conf => {
     if (repartitionData && repartitionData.length > 0) {
       // Get min & max date in the results
       const momentFormat = data.timeframe === 'week' ? 'YYYY-WW' : 'YYYY-MM-DD HH:mm:ss';
-      const unixRange = repartitionData.map(data => moment(data.key, momentFormat));
+      const unixRange = repartitionData.map(d => moment(d.key, momentFormat));
       const min = _.min(unixRange).clone();
       const max = _.max(unixRange).clone();
 
+      // Pre-build a map keyed by formatted date to avoid O(n²) lookup
+      const dataMap = new Map(repartitionData.map(d => {
+        const key = moment(d.key, momentFormat).startOf(data.timeframe).format('YYYY-MM-DD');
+        return [key, d.value];
+      }));
+
       let currentDate = min;
       while (currentDate.isSameOrBefore(max)) {
-        const countForTheTimeframe = repartitionData.find(d => moment(d.key, momentFormat).isSame(currentDate, data.timeframe));
-        const value = countForTheTimeframe ? fnHelper.toFixedIfNecessary(countForTheTimeframe.value, 2) : 0;
+        const dateKey = currentDate.format('YYYY-MM-DD');
+        const matchingValue = dataMap.get(dateKey);
+        const value = matchingValue !== undefined ? fnHelper.toFixedIfNecessary(matchingValue, 2) : 0;
         formattedData.push({
-          key: currentDate.format('YYYY-MM-DD'),
+          key: dateKey,
           value
         });
         currentDate.add(1, data.timeframe).startOf('day');

package/src/controllers/chart-value.js

@@ -102,7 +102,9 @@ module.exports = _conf => {
       }
 
       // Simple count
-      const dataCount = await currentModel.countDocuments(findParams);
+      const dataCount = Object.keys(findParams).length
+        ? await currentModel.countDocuments(findParams)
+        : await currentModel.estimatedDocumentCount();
 
       return {
         success: true,

package/src/controllers/model-getall.js

@@ -84,23 +84,29 @@ module.exports = _conf => {
 
     const findParams = queriesArray.length ? { $and: queriesArray } : {};
 
-    const data = await currentModel
+    const findQuery = currentModel
       .find(findParams)
       .select(fieldsToFetchSafe)
       .populate(fieldsToPopulate)
       .sort(orderSafe)
       .skip(rowsPerPage * (page - 1))
       .limit(rowsPerPage)
-      .lean()
+      .lean();
+
+    const countQuery = queriesArray.length
+      ? currentModel.countDocuments(findParams)
+      : currentModel.estimatedDocumentCount();
+
+    const [data, dataCount] = await Promise.all([findQuery, countQuery])
       .catch(e => {
         res.status(403).json({ message: e.message });
+        return [];
       });
 
     if (!data) {
       return res.status(403).json();
     }
 
-    const dataCount = await currentModel.countDocuments(findParams);
     const nbPage = Math.ceil(dataCount / rowsPerPage);
 
     // Make ref fields appeared as link in the dashboard