@dhyasama/totem-models 11.70.0 → 11.71.0

package/lib/Interaction.js

@@ -5,7 +5,6 @@ module.exports = function(mongoose, config) {
   let Schema = mongoose.Schema;
   let async = require('async');
   let _ = require('underscore');
-  let Note = mongoose.model('Note');
   let utilities = require('@dhyasama/totem-utilities');
   let moment = require('moment');
   let helpers = require('../helpers');
@@ -22,8 +21,7 @@ module.exports = function(mongoose, config) {
       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' } ],
-    documents: [ { type: Schema.ObjectId, ref: 'Document' } ],
+    comments: { type: String, trim: true },
     analysis: {
       overview: { type: String },
       notes: [{
@@ -47,17 +45,6 @@ module.exports = function(mongoose, config) {
 
   ///////////////////////////////////////
 
-  Interaction.statics.addNote = function(interactionId, creatorPersonId, text, isPrivate, customerId, cb) {
-
-    Note.createForModel({
-      createdBy: creatorPersonId,
-      text: text,
-      isPrivate: isPrivate,
-      customer: customerId
-    }, this, interactionId, cb);
-
-  };
-
   Interaction.statics.delete = function(providerEventId, totemCustomerId, cb) {
 
     if (!cb) { throw new Error('cb is required'); }
@@ -75,31 +62,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Interaction.statics.deleteNote = function(noteId, customerId, cb) {
-
-    // Delete the note itself along with any references
-
-    if (!cb) { throw new Error('cb is required'); }
-    if (!noteId) { return cb(new Error('noteId is required'), null); }
-    if (!mongoose.Types.ObjectId.isValid(noteId)) { return cb(new Error('noteId is not a valid ObjectId'), null); }
-
-    var self = this;
-
-    var removeReferences = function removeReferences(callback) {
-      self.updateMany({}, {
-        $pull: { 'notes' : [noteId] }
-      }, callback);
-    };
-
-    async.series([
-      Note.delete.bind(Note, noteId, customerId),
-      removeReferences
-    ], function(err, results) {
-      return cb(err, null);
-    });
-
-  };
-
   Interaction.statics.getById = function getById(id, options, cb) {
 
     const self = this;
@@ -257,15 +219,6 @@ module.exports = function(mongoose, config) {
 
     query.populate('attendees.internal', 'name title avatarUrl doNotDisplay');
     query.populate('attendees.external', 'name title avatarUrl doNotDisplay');
-    query.populate({ path: 'notes', match: { customer: options.CUSTOMER_ID } });
-
-    query.deepPopulate([
-      'notes.createdBy'
-    ], {
-      populate: {
-        'notes.createdBy': { select: 'name avatarUrl title' }
-      }
-    });
 
     query.sort(options.sort);
 
@@ -419,34 +372,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Interaction.statics.getNotes = function getNotes(personIds, options, cb) {
-
-    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('CUSTOMER_ID is required'), null); }
-    if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('CUSTOMER_ID is not a valid ObjectId'), null); }
-
-    var self = this;
-    var query = self.find({ totemCustomerId: options.CUSTOMER_ID });
-
-    query.where({'attendees.external': { $in : personIds }});
-    query.populate({
-      path: 'notes',
-      match: { customer: options.CUSTOMER_ID }
-    });
-    query.deepPopulate([
-      'notes.createdBy'
-    ], {
-      populate: {
-        'notes.createdBy': { select: 'name avatarUrl title' }
-      }
-    })
-    query.sort(options.sort);
-    query.exec(cb);
-
-  };
-
   Interaction.statics.modifyById = function(id, update, cb) {
 
     // VERY IMPORTANT NOTE

package/lib/LimitedPartner.js

@@ -338,12 +338,11 @@ module.exports = function(mongoose, config) {
 
   };
 
-  LimitedPartner.statics.addNote = function(lpid, creatorPersonId, text, isPrivate, customerId, cb) {
+  LimitedPartner.statics.addNote = function(lpid, creatorPersonId, text, customerId, cb) {
 
     Note.createForModel({
       createdBy: creatorPersonId,
       text: text,
-      isPrivate: isPrivate,
       customer: customerId
     }, this, lpid, cb);
 

package/lib/Message.js

@@ -11,7 +11,6 @@ module.exports = function(mongoose, config) {
     moment = require('moment'),
     helpers = require('../helpers'),
     Document = mongoose.model('Document'),
-    Note = mongoose.model('Note');
 
   let Message = new Schema({
 
@@ -30,7 +29,6 @@ module.exports = function(mongoose, config) {
       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' } ],
     documents: [ { type: Schema.ObjectId, ref: 'Document' } ],
     raw: { type: Schema.Types.Mixed, required: true },
     messageDate: { type: Date, required: true },
@@ -52,16 +50,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Message.statics.addNote = function(messageId, creatorPersonId, text, isPrivate, cb) {
-
-    Note.createForModel({
-      createdBy: creatorPersonId,
-      text: text,
-      isPrivate: isPrivate
-    }, this, messageId, cb);
-
-  };
-
   Message.statics.delete = function(messageId, customerId, cb) {
 
     const self = this;
@@ -94,27 +82,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Message.statics.deleteNote = function(noteId, customerId, cb) {
-
-    // Delete the note itself along with any references
-
-    const self = this;
-
-    let removeReferences = function removeReferences(callback) {
-      self.updateMany({}, {
-        $pull: { 'notes' : [noteId] }
-      }, callback);
-    };
-
-    async.series([
-      Note.delete.bind(Note, noteId, customerId),
-      removeReferences
-    ], function(err, results) {
-      return cb(err, null);
-    });
-
-  };
-
   Message.statics.getDocuments = function getDocuments(personIds, options, cb) {
 
     if (!cb) { throw new Error('cb is required'); }
@@ -160,10 +127,6 @@ module.exports = function(mongoose, config) {
     query.populate('organization', 'name logoUrl');
     query.populate('recipients.internal', 'name avatarUrl title doNotDisplay');
     query.populate('recipients.external', 'name avatarUrl title doNotDisplay');
-    query.populate({
-      path: 'notes',
-      match: { customer: options.CUSTOMER_ID }
-    });
     query.populate({
       path: 'documents',
       match: { customer: options.CUSTOMER_ID }
@@ -216,20 +179,14 @@ module.exports = function(mongoose, config) {
 
     query.populate('recipients.internal', 'name title avatarUrl doNotDisplay');
     query.populate('recipients.external', 'name title avatarUrl doNotDisplay');
-    query.populate({
-      path: 'notes',
-      match: { customer: options.CUSTOMER_ID }
-    });
     query.populate({
       path: 'documents',
       match: { customer: options.CUSTOMER_ID }
     });
     query.deepPopulate([
-      'notes.createdBy',
       'documents.createdBy'
     ], {
       populate: {
-        'notes.createdBy': { select: 'name avatarUrl title' },
         'documents.createdBy': { select: 'name avatarUrl title' }
       }
     });
@@ -353,20 +310,14 @@ module.exports = function(mongoose, config) {
     query.where({'recipients.external': { $in : personIds }});
     query.populate('recipients.internal', 'name title avatarUrl doNotDisplay');
     query.populate('recipients.external', 'name title avatarUrl doNotDisplay');
-    query.populate({
-      path: 'notes',
-      match: { customer: options.CUSTOMER_ID }
-    });
     query.populate({
       path: 'documents',
       match: { customer: options.CUSTOMER_ID }
     });
     query.deepPopulate([
-      'notes.createdBy',
       'documents.createdBy'
     ], {
       populate: {
-        'notes.createdBy': { select: 'name avatarUrl title' },
         'documents.createdBy': { select: 'name avatarUrl title' }
       }
     });
@@ -394,34 +345,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Message.statics.getNotes = function getNotes(personIds, options, cb) {
-
-    if (!cb) { throw new Error('cb is required'); }
-    if (!personIds) { return cb(new Error('fundId 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); }
-
-    const self = this;
-    let query = self.find({ customer: options.CUSTOMER_ID });
-
-    query.where({'attendees.external': { $in : personIds }});
-    query.populate({
-      path: 'notes',
-      match: { customer: options.CUSTOMER_ID }
-    });
-    query.deepPopulate([
-      'notes.createdBy'
-    ], {
-      populate: {
-        'notes.createdBy': { select: 'name avatarUrl title' }
-      }
-    });
-
-    query.exec(cb);
-
-  };
-
   Message.statics.getUnprocessedDeals = function getUnprocessedDeals(customerId, cb) {
 
     const self = this;

package/lib/Note.js

@@ -15,8 +15,6 @@ module.exports = function(mongoose, config) {
 
     createdBy: { type: Schema.ObjectId, ref: 'Person', index: false, required: true },
 
-    isPrivate: { type: Boolean, default: false },
-
     text: { type: String, index: false, required: true, trim: true }
 
   });

package/lib/Organization.js

@@ -305,7 +305,8 @@ module.exports = function(mongoose, config) {
           shared: [{ type: Schema.ObjectId, ref: 'Financials' }],
 
           display: {
-            timeframe: { type: String, enum: ['All Years', 'Last 12 Months'], default: 'All Years' }
+            currency: { type: String, enum: ['customer', 'company'] },
+            timeframe: { type: String, enum: ['All Years', 'Last 12 Months'], default: 'All Years' },            
           },
 
           emails: [{
@@ -1048,12 +1049,11 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Organization.statics.addNote = function(organizationId, creatorPersonId, text, isPrivate, customerId, cb) {
+  Organization.statics.addNote = function(organizationId, creatorPersonId, text, customerId, cb) {
 
     Note.createForModel({
       createdBy: creatorPersonId,
       text: text,
-      isPrivate: isPrivate,
       customer: customerId
     }, this, organizationId, cb);
 

package/lib/Person.js

@@ -305,12 +305,11 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Person.statics.addNote = function(personId, creatorPersonId, text, isPrivate, customerId, cb) {
+  Person.statics.addNote = function(personId, creatorPersonId, text, customerId, cb) {
 
     Note.createForModel({
       createdBy: creatorPersonId,
       text: text,
-      isPrivate: isPrivate,
       customer: customerId
     }, this, personId, cb);
 

package/package.json

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