@dhyasama/totem-models 9.74.0 → 9.77.0

package/lib/LimitedPartnerCampaign.js

@@ -47,8 +47,8 @@ module.exports = function(mongoose, config) {
 
   };
 
-  // Scheduled but not sent and now isn't the time
-  LimitedPartnerCampaign.statics.getFuture = function getFuture(customerId, options, cb) {
+  // Scheduled but not sent
+  LimitedPartnerCampaign.statics.getScheduled = function getScheduled(customerId, options, cb) {
 
     const self = this;
     const now = new Date();
@@ -57,17 +57,18 @@ module.exports = function(mongoose, config) {
     if (!customerId) { return cb(new Error('customerId is required'), null); }
     if (!mongoose.Types.ObjectId.isValid(customerId)) { return cb(new Error('customerId is not a valid ObjectId'), null); }
 
+    // No need to check send on. If no sentEmailsToQueue then safe to assume sendOn is in the future.
+
     const query = self.find({
       customer: customerId,
-      sentEmailsToQueue: false,
-      sendOn: { $gte: now }
+      sentEmailsToQueue: false
     });
 
     query.exec(cb);
 
   };
 
-  // Scheduled and not yet sent but now is the time
+  // Scheduled and ready to be sent
   // Note this doesn't use customer id because it's for the worker and we want all customers.
   LimitedPartnerCampaign.statics.getOutbound = function getOutbound(options, cb) {
 
@@ -90,8 +91,8 @@ module.exports = function(mongoose, config) {
 
   };
 
-  // Already sent
-  LimitedPartnerCampaign.statics.getPrevious = function getPrevious(customerId, options, cb) {
+  // Scheduled and sent
+  LimitedPartnerCampaign.statics.getHistorical = function getHistorical(customerId, options, cb) {
 
     const self = this;
 

package/lib/Organization.js

@@ -321,16 +321,16 @@ module.exports = function(mongoose, config) {
 
           active: { type: Boolean, default: false },
 
-          query: {
-            stages: { type: String, trim: true, default: 'active' },
-            timeframe: { type: String, enum: ['Past Week', 'Past Month', 'Past 3 Months', 'Past 6 Months', 'Past Year', 'All Time'], default: 'Past Month' },
-          },
-
           statuses: [{
             name: { type: String, trim: true },
             active: { type: Boolean, default: true }
           }],
 
+          query: {
+            statuses: { type: String, trim: true, default: 'active' },
+            timeframe: { type: String, enum: ['Past Week', 'Past Month', 'Past 3 Months', 'Past 6 Months', 'Past Year', 'All Time'], default: 'Past Month' },
+          },
+
           sourceTypes: { type: Array, default: ['Cold Inbound', 'Cold Outbound', 'Met at Event', 'Was Referred', 'Other'] },
           referrerTypes: { type: Array, default: ['Founder', 'Investor', 'Service Provider', 'Friends & Family', 'Limited Partner', 'Other'] },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "9.74.0",
+  "version": "9.77.0",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",