@dhyasama/totem-models 10.21.0 → 10.21.2

package/lib/CapTable.js

@@ -12,7 +12,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////////////
 
-const _ = require("underscore");
 module.exports = function(mongoose, config) {
 
   var Schema = mongoose.Schema;
@@ -425,6 +424,8 @@ module.exports = function(mongoose, config) {
     // combine provided and default options
     options = _.defaults(options || {}, defaultOptions);
 
+    const path = 'stakeholders.name';
+
     self.aggregate([
       {
         "$search": {
@@ -434,14 +435,11 @@ module.exports = function(mongoose, config) {
               {
                 text: {
                   query: value,
-                  path: [
-                    'stakeholders.name'
-                  ],
+                  path: path,
                   fuzzy: {
                     maxEdits: options.maxEdits,
                     maxExpansions: options.maxExpansions
-                  },
-                  score: { boost: { value: 3 } }
+                  }
                 }
               }
             ],
@@ -454,16 +452,25 @@ module.exports = function(mongoose, config) {
               }
             ],
             minimumShouldMatch: 1
+          },
+          highlight: {
+            path: path
           }
         }
       },
       {
         $limit: options.limit,
       },
+      {
+        $addFields: {
+          name: "$stakeholders.name"
+        }
+      },
       {
         $project: {
-          stakeholders: 1,
-          score: { $meta: "searchScore" }
+          name: 1,
+          score: { $meta: "searchScore" },
+          highlights: { $meta: "searchHighlights" }
         }
       }
     ]).exec(cb);

package/lib/Financials.js

@@ -7,7 +7,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////////////
 
