@dhyasama/totem-models 11.5.0 → 11.6.0

package/lib/Interaction.js

@@ -196,13 +196,13 @@ module.exports = function(mongoose, config) {
     if (!mongoose.Types.ObjectId.isValid(customerId)) { return cb(new Error('customerId is not a valid ObjectId'), null); }
 
     const self = this;
-    const startDate = options.startDate || moment().subtract(20, 'years').startOf('day').toISOString();
-    const endDate = options.endDate || moment().toISOString();
+    const startDate = options.startDate ? moment(options.startDate).toDate() : moment().subtract(20, 'years').startOf('day').toDate();
+    const endDate = options.endDate ? moment(options.endDate).toDate() : new Date();
 
     self.aggregate([
       {
         $match: {
-          totemCustomerId: customerId,
+          totemCustomerId: mongoose.Types.ObjectId(customerId),
           startTime: {
             $gte: startDate,
             $lte: endDate

package/lib/Organization.js

@@ -1655,6 +1655,54 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Organization.statics.getDocumentsForOrgs = function getDocumentsForOrgs(orgIds, customerId, startDate, endDate, options, cb) {
+
+    const self = this;
+
+    if (!cb) {
+      throw new Error('cb is required');
+    }
+    if (!orgIds) {
+      return cb(new Error('orgIds is required'), null);
+    }
+    if (!options) {
+      return cb(new Error('options is required'), null);
+    }
+    if (!customerId) {
+      return cb(new Error('customerId is required'), null);
+    }
+    if (!startDate) {
+      return cb(new Error('startDate is required'), null);
+    }
+    if (!endDate) {
+      return cb(new Error('endDate is required'), null);
+    }
+
+    let query = self
+      .find( {'_id': { $in : orgIds } } )
+      .select('_id documents')
+      .populate({
+        path: 'documents',
+        match: {
+          customer: customerId,
+          createdOn: { $gte: startDate, $lte: endDate }
+        },
+      })
+
+    query.exec(function(err, result) {
+
+      if (err) { return cb(err, null); }
+
+      result = _.filter(result, function(org) {
+        return org.documents.length > 0;
+      });
+
+      return cb(null, result);
+
+    });
+
+  };
+
   Organization.statics.getFlags = function getFlags(orgid, options, cb) {
 
     const self = this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "11.5.0",
+  "version": "11.6.0",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",
@@ -20,17 +20,17 @@
     "awesome-phonenumber": "^1.0.14",
     "bluebird": "^3.7.2",
     "escape-string-regexp": "^1.0.5",
-    "moment": "^2.29.4",
+    "moment": "^2.30.1",
     "mongoose-deep-populate": "^3.2.0",
     "range_check": "^1.4.0",
     "request": "^2.88.0",
     "underscore": "^1.13.6",
-    "validator": "^13.7.0"
+    "validator": "^13.11.0"
   },
   "devDependencies": {
-    "mocha": "^10.2.0",
+    "mocha": "^10.3.0",
     "mocha-mongoose": "^1.2.0",
-    "mongoose": "^5.13.17",
+    "mongoose": "^5.13.22",
     "should": "^11.1.1"
   }
 }