@dhyasama/totem-models 1.30.2 → 1.31.0

package/lib/Interaction.js

@@ -8,18 +8,18 @@ module.exports = function(mongoose, config) {
   var Note = mongoose.model('Note');
   var Organization = mongoose.model('Organization');
   var Person = mongoose.model('Person');
+  var moment = require('moment');
 
   var Interaction = new Schema({
 
-    personId: { type: Schema.ObjectId, ref: 'Person', required: true, index: true },
-    calendarEventId: { type: Schema.ObjectId, ref: 'CalendarEvent', required: true },
-    providerEventId: { type: String, required: true, index: true, trim: true },
+    calendarEventId: { type: Schema.ObjectId, ref: 'CalendarEvent', required: true }, // the event from the original pull
+    providerEventId: { type: String, required: true, index: true, trim: true }, // unique id from the calendar provider
     totemCustomerId: { type: Schema.ObjectId, ref: 'Organization', index: true, required: true },
     summary: { type: String, required: true, trim: true },
     startTime: { type: Date, index: true },
     attendees: {
-      internal: [{ type: Schema.ObjectId, ref: 'Person', index: true }],
-      external: [{ type: Schema.ObjectId,  ref: 'Person', index: true }]
+      internal: [{ type: Schema.ObjectId, ref: 'Person', index: true }], // people from customer
+      external: [{ type: Schema.ObjectId,  ref: 'Person', index: true }] // everyone else
     },
     notes: [ { type: Schema.ObjectId, ref: 'Note' } ]
 
@@ -27,33 +27,65 @@ module.exports = function(mongoose, config) {
 
   ///////////////////////////////////////
 
+  Interaction.statics.delete = function(providerEventId, totemCustomerId, cb) {
+
+    var self = this;
+
+    self.findOneAndRemove({
+      'providerEventId': providerEventId,
+      'totemCustomerId': totemCustomerId
+    }, cb);
+
+  };
+
+  Interaction.statics.getForCustomer = function getForCustomer(cb) {
+
+    var self = this;
+    var query = self.find({ totemCustomerId: config.CUSTOMER_ID });
+
+    query.exec(cb);
+
+  };
+
   Interaction.statics.getForPeople = function getForPeople(personIds, options, cb) {
 
     var self = this;
-    var query = self.find({
-      personId: { $in : personIds },
-      totemCustomerId: config.CUSTOMER_ID
-    });
 
     options.limit = options.limit || -1;
     options.skip = options.skip || -1;
 
-    query.sort({'startTime': -1});
+    // Note if you are using limit and skip, i.e., paging,
+    // then don't add these options in the middle of paging
+    // because it will alter the pages
+    options.sort = options.sort || {'startTime': -1};
+    options.before = options.before || moment().toISOString();
+    options.after = options.after || moment().subtract(1, 'year').toISOString();
+
+    var query = self.find({ totemCustomerId: config.CUSTOMER_ID });
+
+    query.where({'attendees.external': { $in : personIds }});
+    query.where({ startTime: { $gte: options.after }});
+    query.where({ startTime: { $lte: options.before }});
     query.populate('attendees.internal', 'name title avatarUrl');
     query.populate('attendees.external', 'name title avatarUrl');
     query.populate('notes');
+    query.sort(options.sort);
 
+    if (options.attendee) { query.where({'attendees.internal': options.attendee}); }
     if (options.limit >= 0) query.limit(options.limit);
     if (options.skip >= 0) query.skip(options.skip);
 
     query.exec(cb);
 
+    // todo
+    //options.includeRecurring = options.includeRecurring || true;
+    //query.where({ recurring: options.recurring });
+
   };
 
-  Interaction.statics.upsert = function upsert(interaction, username, cb) {
+  Interaction.statics.upsert = function upsert(interaction, cb) {
 
     if (!interaction) { return cb(new Error('Interaction is required'), null); }
-    if (!username) { return cb(new Error('Username is required'), null); }
 
     interaction.save(cb);
 

package/lib/Person.js

@@ -636,6 +636,12 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Person.statics.searchByEmail = function(email, cb) {
+    this
+      .find({ 'contact.email.email': email, 'deleted': {$ne: true} })
+      .exec(cb);
+  };
+
   Person.statics.findDupes = function(person, options, cb) {
 
     if (!cb) throw new Error('cb is required');

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "1.26.1",
+  "version": "1.30.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "1.30.2",
+  "version": "1.31.0",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",
@@ -21,6 +21,7 @@
     "bcrypt": "^0.8.0",
     "bluebird": "^3.5.0",
     "escape-string-regexp": "^1.0.5",
+    "moment": "^2.22.1",
     "mongoose-deep-populate": "^3.0.0",
     "mongoose-filter-denormalize": "^0.2.1",
     "mongoose-post-find": "0.0.2",