adminmate-express-mongoose 1.3.11 → 1.3.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminmate-express-mongoose",
-  "version": "1.3.11",
+  "version": "1.3.13",
   "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/helpers/functions.js

@@ -115,14 +115,17 @@ module.exports = _conf => {
       return queryRuleSet(rule);
     }
     let q = {};
+    // Strict 24-hex check — mongoose.isValidObjectId accepts any 24-char string,
+    // which throws when constructing an ObjectId from a non-hex value.
+    const isStrictObjectId = (val) => typeof val === 'string' && /^[a-f\d]{24}$/i.test(val);
     if (rule.operator === 'is') {
       // In order that aggregate queries to work well
-      const value = mongoose.isValidObjectId(rule.value) ? new mongoose.Types.ObjectId(rule.value) : rule.value;
+      const value = isStrictObjectId(rule.value) ? new mongoose.Types.ObjectId(rule.value) : rule.value;
       q[rule.field] = { $eq: value };
     }
     else if (rule.operator === 'is_not') {
       // In order that aggregate queries to work well
-      const value = mongoose.isValidObjectId(rule.value) ? new mongoose.Types.ObjectId(rule.value) : rule.value;
+      const value = isStrictObjectId(rule.value) ? new mongoose.Types.ObjectId(rule.value) : rule.value;
       q[rule.field] = { $ne: value };
     }
     // Date
@@ -334,9 +337,10 @@ module.exports = _conf => {
       params.$or.push({ [field]: { '$regex': `${search}`, '$options': 'i' } });
     });
 
-    // If the search is a valid mongodb _id
-    // An object id's only defining feature is that its 12 bytes long
-    if (mongoose.isValidObjectId(search)) {
+    // If the search looks like a real mongodb ObjectId (24 hex chars).
+    // mongoose.isValidObjectId is too permissive (accepts any 24-char string),
+    // which causes Cast errors for values like "foo.myshopify.com" (24 chars but not hex).
+    if (/^[a-f\d]{24}$/i.test(search)) {
       params.$or.push({ _id: search });
       fieldsToPopulate.map(field => {
         params.$or.push({ [field.path]: search });