@dhyasama/totem-models 10.14.0 → 10.14.1

package/lib/LimitedPartner.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const _ = require("underscore");
+const helpers = require("@dhyasama/totem-models/helpers");
 module.exports = function(mongoose, config) {
 
   let
@@ -185,14 +187,14 @@ module.exports = function(mongoose, config) {
   });
 
   LimitedPartner.virtual('fundsInvested').get(function () {
-    
+
     var self = this;
     var fundsInvested = [];
-    
+
     _.each(self.transactions, function(transaction) {
-      
+
       var fundMatch = _.find(fundsInvested, function(fund) { return fund._id === transaction.fund._id; });
-      
+
       if(!fundMatch) {
         fundsInvested.push({
           _id: transaction.fund._id,
@@ -829,20 +831,13 @@ module.exports = function(mongoose, config) {
           index: 'default',
           compound: {
             should: [
-              {
-                autocomplete: {
-                  query: value,
-                  path: 'name',
-                  fuzzy: {
-                    maxEdits: options.maxEdits,
-                    maxExpansions: options.maxExpansions
-                  }
-                }
-              },
               {
                 text: {
                   query: value,
-                  path: 'name',
+                  path: [
+                    'name',
+                    'stakeholders'
+                  ],
                   fuzzy: {
                     maxEdits: options.maxEdits,
                     maxExpansions: options.maxExpansions

package/lib/Organization.js

@@ -273,7 +273,7 @@ module.exports = function(mongoose, config) {
               condition: { type: String, enum: [null, 'equals', 'doesNotEqual', 'contains', 'doesNotContain', 'lessThan', 'greaterThan', 'isEmpty', 'isNotEmpty'] },
               values: [{ type: String, trim: true }]
             }],
-            sort: { 
+            sort: {
               by: { type: String, trim: true },
               reverse: { type: Boolean, default: false }
             },
@@ -506,7 +506,7 @@ module.exports = function(mongoose, config) {
               condition: { type: String, enum: [null, 'equals', 'doesNotEqual', 'contains', 'doesNotContain', 'lessThan', 'greaterThan', 'isEmpty', 'isNotEmpty'] },
               values: [{ type: String, trim: true }]
             }],
-            sort: { 
+            sort: {
               by: { type: String, trim: true },
               reverse: { type: Boolean, default: false }
             },
@@ -571,7 +571,7 @@ module.exports = function(mongoose, config) {
               condition: { type: String, enum: [null, 'equals', 'doesNotEqual', 'contains', 'doesNotContain', 'lessThan', 'greaterThan', 'isEmpty', 'isNotEmpty'] },
               values: [{ type: String, trim: true }]
             }],
-            sort: { 
+            sort: {
               by: { type: String, trim: true },
               reverse: { type: Boolean, default: false }
             },
@@ -691,10 +691,8 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
-    if (!self.customer) return [];
-
     // Backwards schema compatibility
-    else if (!self.customer.deals) return [];
+    if (!self.customer.deals) return [];
 
     // Deals aren't on for customer
     else if (!self.customer.deals.active) return [];
@@ -819,8 +817,8 @@ module.exports = function(mongoose, config) {
   Organization.virtual('operating.closed.on').get(function () {
 
     const self = this;
-    const publicData = self.operating && self.operating.closed && self.operating.closed.public || {};
-    const privateData = self.operating && self.operating.closed && self.operating.closed.private || [];
+    const publicData = self.operating.closed.public || {};
+    const privateData = self.operating.closed.private || [];
 
     if (publicData.closedOn) return publicData.closedOn;
     else if (privateData.length >= 1) {
@@ -834,8 +832,8 @@ module.exports = function(mongoose, config) {
   Organization.virtual('operating.closed.hasZeroUnrealizedValue').get(function () {
 
     const self = this;
-    const publicData = self.operating && self.operating.closed && self.operating.closed.public || {};
-    const privateData = self.operating && self.operating.closed && self.operating.closed.private || [];
+    const publicData = self.operating.closed.public || {};
+    const privateData = self.operating.closed.private || [];
 
     if (publicData.closedOn) return false;
     else if (privateData.length >= 1) {
@@ -849,8 +847,8 @@ module.exports = function(mongoose, config) {
   Organization.virtual('operating.acquired.amount').get(function () {
 
     const self = this;
-    const publicData = self.operating && self.operating.acquired && self.operating.acquired.public || {};
-    const privateData = self.operating && self.operating.acquired && self.operating.acquired.private || [];
+    const publicData = self.operating.acquired.public || {};
+    const privateData = self.operating.acquired.private || [];
 
     if (publicData.amount) return publicData.amount;
     else if (privateData.length >= 1) {
@@ -864,8 +862,8 @@ module.exports = function(mongoose, config) {
   Organization.virtual('operating.acquired.by').get(function () {
 
     const self = this;
-    const publicData = self.operating && self.operating.acquired && self.operating.acquired.public || {};
-    const privateData = self.operating && self.operating.acquired && self.operating.acquired.private || [];
+    const publicData = self.operating.acquired.public || {};
+    const privateData = self.operating.acquired.private || [];
 
     if (publicData.by) return publicData.by;
     else if (privateData.length >= 1) {
@@ -879,8 +877,8 @@ module.exports = function(mongoose, config) {
   Organization.virtual('operating.acquired.on').get(function () {
 
     const self = this;
-    const publicData = self.operating && self.operating.acquired && self.operating.acquired.public || {};
-    const privateData = self.operating && self.operating.acquired && self.operating.acquired.private || [];
+    const publicData = self.operating.acquired.public || {};
+    const privateData = self.operating.acquired.private || [];
 
     if (publicData.acquiredOn) return publicData.acquiredOn;
     else if (privateData.length >= 1) {
@@ -894,8 +892,8 @@ module.exports = function(mongoose, config) {
   Organization.virtual('operating.merged.with').get(function () {
 
     const self = this;
-    const publicData = self.operating && self.operating.merged && self.operating.merged.public || {};
-    const privateData = self.operating && self.operating.merged && self.operating.merged.private || [];
+    const publicData = self.operating.merged.public || {};
+    const privateData = self.operating.merged.private || [];
 
     if (publicData.with) return publicData.with;
     else if (privateData.length >= 1) {
@@ -909,8 +907,8 @@ module.exports = function(mongoose, config) {
   Organization.virtual('operating.merged.on').get(function () {
 
     const self = this;
-    const publicData = self.operating && self.operating.merged && self.operating.merged.public || {};
-    const privateData = self.operating && self.operating.merged && self.operating.merged.private || [];
+    const publicData = self.operating.merged.public || {};
+    const privateData = self.operating.merged.private || [];
 
     if (publicData.mergedOn) return publicData.mergedOn;
     else if (privateData.length >= 1) {
@@ -933,7 +931,7 @@ module.exports = function(mongoose, config) {
     else return 'Active';
 
   });
-  
+
   Organization.virtual('websites').get(function () {
 
     var self = this;
@@ -1272,11 +1270,11 @@ module.exports = function(mongoose, config) {
 
     self
       .find({ $or:
-        [
-          { 'people.person': personId },
-          { 'chairs.first': personId },
-          { 'chairs.second': personId }
-        ],
+          [
+            { 'people.person': personId },
+            { 'chairs.first': personId },
+            { 'chairs.second': personId }
+          ],
         'deleted': { $ne: true }
       })
       .select('-sources -customer')
@@ -1432,24 +1430,24 @@ module.exports = function(mongoose, config) {
 
     self
       .find({ $or:
-        [
-          { 'social.facebook': {$in: facebookRegexes }},
-          { 'social.linkedin': {$in: linkedinRegexes }},
-          { 'social.twitter': {$in: twitterRegexes }},
-          { 'crunchbase.url': {$in: crunchbaseRegexes }}
-        ],
+          [
+            { 'social.facebook': {$in: facebookRegexes }},
+            { 'social.linkedin': {$in: linkedinRegexes }},
+            { 'social.twitter': {$in: twitterRegexes }},
+            { 'crunchbase.url': {$in: crunchbaseRegexes }}
+          ],
         'deleted': { $ne: true }
       }).exec(function(err, orgs) {
 
-        if (err) { return cb(err, null); }
+      if (err) { return cb(err, null); }
 
-        orgs = _.map(orgs, function(org) {
-          return helpers.cleanOrg(org, options.CUSTOMER_ID);
-        });
+      orgs = _.map(orgs, function(org) {
+        return helpers.cleanOrg(org, options.CUSTOMER_ID);
+      });
 
-        return cb(null, orgs);
+      return cb(null, orgs);
 
-      });
+    });
 
   };
 
@@ -1471,9 +1469,9 @@ module.exports = function(mongoose, config) {
     self
       .find(
         { $or: [
-          { 'operating.acquired.private.by': orgid, 'operating.acquired.private.customer': options.CUSTOMER_ID, 'deleted': { $ne: true } },
-          { 'operating.acquired.public.by': orgid, 'deleted': { $ne: true } },
-        ]}
+            { 'operating.acquired.private.by': orgid, 'operating.acquired.private.customer': options.CUSTOMER_ID, 'deleted': { $ne: true } },
+            { 'operating.acquired.public.by': orgid, 'deleted': { $ne: true } },
+          ]}
       )
       .select('name logoUrl')
       .exec(cb);
@@ -1587,10 +1585,10 @@ module.exports = function(mongoose, config) {
 
     self
       .find({ $or:
-        [
-          { 'chairs.first': personId },
-          { 'chairs.second': personId }
-        ],
+          [
+            { 'chairs.first': personId },
+            { 'chairs.second': personId }
+          ],
         'deleted': { $ne: true }
       })
       .exec(function(err, orgs) {
@@ -1676,16 +1674,16 @@ module.exports = function(mongoose, config) {
 
     query.exec(function(err, orgs) {
 
-        if (err) { return cb(err, null); }
-        else if (!orgs) { return cb(null, []); }
+      if (err) { return cb(err, null); }
+      else if (!orgs) { return cb(null, []); }
 
-        orgs = _.map(orgs, function(org) {
-          return helpers.cleanOrg(org, options.CUSTOMER_ID);
-        });
+      orgs = _.map(orgs, function(org) {
+        return helpers.cleanOrg(org, options.CUSTOMER_ID);
+      });
 
-        return cb(null, orgs);
+      return cb(null, orgs);
 
-      });
+    });
 
   };
 
@@ -1757,50 +1755,50 @@ module.exports = function(mongoose, config) {
     // get the org requested
     query.exec(function(err, org) {
 
-        if (err) { return cb(err, null); }
-        if (!org) { return cb(null, null); }
-
-        // get the customer requesting org
-        self.findById(options.CUSTOMER_ID, function(err, customer) {
+      if (err) { return cb(err, null); }
+      if (!org) { return cb(null, null); }
 
-          if (err) { return cb(err, null); }
-          if (!customer) { return cb(null, null); }
+      // get the customer requesting org
+      self.findById(options.CUSTOMER_ID, function(err, customer) {
 
-          let current = [];
-          let past = [];
-          let all = [];
+        if (err) { return cb(err, null); }
+        if (!customer) { return cb(null, null); }
 
-          // combined list of sources from each person at org
-          let orgSources = helpers.getPeopleSources(_.pluck(org.people, 'person'));
+        let current = [];
+        let past = [];
+        let all = [];
 
-          // loop through customer's people and categorize sources
-          _.each(customer.people, function(p) {
+        // combined list of sources from each person at org
+        let orgSources = helpers.getPeopleSources(_.pluck(org.people, 'person'));
 
-            var source = _.find(orgSources, function(os) {
-              if (!os || !os.person || !os.person._id) return false;
-              return os.person._id.toString() === p.person.toString();
-            });
+        // loop through customer's people and categorize sources
+        _.each(customer.people, function(p) {
 
-            if (!source) return;
+          var source = _.find(orgSources, function(os) {
+            if (!os || !os.person || !os.person._id) return false;
+            return os.person._id.toString() === p.person.toString();
+          });
 
-            if (p.current) current.push(source);
-            if (!p.current) past.push(source);
-            all.push(source);
+          if (!source) return;
 
-          });
+          if (p.current) current.push(source);
+          if (!p.current) past.push(source);
+          all.push(source);
 
-          // todo - fix sorting
-          // return categorized sources
-          return cb(null, {
-            all: all, //helpers.sortPeopleSources(all, options.CUSTOMER_ID),
-            current: current, //helpers.sortPeopleSources(current, options.CUSTOMER_ID),
-            past: past //helpers.sortPeopleSources(past, options.CUSTOMER_ID)
-          });
+        });
 
+        // todo - fix sorting
+        // return categorized sources
+        return cb(null, {
+          all: all, //helpers.sortPeopleSources(all, options.CUSTOMER_ID),
+          current: current, //helpers.sortPeopleSources(current, options.CUSTOMER_ID),
+          past: past //helpers.sortPeopleSources(past, options.CUSTOMER_ID)
         });
 
       });
 
+    });
+
   };
 
   Organization.statics.modify = function(filter, update, cb) {
@@ -2095,56 +2093,22 @@ module.exports = function(mongoose, config) {
           index: 'default',
           compound: {
             should: [
-              {
-                autocomplete: {
-                  query: value,
-                  path: 'name',
-                  fuzzy: {
-                    maxEdits: options.maxEdits,
-                    maxExpansions: options.maxExpansions
-                  }
-                }
-              },
               {
                 text: {
                   query: value,
-                  path: 'name',
+                  path: [
+                    'name',
+                    'aliases',
+                    'website',
+                    'websiteAliases',
+                    'stakeholders'
+                  ],
                   fuzzy: {
                     maxEdits: options.maxEdits,
                     maxExpansions: options.maxExpansions
                   },
                   score: { boost: { value: 3 } }
                 }
-              },
-              {
-                autocomplete: {
-                  query: value,
-                  path: 'aliases',
-                  fuzzy: {
-                    maxEdits: options.maxEdits,
-                    maxExpansions: options.maxExpansions
-                  }
-                }
-              },
-              {
-                autocomplete: {
-                  query: value,
-                  path: 'website',
-                  fuzzy: {
-                    maxEdits: options.maxEdits,
-                    maxExpansions: options.maxExpansions
-                  }
-                }
-              },
-              {
-                autocomplete: {
-                  query: value,
-                  path: 'websiteAliases',
-                  fuzzy: {
-                    maxEdits: options.maxEdits,
-                    maxExpansions: options.maxExpansions
-                  }
-                }
               }
             ],
             must: [

package/lib/Person.js

@@ -1,8 +1,7 @@
- "use strict";
+"use strict";
 
 const _ = require("underscore");
-
- module.exports = function(mongoose, config) {
+module.exports = function(mongoose, config) {
 
   let
 
@@ -146,7 +145,7 @@ const _ = require("underscore");
   Person.virtual('name.full').get(function () {
     var name = '';
     if(this.name.first) name += this.name.first;
-    if(this.name.first && this.name.last) name += ' '; 
+    if(this.name.first && this.name.last) name += ' ';
     if(this.name.last) name += this.name.last;
     return name;
   });
@@ -179,7 +178,7 @@ const _ = require("underscore");
 
   Person.methods.addMerged = function(id) {
     if (this.merged.indexOf(id) == -1) {
-     this.merged = this.merged.concat([id]);
+      this.merged = this.merged.concat([id]);
       return true;
     }
     else {
@@ -396,12 +395,12 @@ const _ = require("underscore");
 
     self
       .find({ $or:
-        [
-          { 'social.facebook': {$in: facebookRegexes }},
-          { 'social.linkedin': {$in: linkedinRegexes }},
-          { 'social.twitter': {$in: twitterRegexes }},
-          { 'crunchbase.url': {$in: crunchbaseRegexes }}
-        ],
+          [
+            { 'social.facebook': {$in: facebookRegexes }},
+            { 'social.linkedin': {$in: linkedinRegexes }},
+            { 'social.twitter': {$in: twitterRegexes }},
+            { 'crunchbase.url': {$in: crunchbaseRegexes }}
+          ],
         'deleted': { $ne: true }
       }).exec(cb);
 
@@ -665,47 +664,6 @@ const _ = require("underscore");
 
   };
 
-  Person.statics.atlasSearch = function (query, options, cb) {
-
-    const self = this;
-
-    const defaultOptions = {
-      limit: 100
-    };
-
-    // combine provided and default options
-    options = _.defaults(options || {}, defaultOptions);
-
-    self.aggregate([
-      {
-        '$search': {
-          'index': 'default',
-          'text': {
-            'query': query,
-            'path': {
-              'wildcard': '*'
-            }
-          }
-        }
-      }, {
-        '$match': {
-          'deleted': false
-        }
-      }, {
-        $limit: options.limit,
-      }, {
-        "$project": {
-          "_id": 1,
-          "fullName": 1,
-          "name": 1,
-          "avatarUrl": 1,
-          "score": { "$meta": "searchScore" }
-        }
-      }
-    ], cb);
-
-  };
-
   // search for people based on fields provided
   // Data format, everything is optional
   //{
@@ -743,7 +701,7 @@ const _ = require("underscore");
           delete query['$and'];
         }
 
-        // "and" is only used for name, which is one more thing to "or" so move it to "or"
+          // "and" is only used for name, which is one more thing to "or" so move it to "or"
         // note that changes may be needed if "and" is used for other things as well
         else {
           query['$or'].push({ '$and': query['$and'] });
@@ -1044,121 +1002,66 @@ const _ = require("underscore");
 
   Person.statics.search2 = function (query, options, cb) {
 
-     const self = this;
-
-     const defaultOptions = {
-       limit: 10,
-       maxEdits: 1,
-       maxExpansions: 100
-     };
-
-     // combine provided and default options
-     options = _.defaults(options || {}, defaultOptions);
-
-     self.aggregate([
-       {
-         "$search": {
-           index: 'default',
-           compound: {
-             should: [
-               {
-                 autocomplete: {
-                   query: query,
-                   path: 'name.first',
-                   fuzzy: {
-                     maxEdits: options.maxEdits,
-                     maxExpansions: options.maxExpansions
-                   }
-                 }
-               },
-               {
-                 text: {
-                   query: query,
-                   path: 'name.first',
-                   fuzzy: {
-                     maxEdits: options.maxEdits,
-                     maxExpansions: options.maxExpansions
-                   }
-                 }
-               },
-               {
-                 autocomplete: {
-                   query: query,
-                   path: 'name.last',
-                   fuzzy: {
-                     maxEdits: options.maxEdits,
-                     maxExpansions: options.maxExpansions
-                   }
-                 }
-               },
-               {
-                 text: {
-                   query: query,
-                   path: 'name.last',
-                   fuzzy: {
-                     maxEdits: options.maxEdits,
-                     maxExpansions: options.maxExpansions
-                   }
-                 }
-               },
-               {
-                 autocomplete: {
-                   query: query,
-                   path: 'fullName',
-                   fuzzy: {
-                     maxEdits: options.maxEdits,
-                     maxExpansions: options.maxExpansions
-                   },
-                 }
-               },
-               {
-                 text: {
-                   query: query,
-                   path: 'fullName',
-                   fuzzy: {
-                     maxEdits: options.maxEdits,
-                     maxExpansions: options.maxExpansions
-                   },
-                   score: { boost: { value: 3 } }
-                 }
-               },
-               {
-                 autocomplete: {
-                   query: query,
-                   path: 'aliases',
-                   fuzzy: {
-                     maxEdits: options.maxEdits,
-                     maxExpansions: options.maxExpansions
-                   }
-                 }
-               }
-             ],
-             must: [
-               {
-                 equals: {
-                   path: 'deleted',
-                   value: false
-                 }
-               }
-             ],
-             minimumShouldMatch: 1
-           }
-         }
-       }, {
-         $limit: options.limit,
-       }, {
-         "$project": {
-           "_id": 1,
-           "fullName": 1,
-           "name": 1,
-           "avatarUrl": 1,
-           "sources": 1,
-           "score": { "$meta": "searchScore" }
-         }
-       }
-     ], cb);
-
-   };
+    const self = this;
+
+    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: query,
+                  path: [
+                    'name.first',
+                    'name.last',
+                    'fullName',
+                    'aliases',
+                    'stakeholders'
+                  ],
+                  fuzzy: {
+                    maxEdits: options.maxEdits,
+                    maxExpansions: options.maxExpansions
+                  }
+                }
+              }
+            ],
+            must: [
+              {
+                equals: {
+                  path: 'deleted',
+                  value: false
+                }
+              }
+            ],
+            minimumShouldMatch: 1
+          }
+        }
+      }, {
+        $limit: options.limit,
+      }, {
+        "$project": {
+          "_id": 1,
+          "fullName": 1,
+          "name": 1,
+          "avatarUrl": 1,
+          "sources": 1,
+          "score": { "$meta": "searchScore" }
+        }
+      }
+    ], cb);
+
+  };
 
   Person.statics.searchByEmail = function(email, cb) {
 

package/package.json

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