@dhyasama/totem-models 10.16.0 → 10.18.0

package/lib/CapTable.js

@@ -12,6 +12,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////////////
 
+const _ = require("underscore");
 module.exports = function(mongoose, config) {
 
   var Schema = mongoose.Schema;
@@ -35,7 +36,7 @@ module.exports = function(mongoose, config) {
     document: { type: Schema.ObjectId, ref: 'Document', required: false },
 
     stakeholders: [{
-      
+
       _id: false,
 
       // the raw stakeholder name on the cap table
@@ -107,7 +108,7 @@ module.exports = function(mongoose, config) {
   // Properties that are not persisted to the database
   ///////////////////////////////////////////////////////////////////////////////////////
 
-   CapTable.virtual('shares').get(function() {
+  CapTable.virtual('shares').get(function() {
 
     var self = this;
 
@@ -142,7 +143,7 @@ module.exports = function(mongoose, config) {
     if (!customerid) { return cb(new Error('customerid is required'), null); }
     if (!mongoose.Types.ObjectId.isValid(customerid)) { return cb(new Error('customerid is not a valid ObjectId'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
-    
+
     let query;
 
     query = self.find({
@@ -153,7 +154,7 @@ module.exports = function(mongoose, config) {
     query.populate('stakeholders.lp', 'name')
     query.populate('stakeholders.org', 'name logoUrl')
     query.populate('stakeholders.person', 'name avatarUrl title')
-    
+
     query.exec(cb);
 
   };
@@ -166,7 +167,7 @@ module.exports = function(mongoose, config) {
     if (!customerid) { return cb(new Error('customerid is required'), null); }
     if (!mongoose.Types.ObjectId.isValid(customerid)) { return cb(new Error('customerid is not a valid ObjectId'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
-    
+
     self.deleteMany({ customer: customerid, 'entered.by': { $ne: 'carta-parser' } }, cb);
 
   };
@@ -179,7 +180,7 @@ module.exports = function(mongoose, config) {
     if (!orgid) { return cb(new Error('orgid is required'), null); }
     if (!mongoose.Types.ObjectId.isValid(orgid)) { return cb(new Error('orgid is not a valid ObjectId'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
-    
+
     var query;
 
     if (options.isWorkerProcess) {
@@ -189,10 +190,10 @@ module.exports = function(mongoose, config) {
     }
 
     else {
-    
+
       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); }
-    
+
       query = self.findOne({
         customer: options.CUSTOMER_ID,
         organization: orgid
@@ -217,7 +218,7 @@ module.exports = function(mongoose, config) {
     if (!lpid) { return cb(new Error('lpid is required'), null); }
     if (!mongoose.Types.ObjectId.isValid(lpid)) { return cb(new Error('lpid is not a valid ObjectId'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
-    
+
     var query;
 
     if (options.isWorkerProcess) {
@@ -230,7 +231,7 @@ module.exports = function(mongoose, config) {
 
       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); }
-    
+
       query = self.find({
         customer: options.CUSTOMER_ID,
         'stakeholders.lp': lpid
@@ -250,7 +251,7 @@ module.exports = function(mongoose, config) {
     if (!cb) { throw new Error('cb is required'); }
     if (!lpids) { return cb(new Error('lpids is required'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
-    
+
     var query;
 
     if (options.isWorkerProcess) {
@@ -263,7 +264,7 @@ module.exports = function(mongoose, config) {
 
       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); }
-    
+
       query = self.find({
         customer: options.CUSTOMER_ID,
         'stakeholders.lp': { $in : lpids }
@@ -284,7 +285,7 @@ module.exports = function(mongoose, config) {
     if (!orgid) { return cb(new Error('orgid is required'), null); }
     if (!mongoose.Types.ObjectId.isValid(orgid)) { return cb(new Error('orgid is not a valid ObjectId'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
-    
+
     var query;
 
     if (options.isWorkerProcess) {
@@ -297,7 +298,7 @@ module.exports = function(mongoose, config) {
 
       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); }
-    
+
       query = self.find({
         customer: options.CUSTOMER_ID,
         'stakeholders.org': orgid
@@ -318,7 +319,7 @@ module.exports = function(mongoose, config) {
     if (!personid) { return cb(new Error('personid is required'), null); }
     if (!mongoose.Types.ObjectId.isValid(personid)) { return cb(new Error('personid is not a valid ObjectId'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
-    
+
     var query;
 
     if (options.isWorkerProcess) {
@@ -331,7 +332,7 @@ module.exports = function(mongoose, config) {
 
       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); }
-    
+
       query = self.find({
         customer: options.CUSTOMER_ID,
         'stakeholders.person': personid
@@ -405,6 +406,70 @@ module.exports = function(mongoose, config) {
 
   };
 
+  CapTable.statics.search2 = function search2(value, options, cb) {
+
+    const self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!value) { return cb(new Error('value 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 defaultOptions = {
+      limit: 10,
+      maxEdits: 1,
+      maxExpansions: 100
+    };
+
+    // combine provided and default options
+    options = _.defaults(options || {}, defaultOptions);
+
+    self.aggregate([
+      {
+        "$search": {
+          index: 'default',
+          compound: {
+            should: [
+              {
+                text: {
+                  query: value,
+                  path: [
+                    'stakeholders.name'
+                  ],
+                  fuzzy: {
+                    maxEdits: options.maxEdits,
+                    maxExpansions: options.maxExpansions
+                  },
+                  score: { boost: { value: 3 } }
+                }
+              }
+            ],
+            must: [
+              {
+                equals: {
+                  path: 'customer',
+                  value: mongoose.Types.ObjectId(options.CUSTOMER_ID)
+                }
+              }
+            ],
+            minimumShouldMatch: 1
+          }
+        }
+      },
+      {
+        $limit: options.limit,
+      },
+      {
+        $project: {
+          stakeholders: 1,
+          score: { $meta: "searchScore" }
+        }
+      }
+    ]).exec(cb);
+
+  };
+
   CapTable.statics.upsert = function upsert(capTable, cb) {
 
     if (!capTable) { return cb(new Error('cap table is required'), null); }

package/lib/Fund.js

@@ -1,5 +1,7 @@
 "use strict";
 
+const _ = require("underscore");
+const helpers = require("../helpers");
 module.exports = function(mongoose, config) {
 
   var Schema = mongoose.Schema;
@@ -126,6 +128,81 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Fund.statics.search2 = function search2(value, options, cb) {
+
+    const self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!value) { return cb(new Error('value 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 defaultOptions = {
+      limit: 10,
+      maxEdits: 1,
+      maxExpansions: 100
+    };
+
+    // combine provided and default options
+    options = _.defaults(options || {}, defaultOptions);
+
+    self.aggregate([
+      {
+        "$search": {
+          index: 'default',
+          compound: {
+            should: [
+              {
+                text: {
+                  query: value,
+                  path: [
+                    'name',
+                    'stakeholders'
+                  ],
+                  fuzzy: {
+                    maxEdits: options.maxEdits,
+                    maxExpansions: options.maxExpansions
+                  },
+                  score: { boost: { value: 3 } }
+                }
+              }
+            ],
+            must: [
+              {
+                equals: {
+                  path: 'customer',
+                  value: mongoose.Types.ObjectId(options.CUSTOMER_ID)
+                }
+              }
+            ],
+            minimumShouldMatch: 1
+          }
+        }
+      },
+      {
+        $limit: options.limit,
+      },
+      {
+        $project: {
+          name: 1,
+          score: { $meta: "searchScore" }
+        }
+      }
+    ]).exec(function(err, orgs) {
+
+      if (err) { return cb(err, null); }
+
+      orgs = _.map(orgs, function(org) {
+        return helpers.cleanOrg(org, options.CUSTOMER_ID);
+      });
+
+      return cb(null, orgs);
+
+    });
+
+  };
+
   Fund.statics.upsert = function upsert(fund, username, cb) {
 
     if (!fund) { return cb(new Error('Fund is required'), null); }

package/lib/Organization.js

@@ -154,9 +154,10 @@ module.exports = function(mongoose, config) {
       }],
 
       valuations: [{
-        amount: { type: Number, default: 0 },
-        description: { type: String, trim: true },
         date: { type: Date, default: null },
+        valuation: { type: Number, default: 0 },
+        pricePerShare: { type: Number, default: 0 },
+        method: { type: String, trim: true },
         customer: { type: Schema.ObjectId, ref: 'Organization' },
       }],
 

package/package.json

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