@dhyasama/totem-models 9.84.0 → 9.85.0

package/lib/LimitedPartnerCampaign.js

@@ -2,6 +2,8 @@
 
 const _ = require('underscore');
 
+const MAX_PROCESSING_ATTEMPTS = 2;
+
 module.exports = function(mongoose, config) {
 
   const Schema = mongoose.Schema;
@@ -24,7 +26,10 @@ module.exports = function(mongoose, config) {
     body: { type: String, trim: true },
 
     // sent all emails to queue
-    sentEmailsToQueue: { type: Boolean, default: false },
+    processed: { type: Boolean, required: true, default: false },
+
+    // Keep track of failures so we don't keep trying
+    numberOfFailedAttempts: { type: Number, required: true, default: 0, max: MAX_PROCESSING_ATTEMPTS }
 
   });
 
@@ -47,7 +52,7 @@ module.exports = function(mongoose, config) {
 
   };
 
-  // Scheduled but not sent
+  // Scheduled but not sent and not done trying
   LimitedPartnerCampaign.statics.getUpcoming = function getUpcoming(customerId, options, cb) {
 
     const self = this;
@@ -61,7 +66,8 @@ module.exports = function(mongoose, config) {
 
     const query = self.find({
       customer: customerId,
-      sentEmailsToQueue: false
+      processed: false,
+      numberOfFailedAttempts: { $lt: MAX_PROCESSING_ATTEMPTS }
     });
 
     query.exec(cb);
@@ -78,7 +84,8 @@ module.exports = function(mongoose, config) {
     if (!cb) { throw new Error('cb is required'); }
 
     let query = self.find({
-      sentEmailsToQueue: false,
+      processed: false,
+      numberOfFailedAttempts: { $lt: MAX_PROCESSING_ATTEMPTS },
       sendOn: { $lte: now }
     });
 
@@ -91,7 +98,7 @@ module.exports = function(mongoose, config) {
 
   };
 
-  // Scheduled and sent
+  // Scheduled and sent or done trying
   LimitedPartnerCampaign.statics.getHistorical = function getHistorical(customerId, options, cb) {
 
     const self = this;
@@ -100,13 +107,14 @@ 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 sentEmailsToQueue then safe to assume sendOn is in the past.
-
     const query = self.find({
-      customer: customerId,
-      sentEmailsToQueue: true
+      customer: customerId
     });
 
+    // Processed or done trying
+    query['$or'].push({ processed: true });
+    query['$or'].push({ numberOfFailedAttempts: { $lt: MAX_PROCESSING_ATTEMPTS } });
+
     query.exec(cb);
 
   };

package/lib/LimitedPartnerCommunication.js

@@ -101,6 +101,22 @@ module.exports = function(mongoose, config) {
 
   };
 
+  LimitedPartnerCommunication.statics.getById = function getById(id, options, cb) {
+
+    const self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!id) { return cb(new Error('id is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(id)) { return cb(new Error('id is not a valid ObjectId'), null); }
+
+    let query = self.find({
+      _id: id
+    });
+
+    query.exec(cb);
+
+  };
+
   // So we can put these on lp pages
   LimitedPartnerCommunication.statics.getForLimitedPartner = function getForLimitedPartner(lpid, options, cb) {
 
@@ -139,6 +155,18 @@ module.exports = function(mongoose, config) {
 
   };
 
+  LimitedPartnerCommunication.statics.modifyById = function modifyById(id, update, options, cb) {
+
+    const self = this;
+
+    if (!cb) throw new Error('cb is required');
+    if (!id) { return cb(new Error('id is required'), null); }
+    if (!update) { return cb(new Error('update is required'), null); }
+
+    self.findByIdAndUpdate(id, update, { upsert: false, new: true }, cb);
+
+  };
+
   // Remove all the docs associated with a campaign
   LimitedPartnerCommunication.statics.removeByCampaign = function removeByCampaign(campaignId, options, cb) {
 

package/package.json

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