@dhyasama/totem-models 5.4.1 → 5.5.1

package/lib/LimitedPartner.js

@@ -165,6 +165,33 @@ module.exports = function(mongoose, config) {
 
   });
 
+  var getSources = function getSources(people) {
+
+    var result = _.compact(_.pluck(people, 'sources'));
+    if (result.length == 0) return [];
+
+    result = _.flatten(result);
+    result = _.compact(result);
+
+    if (result.length == 0) return [];
+    if (mongoose.Types.ObjectId.isValid(result[0].person)) return []; // not populated
+
+    result = _.uniq(result, function(item) {
+      if (!item || !item.person) return '';
+      else return item.person._id ? item.person._id.toString() : '';
+    });
+    result = _.compact(result);
+    result = _.reject(result, function(item) { return !item.person; });
+    result = _.sortBy(result, 'interactions.count');
+    result.reverse();
+    result = _.sortBy(result, 'name.full');
+
+    console.log(result);
+
+    return result;
+
+  };
+
 /////////////////////
 
   LimitedPartner.virtual('totalCommitted').get(function () {
@@ -208,34 +235,6 @@ module.exports = function(mongoose, config) {
 
   });
 
-  LimitedPartner.virtual('sources').get(function () {
-
-    // Aggregate sources from all people
-    // Sort by interactions descending, full name ascending
-
-    var self = this;
-    var result = self.people || [];
-
-    if (result.length == 0) return [];
-    if (mongoose.Types.ObjectId.isValid(result[0])) return []; // not populated
-
-    result = _.pluck(result, 'sources');
-    result = _.flatten(result);
-    result = _.compact(result);
-    result = _.uniq(result, function(item) {
-      if (!item.person) return null;
-      var personId = utils.isValidObjectId(item.person) ? item.person : item.person._id;
-      return personId.toString();
-    });
-    result = _.compact(result);
-    result = _.sortBy(result, 'interactions.count');
-    result.reverse();
-    result = _.sortBy(result, 'name.full');
-
-    return result;
-
-  });
-
 /////////////////////
 
   /************* BASIC FIELDS **********************/
@@ -477,6 +476,62 @@ module.exports = function(mongoose, config) {
 
   };
 
+  LimitedPartner.statics.getSources = function(lpid, cb) {
+
+    var self = this;
+
+    self
+      .findById(lpid)
+      .populate('people', 'name avatarUrl title doNotDisplay sources')
+      .deepPopulate([
+        'people.sources.person'
+      ], {
+        populate: {
+          'people.sources.person': { select: 'name avatarUrl title doNotDisplay' }
+        }
+      })
+      .exec(function(err, lp) {
+
+        if (err) return cb(err, null);
+        if (!lp) return cb(null, null);
+
+        Organization.findById(config.CUSTOMER_ID, function(err, customer) {
+
+          if (err) return cb(err, null);
+          if (!customer) return cb(null, null);
+
+          var current = [];
+          var past = [];
+          var all = [];
+          var lpSources = getSources(lp.people);
+
+          _.each(customer.people, function(p) {
+
+            var source = _.find(lpSources, function(ls) {
+              if (!ls || !ls.person || !ls.person._id) return false;
+              return ls.person._id.toString() == p.person.toString();
+            });
+
+            if (!source) return;
+
+            if (p.current) current.push(source);
+            if (!p.current) past.push(source);
+            all.push(source);
+
+          });
+
+          return cb(null, {
+            all: all,
+            current: current,
+            past: past
+          });
+
+        });
+
+      });
+
+  };
+
   LimitedPartner.statics.list = function (role, cb) {
 
     // sorted by name ascending

package/lib/Organization.js

@@ -1560,6 +1560,10 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
+    // https://mongoosejs.com/docs/api.html#model_Model.findOneAndUpdate
+    // options runValidators defaults false which is ok since we have upsert false
+    // new returns the updated document
+
     self.findOneAndUpdate(filter, update, { upsert: false, new: true }, cb);
 
   };

package/lib/Person.js

@@ -7,6 +7,7 @@ module.exports = function(mongoose, config) {
   var
 
     Schema = mongoose.Schema,
+    Organization = mongoose.model('Organization'),
     LimitedPartner = mongoose.model('LimitedPartner'),
     Flag = mongoose.model('Flag'),
     Note = mongoose.model('Note'),
@@ -857,7 +858,44 @@ module.exports = function(mongoose, config) {
     this
       .findById(id)
       .populate('sources.person')
-      .exec(cb);
+      .exec(function(err, person) {
+
+        if (err) return cb(err, null);
+        if (!person) return cb(err, null);
+
+        Organization.findById(config.CUSTOMER_ID, function(err, customer) {
+
+          if (err) return cb(err, null);
+          if (!customer) return cb(null, null);
+
+          var current = [];
+          var past = [];
+          var all = [];
+
+          _.each(customer.people, function(p) {
+
+            var source = _.find(person.sources, function(ps) {
+              if (!ps || !ps.person || !ps.person._id) return false;
+              return ps.person._id.toString() == p.person.toString();
+            });
+
+            if (!source) return;
+
+            if (p.current) current.push(source);
+            if (!p.current) past.push(source);
+            all.push(source);
+
+          });
+
+          return cb(null, {
+            all: all,
+            current: current,
+            past: past
+          });
+
+        });
+
+      });
   };
 
   Person.statics.listAllPeople = function (cb) {

package/package-lock.json

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

package/package.json

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