@dhyasama/totem-models 9.68.0 → 9.69.0

package/lib/LimitedPartnerCommunication.js

@@ -18,9 +18,6 @@ module.exports = function(mongoose, config) {
     // attach document to email (only option currently supported)
     attachToEmail: { type: Boolean, required: true, default: true },
 
-    // job was added to queue to send email
-    sentToQueue: { type: Boolean, required: true, default: false },
-
     // when email was sent
     sentOn: { type: Date, required: false },
 
@@ -72,10 +69,8 @@ module.exports = function(mongoose, config) {
     const self = this;
 
     if (!cb) { throw new Error('cb is required'); }
-    if (!campaignId) { return cb(new Error('campaignId is required'), null); }
-    if (!mongoose.Types.ObjectId.isValid(campaignId)) { return cb(new Error('campaignId is not a valid ObjectId'), null); }
 
-    let query = self.find({
+    const query = self.find({
       campaign: { $in: campaignIds }
     });
 
@@ -124,22 +119,17 @@ module.exports = function(mongoose, config) {
 
   };
 
-  // Get all communications that haven't been sent but are scheduled to go
-  // Scheduled worker jobs will use this and add them to the queue to send
-  LimitedPartnerCommunication.statics.getReadyToSend = function getReadyToSend(options, cb) {
+  LimitedPartnerCommunication.statics.getUnsentByCampaigns = function getUnsentByCampaigns(campaignIds, options, cb) {
 
     const self = this;
-    const now = new Date();
 
     if (!cb) { throw new Error('cb is required'); }
 
-    let query = self.find({
-      sentToQueue: false,
-      sendOn: { $lte: now }
+    const query = self.find({
+      campaign: { $in: campaignIds },
+      $and: [{ sentOn: null }] // matches null or not set
     });
 
-    query.populate('campaign');
-
     query.exec(cb);
 
   };

package/package.json

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