@dhyasama/totem-models 8.5.0 → 8.5.2

package/lib/LimitedPartner.js

@@ -97,13 +97,6 @@ module.exports = function(mongoose, config) {
 
 /////////////////////
 
-  LimitedPartner.virtual('totalCommitted').get(function () {
-    const self = this;
-    return _.reduce(self.fundsInvested, function (memo, fund) {
-      return memo + (fund.committed > 0 ? fund.committed : 0);
-    }, 0);
-  });
-
   LimitedPartner.virtual('totalCommitment').get(function () {
     var self = this;
     return _.reduce(self.transactions, function(memo, transaction) {
@@ -587,10 +580,10 @@ module.exports = function(mongoose, config) {
       query = self.find({}, self.getReadFilterKeys(options.role));
     }
     else {
-      query = self.find({ 'fundsInvested.fund': { $in : self.customerFunds }}, self.getReadFilterKeys(options.role));
+      query = self.find({ 'transactions.fund': { $in : options.funds }}, self.getReadFilterKeys(options.role));
     }
 
-    query.populate('fundsInvested.fund');
+    query.populate('transactions.fund');
     query.sort({ 'name': -1 });
     query.exec(cb);
 
@@ -708,14 +701,14 @@ module.exports = function(mongoose, config) {
 
   LimitedPartner.plugin(filter, {
     'readFilter': {
-      'admin': ['name', 'shortName', 'customer', 'start', 'people', 'documentSlugs', 'fundsInvested', 'contact', 'entered', 'status', 'flagged', 'flags', 'notes'],
-      'lp-full': ['name', 'shortName', 'customer', 'start', 'people', 'documentSlugs', 'fundsInvested', 'contact', 'entered', 'status', 'flagged', 'flags', 'notes'],
+      'admin': ['name', 'shortName', 'customer', 'start', 'people', 'documentSlugs', 'transactions', 'contact', 'entered', 'status', 'flagged', 'flags', 'notes'],
+      'lp-full': ['name', 'shortName', 'customer', 'start', 'people', 'documentSlugs', 'transactions', 'contact', 'entered', 'status', 'flagged', 'flags', 'notes'],
       'lp-names': ['name', 'shortName', 'flagged', 'flags', 'customer'],
       'none': []
     },
     'writeFilter': {
-      'admin': ['name', 'shortName', 'customer', 'start', 'people', 'documentSlugs', 'fundsInvested', 'contact', 'entered', 'status', 'flagged', 'flags', 'notes'],
-      'lp-full': ['name', 'shortName', 'customer', 'start', 'people', 'documentSlugs', 'fundsInvested', 'contact', 'entered', 'status', 'flagged', 'flags', 'notes'],
+      'admin': ['name', 'shortName', 'customer', 'start', 'people', 'documentSlugs', 'transactions', 'contact', 'entered', 'status', 'flagged', 'flags', 'notes'],
+      'lp-full': ['name', 'shortName', 'customer', 'start', 'people', 'documentSlugs', 'transactions', 'contact', 'entered', 'status', 'flagged', 'flags', 'notes'],
       'lp-names': ['flagged', 'flags', 'customer'],
       'none': []
     },

package/lib/Organization.js

@@ -1618,11 +1618,12 @@ module.exports = function(mongoose, config) {
 
           });
 
+          // todo - fix sorting
           // return categorized sources
           return cb(null, {
-            all: helpers.sortPeopleSources(all, options.CUSTOMER_ID),
-            current: helpers.sortPeopleSources(current, options.CUSTOMER_ID),
-            past: helpers.sortPeopleSources(past, options.CUSTOMER_ID)
+            all: all, //helpers.sortPeopleSources(all, options.CUSTOMER_ID),
+            current: current, //helpers.sortPeopleSources(current, options.CUSTOMER_ID),
+            past: past //helpers.sortPeopleSources(past, options.CUSTOMER_ID)
           });
 
         });

package/lib/Person.js

@@ -546,7 +546,7 @@ module.exports = function(mongoose, config) {
       if (!person) { return cb(err, null); }
 
       // get the customer's org
-      Organization.collection.findById(options.CUSTOMER_ID, function(err, customer) {
+      Organization.findById(options.CUSTOMER_ID, function(err, customer) {
 
         if (err) { return cb(err, null); }
         if (!customer) { return cb(null, null); }

package/package.json

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

package/test/Person.js

@@ -741,6 +741,22 @@ describe('Person', function() {
 
   });
 
+  it('gets sources', function(done) {
+
+    Person.getSources(person.id, { CUSTOMER_ID: org._id }, function(err, result) {
+
+      should.not.exist(err);
+      should.exist(result);
+      should.exist(result.all);
+      should.exist(result.current);
+      should.exist(result.past);
+
+      done();
+
+    });
+
+  });
+
   it('merges a person', function(done) {
 
     var merged = person.addMerged(mergeId);