@dhyasama/totem-models 11.102.0 → 11.103.0

package/lib/CalendarEvent.js

@@ -49,7 +49,7 @@ module.exports = function(mongoose, config) {
   });
 
   CalendarEvent.virtual('original').get(function () {
-    return JSON.parse(this.raw);
+    try { return JSON.parse(this.raw); } catch (e) { return null; }
   });
 
   CalendarEvent.statics.delete = function(calendarEventId, cb) {
@@ -70,7 +70,7 @@ module.exports = function(mongoose, config) {
 
   CalendarEvent.statics.findByCreatedRange = function (since, until, cb) {
     this
-      .find({ createdOn: { $gt: since, $lt: since } })
+      .find({ createdOn: { $gt: since, $lt: until } })
       .exec(cb);
   };
 

package/lib/Interaction.js

@@ -54,8 +54,7 @@ module.exports = function(mongoose, config) {
   Interaction.statics.delete = function(providerEventId, totemCustomerId, cb) {
 
     if (!cb) { throw new Error('cb is required'); }
-    if (!providerEventId) { return cb(new Error('personIds is required'), null); }
-    if (!mongoose.Types.ObjectId.isValid(providerEventId)) { return cb(new Error('providerEventId is not a valid ObjectId'), null); }
+    if (!providerEventId) { return cb(new Error('providerEventId is required'), null); }
     if (!totemCustomerId) { return cb(new Error('totemCustomerId is required'), null); }
     if (!mongoose.Types.ObjectId.isValid(totemCustomerId)) { return cb(new Error('totemCustomerId is not a valid ObjectId'), null); }
 
@@ -408,7 +407,6 @@ module.exports = function(mongoose, config) {
 
   Interaction.set('usePushEach', true);
   Interaction.set('autoIndex', false);
-  Interaction.set('usePushEach', true);
   Interaction.on('index', function(err) { console.log('error building interaction indexes: ' + err); });
 
   var deepPopulate = require('mongoose-deep-populate')(mongoose);

package/lib/Meeting.js

@@ -51,49 +51,137 @@ module.exports = function(mongoose, config) {
   });
 
   Meeting.virtual('original').get(function () {
-    return JSON.parse(this.raw);
+    try { return JSON.parse(this.raw); } catch (e) { return null; }
   });
 
-  Meeting.statics.getById = function (id, cb) {
-    this
-      .findOne({ '_id': id })
-      .exec(cb);
+  Meeting.statics.getById = function (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); }
+    if (!options) { return cb(new Error('options is required'), null); }
+    if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+
+    let query = self.findOne({ '_id': id, customer: options.CUSTOMER_ID });
+    query.exec(cb);
+
   };
 
-  Meeting.statics.findByEventId = function (eventId, cb) {
-    this
-      .findOne({ 'eventId': eventId })
-      .exec(cb);
+  Meeting.statics.getByEventId = function (eventId, options, cb) {
+
+    const self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!eventId) { return cb(new Error('eventId is required'), null); }
+    if (!options) { return cb(new Error('options is required'), null); }
+    if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+
+    let query = self.findOne({ 'eventId': eventId, customer: options.CUSTOMER_ID });
+    query.exec(cb);
+
   };
 
-  Meeting.statics.findByUniqueId = function (uniqueId, cb) {
-    this
-      .findOne({ 'uniqueId': uniqueId })
-      .exec(cb);
+  Meeting.statics.getByUniqueId = function (uniqueId, options, cb) {
+
+    const self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!uniqueId) { return cb(new Error('uniqueId is required'), null); }
+    if (!options) { return cb(new Error('options is required'), null); }
+    if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+
+    let query = self.findOne({ 'uniqueId': uniqueId, customer: options.CUSTOMER_ID });
+    query.exec(cb);
+
   };
 
-  Meeting.statics.findByCreatedRange = function (since, until, cb) {
-    this
-      .find({ createdOn: { $gt: since, $lt: until } })
-      .exec(cb);
+  Meeting.statics.getByDate = function (since, until, options, cb) {
+
+    const self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!since) { return cb(new Error('since is required'), null); }
+    if (!until) { return cb(new Error('until is required'), null); }
+    if (!options) { return cb(new Error('options is required'), null); }
+    if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+
+    let query = self.find({ customer: options.CUSTOMER_ID, startOn: { $gte: since, $lte: until } });
+    query.exec(cb);
+
   };
 
-  Meeting.statics.findByCreatedSince = function (since, cb) {
-    this
-      .find({ createdOn: { $gt: since } })
-      .exec(cb);
+  Meeting.statics.getByPeople = function (personIds, options, cb) {
+
+    const self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!personIds) { return cb(new Error('personIds is required'), null); }
+    if (!options) { return cb(new Error('options is required'), null); }
+    if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+
+    let query = self.find({ customer: options.CUSTOMER_ID });
+    query.where({ 'people': { $in : personIds } });
+    query.exec(cb);
+
   };
+  
+  Meeting.statics.getMostRecent = function getMostRecent(customerId, personIds, timestamp, cb) {
+
+    // Gets the most recent meeting with a customer across a list of people
+    // Typically used to get the last meeting the firm had with an org
+    // So you'd pass in the id of the customer and a list of the people at an org and get back the most recent interaction
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!personIds) { return cb(new Error('personIds is required'), null); }
+    if (personIds.length === 0) { return cb(new Error('personIds has no person ids'), null); }
+    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); }
+
+    const self = this;
+
+    // only for this customer
+    let query = self.findOne({ customer: customerId });
+
+    // with these people on the meeting
+    query.where({ 'people': { $in : personIds } });
+
+    // only meetings that have already started
+    query.where('startOn').lte(new Date());
+
+    // Optionally limit to meetings newer than timestamp (useful for seeing if anything since a previous event)
+    if (timestamp) query.where('startOn').gt(timestamp);
+
+    query.sort({ 'startOn': -1 });
+    query.limit(1);
+
+    query.exec(cb);
 
-  Meeting.statics.findByPerson = function (person, cb) {
-    this
-      .find({ 'people': person })
-      .exec(cb);
   };
 
-  Meeting.statics.delete = function(meetingId, cb) {
-    this
-      .findByIdAndRemove(meetingId)
-      .exec(cb);
+  Meeting.statics.delete = function(meetingId, options, cb) {
+
+    const self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!meetingId) { return cb(new Error('meetingId is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(meetingId)) { return cb(new Error('meetingId is not a valid ObjectId'), null); }
+    if (!options) { return cb(new Error('options is required'), null); }
+    if (!options.CUSTOMER_ID) { return cb(new Error('options.CUSTOMER_ID is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
+
+    let query = self.findOne({ _id: meetingId, customer: options.CUSTOMER_ID });
+    query.exec(function(err, meeting) {
+      if (err) { return cb(err, null); }
+      else if (!meeting) { return cb(null, null); }
+      meeting.remove(cb);
+    });
   };
 
   Meeting.statics.upsert = function(meeting, cb) {

package/package.json

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