-const _ = require("underscore");
 module.exports = function(mongoose, config) {
 
   var Schema = mongoose.Schema;

package/lib/Fund.js

@@ -1,11 +1,8 @@
 "use strict";
 
-const _ = require("underscore");
-const helpers = require("../helpers");
 module.exports = function(mongoose, config) {
 
   var Schema = mongoose.Schema;
-  var Round = mongoose.model('Round');
   var _ = require('underscore');
 
   var Fund = new Schema({
@@ -13,10 +10,10 @@ module.exports = function(mongoose, config) {
     slug: { type: String, required: true, unique: true },
     abbreviation: { type: String },
     customFields: { type: Schema.Types.Mixed },
-    
+
     // the stakeholders names we match to on cap tables
     stakeholders: [{ type: String, unique: true, partialFilterExpression : { type :"string" }, trim: true }]
-  
+
   });
 
   /************* BASIC FIELDS **********************/
@@ -172,6 +169,7 @@ module.exports = function(mongoose, config) {
       {
         $project: {
           name: 1,
+          abbreviation: 1,
           score: { $meta: "searchScore" }
         }
       }

package/lib/LimitedPartner.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const _ = require("underscore");
-const helpers = require("@dhyasama/totem-models/helpers");
 module.exports = function(mongoose, config) {
 
   let
@@ -116,18 +114,24 @@ module.exports = function(mongoose, config) {
 
 /////////////////////
 
-  LimitedPartner.virtual('totalCommitment').get(function () {
-    var self = this;
-    return _.reduce(self.transactions, function(memo, transaction) {
+  const calculateTotalCommitment = function (transactions) {
+    return _.reduce(transactions, function(memo, transaction) {
       return memo + ((transaction.type === 'commitment' && Math.abs(transaction.amount) > 0) ? transaction.amount : 0);
     }, 0);
+  };
+
+  LimitedPartner.virtual('totalCommitment').get(function () {
+    return calculateTotalCommitment(this.transactions);
   });
 
-  LimitedPartner.virtual('totalContribution').get(function () {
-    var self = this;
-    return _.reduce(self.transactions, function(memo, transaction) {
+  const calculateTotalContribution = function (transactions) {
+    return _.reduce(transactions, function(memo, transaction) {
       return memo + ((transaction.type === 'contribution' && Math.abs(transaction.amount) > 0) ? transaction.amount : 0);
     }, 0);
+  };
+
+  LimitedPartner.virtual('totalContribution').get(function () {
+    return calculateTotalContribution(this.transactions);
   });
 
   LimitedPartner.virtual('totalDistribution').get(function () {
@@ -864,10 +868,24 @@ module.exports = function(mongoose, config) {
       {
         $project: {
           name: 1,
+          transactions: 1,
           score: { $meta: "searchScore" }
         }
       }
-    ]).exec(cb);
+    ]).exec(function(err, result) {
+
+      if (err) return cb(err);
+
+      _.each(result, function(item) {
+        item.commitment = calculateTotalCommitment(item.transactions);
+        item.contribution = calculateTotalContribution(item.transactions);
+        delete item.transactions;
+      });
+
+      return cb(null, result);
+
+
+    });
 
   };
 

package/lib/Organization.js

@@ -1,8 +1,5 @@
 'use strict';
 
-const _ = require("underscore");
-const utilities = require("@dhyasama/totem-utilities");
-const helpers = require("../helpers");
 module.exports = function(mongoose, config) {
 
   let
@@ -2071,6 +2068,13 @@ module.exports = function(mongoose, config) {
     // combine provided and default options
     options = _.defaults(options || {}, defaultOptions);
 
+    const path = [
+      'name',
+      'aliases',
+      'websiteAliases',
+      'stakeholders'
+    ];
+
     self.aggregate([
       {
         "$search": {
@@ -2080,18 +2084,7 @@ module.exports = function(mongoose, config) {
               {
                 text: {
                   query: value,
-                  path: [
-                    'name',
-                    'aliases',
-                    'website',
-                    'websiteAliases',
-                    'stakeholders'
-                  ],
-                  fuzzy: {
-                    maxEdits: options.maxEdits,
-                    maxExpansions: options.maxExpansions
-                  },
-                  score: { boost: { value: 3 } }
+                  path: path
                 }
               }
             ],
@@ -2104,6 +2097,9 @@ module.exports = function(mongoose, config) {
               }
             ],
             minimumShouldMatch: 1
+          },
+          highlight: {
+            path: path
           }
         }
       },
@@ -2114,7 +2110,8 @@ module.exports = function(mongoose, config) {
         $project: {
           name: 1,
           logoUrl: 1,
-          score: { $meta: "searchScore" }
+          score: { $meta: "searchScore" },
+          highlights: { $meta: "searchHighlights" }
         }
       }
     ]).exec(function(err, orgs) {

package/lib/Person.js

@@ -1,6 +1,5 @@
 "use strict";
 
-const _ = require("underscore");
 module.exports = function(mongoose, config) {
 
   let
@@ -1013,6 +1012,14 @@ module.exports = function(mongoose, config) {
     // combine provided and default options
     options = _.defaults(options || {}, defaultOptions);
 
+    const path = [
+      'name.first',
+      'name.last',
+      'fullName',
+      'aliases',
+      'contact.email.email'
+    ];
+
     self.aggregate([
       {
         "$search": {
@@ -1022,17 +1029,7 @@ module.exports = function(mongoose, config) {
               {
                 text: {
                   query: query,
-                  path: [
-                    'name.first',
-                    'name.last',
-                    'fullName',
-                    'aliases',
-                    'stakeholders'
-                  ],
-                  fuzzy: {
-                    maxEdits: options.maxEdits,
-                    maxExpansions: options.maxExpansions
-                  }
+                  path: path
                 }
               }
             ],
@@ -1043,8 +1040,10 @@ module.exports = function(mongoose, config) {
                   value: false
                 }
               }
-            ],
-            minimumShouldMatch: 1
+            ]
+          },
+          highlight: {
+            path: path
           }
         }
       }, {
@@ -1056,7 +1055,8 @@ module.exports = function(mongoose, config) {
           "name": 1,
           "avatarUrl": 1,
           "sources": 1,
-          "score": { "$meta": "searchScore" }
+          "score": { "$meta": "searchScore" },
+          highlights: { $meta: "searchHighlights" }
         }
       }
     ]).exec(function(err, people) {

package/lib/Round.js

@@ -618,7 +618,7 @@ module.exports = function(mongoose, config) {
     let query = self.find({ 'vehicles.fund': { $in: fundIds } });
 
     query.select('organization');
-    query.populate('organization', 'name');
+    query.populate('organization', 'name people');
 
     query.exec(function(err, rounds) {
 
@@ -639,7 +639,8 @@ module.exports = function(mongoose, config) {
 
         portfolio.push({
           _id: rounds[0].organization._id,
-          name: rounds[0].organization.name
+          name: rounds[0].organization.name,
+          people: rounds[0].organization.people
         });
 
       });

package/package.json

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

package/test/LimitedPartner.js

@@ -16,7 +16,7 @@ var
   Organization = mongoose.model('Organization'),
   organization = new Organization();
 
-describe('Limited Partner', function() {
+describe.only('Limited Partner', function() {
 
   before(function(done) {
     databaseHelpers.connect(mongoose, done);
@@ -123,7 +123,7 @@ describe('Limited Partner', function() {
     lp.transactions.push({
       fund: fund,
       type: 'commitment',
-      amount: 100000,
+      amount: 1000000,
       date: new Date()
     });
 
@@ -279,6 +279,26 @@ describe('Limited Partner', function() {
      });
   });
 
+  it('calculates an lps total commitment', function(done) {
+    LimitedPartner.getById(lp.id, { CUSTOMER_ID: organization._id, role: 'admin' }, function(err, result) {
+      should.not.exist(err);
+      should.exist(result);
+      result.id.should.equal(lp.id);
+      result.totalCommitment.should.equal(1000000);
+      done();
+    });
+  });
+
+  it('calculates an lps total contribution', function(done) {
+    LimitedPartner.getById(lp.id, { CUSTOMER_ID: organization._id, role: 'admin' }, function(err, result) {
+      should.not.exist(err);
+      should.exist(result);
+      result.id.should.equal(lp.id);
+      result.totalContribution.should.equal(400000);
+      done();
+    });
+  });
+
   it('adds a note', function(done) {
 
     LimitedPartner.addNote(lp.id, person._id, 'Sweet note bro!', false, organization._id, function(err, result) {

package/test/Organization.js

@@ -19,7 +19,7 @@ var someOtherLp;
 var account;
 var customer1, customer2;
 
-describe.only('Organization', function() {
+describe('Organization', function() {
 
   var org1, org2, org3, org4, org5;
   var mergeId = new mongoose.Types.ObjectId();