@dhyasama/totem-models 7.9.0 → 7.10.1

package/lib/CalendarEvent.js

@@ -54,6 +54,16 @@ module.exports = function(mongoose, config) {
     return JSON.parse(this.raw);
   });
 
+  CalendarEvent.statics.delete = function(calendarEventId, cb) {
+
+    var self = this;
+
+    self
+      .findByIdAndRemove(calendarEventId)
+      .exec(cb);
+
+  };
+
   CalendarEvent.statics.findByAccountId = function (accountId, cb) {
     this
       .find({ account: accountId })

package/lib/Financials.js

@@ -274,8 +274,10 @@ module.exports = function(mongoose, config) {
     var now = new Date();
 
     var query = self.find({
+      "snapshots.notifications.company.initial.sendTo": { $ne: null },
       "snapshots.notifications.company.initial.sendOn": { $lte: now },
-      "snapshots.notifications.company.initial.sentOn": null
+      "snapshots.notifications.company.initial.sentOn": null,
+      "snapshots.submittedOn": null
     });
 
     query.exec(function(err, result) {
@@ -287,7 +289,13 @@ module.exports = function(mongoose, config) {
       snapshots = _.flatten(snapshots);
 
       snapshots = _.filter(snapshots, function(snapshot) {
-        return snapshot.notifications.company.initial.sendOn < now && !snapshot.notifications.company.initial.sentOn;
+
+        var bool = !!snapshot.notifications.company.initial.sendTo;
+        bool = bool && snapshot.notifications.company.initial.sendOn < now;
+        bool = bool && !snapshot.notifications.company.initial.sentOn;
+
+        return bool;
+
       });
 
       return cb(null, _.pluck(snapshots, 'uuid'));
@@ -302,8 +310,10 @@ module.exports = function(mongoose, config) {
     var now = new Date();
 
     var query = self.find({
+      "snapshots.notifications.company.reminder.sendTo": { $ne: null },
       "snapshots.notifications.company.reminder.sendOn": { $lte: now },
-      "snapshots.notifications.company.reminder.sentOn": null
+      "snapshots.notifications.company.reminder.sentOn": null,
+      "snapshots.submittedOn": null
     });
 
     query.exec(function(err, result) {
@@ -315,7 +325,13 @@ module.exports = function(mongoose, config) {
       snapshots = _.flatten(snapshots);
 
       snapshots = _.filter(snapshots, function(snapshot) {
-        return snapshot.notifications.company.reminder.sendOn < now && !snapshot.notifications.company.reminder.sentOn;
+
+        var bool = !!snapshot.notifications.company.reminder.sendTo;
+        bool = bool && snapshot.notifications.company.reminder.sendOn < now;
+        bool = bool && !snapshot.notifications.company.reminder.sentOn;
+
+        return bool;
+
       });
 
       return cb(null, _.pluck(snapshots, 'uuid'));

package/package.json

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

package/test/CalendarEvent.js

@@ -8,6 +8,7 @@ var
   clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
   CalendarEvent = mongoose.model('CalendarEvent');
 
+var calendarEventId;
 
 
 describe('CalendarEvent', function() {
@@ -50,6 +51,22 @@ describe('CalendarEvent', function() {
       should.not.exist(err);
       should.exist(result);
 
+      calendarEventId = result._id;
+
+      return done();
+
+    });
+
+  });
+
+  it('deletes a calendar event', function(done) {
+
+    CalendarEvent.delete(calendarEventId, function(err, result) {
+
+      should.not.exist(err);
+      should.exist(result);
+      should.equal(result._id.toString(), calendarEventId.toString());
+
       return done();
 
     });