@dhyasama/totem-models 9.16.0 → 9.18.0

package/lib/Financials.js

@@ -63,13 +63,15 @@ module.exports = function(mongoose, config) {
 
       uuid: { type: String },
 
-      managedServices: { type: Boolean, default: false }, // to be folded into review
+      managedServices: { type: Boolean, default: false }, // to be transformed into review
       review: { type: Boolean, default: false },
 
       // In Progress -> Delivered or Opened
-      // Not Scheduled to be removed
+      // Not Scheduled -> Completed
       // Scheduled to be removed
       status: { type: String, enum: ['Delivered', 'Opened', 'Overdue', 'In Review', 'Completed', 'Archived', 'In Progress', 'Not Scheduled', 'Scheduled'] },
+      
+      // to be removed
       action: { type: String },
 
       year: { type: Number, default: 0 },
@@ -171,12 +173,13 @@ module.exports = function(mongoose, config) {
 
         company: {
 
-          // to be nested under initial and reminders, and removed
+          // to be nested under initial/reminders and removed
           email: {
             subject: { type: String, trim: true },
             body: { type: String, trim: true }
           },
 
+          // to be nested under initial/reminders/rejections and removed
           sendTo: [{
             email: { type: String, trim: true },
             name: { type: String, trim: true }
@@ -192,6 +195,10 @@ module.exports = function(mongoose, config) {
               subject: { type: String, trim: true },
               body: { type: String, trim: true }
             },
+            sendTo: [{
+              email: { type: String, trim: true },
+              name: { type: String, trim: true }
+            }]
           },
 
           reminders: [{
@@ -203,15 +210,23 @@ module.exports = function(mongoose, config) {
             email: {
               subject: { type: String, trim: true },
               body: { type: String, trim: true }
-            }
+            },
+            sendTo: [{
+              email: { type: String, trim: true },
+              name: { type: String, trim: true }
+            }]
           }],
 
           rejections: [{
-            sendOn: { type: Date, required: false },
+            sendOn: { type: Date, required: false }, // to be removed
             sentOn: { type: Date, required: false },
-            sentToQueue: { type: Boolean, default: false },
             postmarkMessageId: { type: String, trim: true },
-            status: { type: String, enum: [null, 'Sent', 'Bounced', 'Delivered', 'Opened', 'Clicked']}            
+            sentToQueue: { type: Boolean, default: false }, // to be removed?
+            status: { type: String, enum: [null, 'Sent', 'Bounced', 'Delivered', 'Opened', 'Clicked']},
+            sendTo: [{
+              email: { type: String, trim: true },
+              name: { type: String, trim: true }
+            }]
           }]
 
         },
@@ -786,18 +801,23 @@ module.exports = function(mongoose, config) {
       var isReviewed = snapshot.reviewedOn;
       var isRejected = snapshot.rejection;
       var isArchived = snapshot.archivedOn;
-      var isOverdue = moment(snapshot.dueOn).isBefore(new Date());
-      var isOpened = snapshot.action == 'Opened' || snapshot.action == 'Clicked';
-      var isDelivered  = snapshot.action == 'Delivered';
+      var isOverdue = moment(new Date()).isAfter(moment(snapshot.dueOn));
+      
+      var isOpened = false;
+      var isDelivered = false;
+      if(snapshot.notifications && snapshot.notifications.company && snapshot.notifications.company.initial) {
+        isOpened = snapshot.notifications.company.initial.status && snapshot.notifications.company.initial.status == 'Opened' || snapshot.notifications.company.initial.status == 'Clicked';
+        isDelivered = snapshot.notifications.company.initial.sentOn;
+      }
 
       if(!snapshot.uuid) snapshot.status = 'Completed'; // no uuid means the snapshot was created from the google sheet and should always be completed
       else if(needsReview && isReviewed) snapshot.status = 'Completed';
       else if(!needsReview && isSubmitted) snapshot.status = 'Completed';
-      else if(needsReview && isSubmitted && !isReviewed) snapshot.status = 'In Review';
       else if(isArchived) snapshot.status = 'Archived';
+      else if(needsReview && isSubmitted && !isReviewed) snapshot.status = 'In Review';
       else if(isOverdue) snapshot.status = 'Overdue';
       else if(isDelivered && isOpened) snapshot.status = 'Opened';
-      else snapshot.status = 'Delivered';
+      else if(isDelivered) snapshot.status = 'Delivered';
 
     });
 

package/package.json

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