@dhyasama/totem-models 1.0.1 → 1.6.0

package/lib/Person.js

@@ -150,10 +150,16 @@ module.exports = function(mongoose, config) {
   });
 
   Person.virtual('email.primary').get(function () {
-    var primary = _.find(this.contact.email, function(email) {
-      return email.primary;
-    });
-    return primary ? primary.email : '';
+    // Email marked primary is best
+    // Absent that, use first email
+    // Absent that, return empty string
+    var self = this;
+    var result;
+    var primary = _.find(self.contact.email, function(email) { return email.primary; });
+    if (primary) result = primary.email;
+    else if (self.contact.email && self.contact.email.length >= 1) result = self.contact.email[0].email;
+    else result = '';
+    return result;
   });
 
   Person.virtual('phone.primary').get(function () {
@@ -684,31 +690,6 @@ module.exports = function(mongoose, config) {
 
   Person.statics.getById = function (id, cb) {
 
-    this
-      .findById(id)
-      .populate('account')
-      .populate('chairs.first.company')
-      .populate('chairs.second.company')
-      .populate('notes')
-      .populate('related')
-      .populate('sources.person')
-      .exec(function (err, person) {
-
-        if (err) return cb(err, null);
-        else if (!person) return cb(null, null);
-
-        person.sources = _.sortBy(person.sources, function(source) {
-          return source.interactions.calendar + source.interactions.email;
-        }).reverse();
-
-        return cb(null, person);
-
-      });
-
-  };
-
-  Person.statics.getByIdCustomer = function (id, customer, cb) {
-
     // this would speed it up
     // still need a way to optionally return all though
     //.findById(id, { 'calendarEventSummaries': { $slice: 5 } })
@@ -719,8 +700,8 @@ module.exports = function(mongoose, config) {
       .populate('calendarEventSummaries.attendees.external', 'avatarUrl name title')
       .populate('calendarEventSummaries.attendees.internal', 'avatarUrl name title')
       .populate('calendarEventSummaries.notes')
-      .populate('chairs.first.company', 'logoUrl name')
-      .populate('chairs.second.company', 'logoUrl name')
+      .populate('notes')
+      .populate('related')
       .populate('sources.person', 'avatarUrl name title')
       .deepPopulate([
         'notes.createdBy',
@@ -821,6 +802,13 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Person.statics.getSources = function (id, cb) {
+    this
+      .findById(id)
+      .populate('sources.person')
+      .exec(cb);
+  };
+
   Person.statics.listAllPeople = function (cb) {
 
     // sort is done post retrieval because query sort is done pre-decryption
@@ -1040,36 +1028,6 @@ module.exports = function(mongoose, config) {
     // PortfolioCompany.formerPeople
   });
 
-  var protectCustomerData = function(context) {
-
-    var CUSTOMER_ID = config.CUSTOMER_ID;
-
-    var protectCalendarEventData = function protectCalendarEventData(person) {
-
-      if (CUSTOMER_ID == 'GLOBAL_PROCESS') return;
-
-      person.calendarEventSummaries = _.reject(person.calendarEventSummaries, function(event) {
-        return event.totemCustomerId != CUSTOMER_ID;
-      });
-
-    };
-
-    var protectSources = function protectSources(person) {
-
-      if (CUSTOMER_ID == 'GLOBAL_PROCESS') return;
-
-      person.sources = _.reject(person.sources, function(source) {
-        var customerId = mongoose.Types.ObjectId.isValid(source.customer) ? source.customer : source.customer._id;
-        return customerId.toString() != CUSTOMER_ID.toString();
-      });
-
-    };
-
-    protectCalendarEventData(context);
-    protectSources(context);
-
-  };
-
   Person.pre('save', function(next) {
 
     var self = this;
@@ -1117,7 +1075,34 @@ module.exports = function(mongoose, config) {
   });
 
   Person.post('init', function() {
-    protectCustomerData(this);
+
+    var self = this;
+    var CUSTOMER_ID = config.CUSTOMER_ID;
+
+    var protectCalendarEventData = function protectCalendarEventData(person) {
+
+      if (CUSTOMER_ID == 'GLOBAL_PROCESS') return;
+
+      person.calendarEventSummaries = _.reject(person.calendarEventSummaries, function(event) {
+        return event.totemCustomerId != CUSTOMER_ID;
+      });
+
+    };
+
+    var protectSources = function protectSources(person) {
+
+      if (CUSTOMER_ID == 'GLOBAL_PROCESS') return;
+
+      person.sources = _.reject(person.sources, function(source) {
+        var customerId = mongoose.Types.ObjectId.isValid(source.customer) ? source.customer : source.customer._id;
+        return customerId.toString() != CUSTOMER_ID.toString();
+      });
+
+    };
+
+    protectCalendarEventData(self);
+    protectSources(self);
+
   });
 
   var deepPopulate = require('mongoose-deep-populate')(mongoose);