@dhyasama/totem-models 3.12.1 → 3.12.3

package/lib/Financials.js

@@ -28,7 +28,6 @@ module.exports = function(mongoose, config) {
       year: { type: Number, default: 0 },
       quarter: { type: String, enum: ['all', 'q1', 'q2', 'q3', 'q4'] },
       
-      // top line numbers
       cash: {
         amount: { type: Number, default: 0 },
       },
@@ -37,11 +36,11 @@ module.exports = function(mongoose, config) {
       },
       burn: {
         amount: { type: Number, default: 0 },
-        period: { type: String, enum: [null, 'monthly', 'quarter']},
+        period: { type: String, enum: [null, 'monthly', 'quarterly']},
       },
       runway: {
         amount: { type: Number, default: 0 },
-        period: { type: String, enum: [null, 'monthly', 'quarter']}, 
+        period: { type: String, enum: [null, 'monthly', 'quarterly']},        
       },
 
       // income statement

package/lib/List.js

@@ -32,6 +32,26 @@ module.exports = function(mongoose, config) {
 
   });
 
+  var cleanDoc = function cleanDoc(doc) {
+
+    var dedupeArray = function dedupeArray(arr) {
+      return _.uniq(arr, function(item) {
+        return (utils.isValidObjectId(item) ? item : item._id).toString();
+      });
+    };
+
+    // enforce unique items in arrays
+    doc.limitedPartners = dedupeArray(doc.limitedPartners);
+    doc.organizations = dedupeArray(doc.organizations);
+    doc.people = dedupeArray(doc.people);
+
+    // remove falsy values
+    doc.limitedPartners = _.compact(doc.limitedPartners);
+    doc.organizations = _.compact(doc.organizations);
+    doc.people = _.compact(doc.people);
+
+  };
+
   // Items are kept separate to facilitate population
   // This is a convenience function to get the full list of items
   List.virtual('items').get(function () {
@@ -218,16 +238,7 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
-    var dedupeArray = function dedupeArray(arr) {
-      return _.uniq(arr, function(item) {
-        return (utils.isValidObjectId(item) ? item : item._id).toString();
-      });
-    };
-
-    // enforce unique items in arrays
-    self.limitedPartners = dedupeArray(self.limitedPartners);
-    self.organizations = dedupeArray(self.organizations);
-    self.people = dedupeArray(self.people);
+    cleanDoc(self);
 
     next();
 

package/lib/Organization.js

@@ -213,6 +213,125 @@ module.exports = function(mongoose, config) {
   // HELPERS
   ///////////////////////////////////////////////////////////////////////////////////////
 
+  var cleanDoc = function cleanDoc(doc) {
+
+    var cleanContactInfo = function cleanContactInfo(obj) {
+
+      var thereCanOnlyBeOne = function thereCanOnlyBeOne(items) {
+
+        var primaryItems = _.filter(items, function(item) { return item.primary; });
+
+        if (primaryItems.length > 1) {
+
+          _.each(primaryItems, function(item, index) {
+            // skip the first one (leave it primary) and mark the rest as not primary
+            if (index >= 1) item.primary = false;
+          });
+
+        }
+
+        return items;
+
+      };
+
+      if (!obj || !obj.contact) return;
+
+      if (obj.contact.address) {
+
+        // must have something meaningful
+        obj.contact.address = _.map(obj.contact.address, function(address) {
+          if (!address.city && !address.state && !address.country) return null;
+          else return address;
+        });
+
+        // remove emptiness and dedupe
+        obj.contact.address = _.uniq(_.compact(obj.contact.address), function(item) { return item.city + item.state + item.country; });
+
+        // only one primary
+        obj.contact.address = thereCanOnlyBeOne(obj.contact.address);
+
+      }
+
+      if (obj.contact.email) {
+
+        // must have something meaningful
+        obj.contact.email = _.map(doc.contact.email, function(item) {
+          if (!item.email) return null;
+          else return item;
+        });
+
+        // remove emptiness and dedupe
+        obj.contact.email = _.uniq(_.compact(obj.contact.email), function(item) { return item.email; });
+
+        // only one primary
+        obj.contact.email = thereCanOnlyBeOne(obj.contact.email);
+
+      }
+
+      if (obj.contact.phone) {
+
+        // must have something meaningful
+        obj.contact.phone = _.map(doc.contact.phone, function(item) {
+          if (!item.number) return null;
+          else return item;
+        });
+
+        // remove emptiness and dedupe
+        obj.contact.phone = _.uniq(_.compact(obj.contact.phone), function(item) { return item.number; });
+
+        // only one primary
+        obj.contact.phone = thereCanOnlyBeOne(obj.contact.phone);
+
+      }
+
+    };
+
+    var cleanPeople = function cleanPeople(obj) {
+
+      // remove junk
+      obj.people = _.reject(obj.people, function(p) { return p.person == null; });
+
+      // dedupe
+      obj.people = _.uniq(obj.people, function(p) { return p.person._id ? p.person._id.toString() : p.person.toString(); });
+
+    };
+
+    var cleanWebsites = function cleanWebsites(obj) {
+
+      // Format website
+      if (obj.website) {
+        obj.website = String(obj.website);
+        obj.website = obj.website.replace('http://', '').replace('https://', '').replace(/\/+$/, '');
+        obj.website = utils.getDomain(obj.website);
+      }
+
+      // Format website aliases
+      if (obj.websiteAliases && obj.websiteAliases.length >= 1) {
+        obj.websiteAliases = _.map(obj.websiteAliases, function(alias) {
+          alias = String(alias);
+          alias = alias.replace('http://', '').replace('https://', '').replace(/\/+$/, '');
+          return utils.getDomain(alias);
+        });
+      }
+
+      // Add website to website aliases
+      // There are unique constraints on website and website aliases
+      // This enables us to enforce uniqueness across both and across documents
+      if (obj.website && obj.websiteAliases) obj.websiteAliases.push(obj.website);
+
+      if (obj.websiteAliases) {
+        obj.websiteAliases = _.uniq(obj.websiteAliases);
+        obj.websiteAliases = _.compact(obj.websiteAliases);
+      }
+
+    };
+
+    cleanContactInfo(doc);
+    cleanPeople(doc);
+    cleanWebsites(doc);
+
+  };
+
   var getSources = function getSources(people) {
 
     var result = _.compact(_.pluck(people, 'person'));
@@ -688,8 +807,6 @@ module.exports = function(mongoose, config) {
 
     domains = domains.concat(alternativeDomains);
 
-    _.each(domains, function(d) { console.log(d); });
-
     var query = this.find({ $or: [ {'website': { $in : domains }}, {'websiteAliases': { $in : domains }} ], 'deleted': {$ne: true} });
     query.exec(cb);
 
@@ -1290,12 +1407,15 @@ module.exports = function(mongoose, config) {
 
   Organization.statics.modify = function(filter, update, cb) {
 
-    if (!cb) throw new Error('cb  is required');
+    if (!cb) throw new Error('cb is required');
     if (!filter) { return cb(new Error('filter is required'), null); }
     if (!update) { return cb(new Error('update is required'), null); }
 
     var self = this;
 
+    // cleaning is done here because findOneAndUpdate does not trigger pre-save hook
+    cleanDoc(update['$set']);
+
     self.findOneAndUpdate(filter, update, { upsert: false, new: true }, cb);
 
   };
@@ -1312,93 +1432,7 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
-    var cleanContactInfo = function cleanContactInfo() {
-
-      var thereCanOnlyBeOne = function thereCanOnlyBeOne(items) {
-
-        var primaryItems = _.filter(items, function(item) { return item.primary; });
-
-        if (primaryItems.length > 1) {
-
-          _.each(primaryItems, function(item, index) {
-            // skip the first one (leave it primary) and mark the rest as not primary
-            if (index >= 1) item.primary = false;
-          });
-
-        }
-
-        return items;
-
-      };
-
-      // must have something meaningful
-      self.contact.address = _.map(self.contact.address, function(address) {
-        if (!address.city && !address.state && !address.country) return null;
-        else return address;
-      });
-
-      self.contact.email = _.map(self.contact.email, function(item) {
-        if (!item.email) return null;
-        else return item;
-      });
-
-      self.contact.phone = _.map(self.contact.phone, function(item) {
-        if (!item.number) return null;
-        else return item;
-      });
-
-      // remove emptiness and dedupe
-      self.contact.address = _.uniq(_.compact(self.contact.address), function(item) { return item.city + item.state + item.country; });
-      self.contact.email = _.uniq(_.compact(self.contact.email), function(item) { return item.email; });
-      self.contact.phone = _.uniq(_.compact(self.contact.phone), function(item) { return item.number; });
-
-      // only one primary
-      self.contact.address = thereCanOnlyBeOne(self.contact.address);
-      self.contact.email = thereCanOnlyBeOne(self.contact.email);
-      self.contact.phone = thereCanOnlyBeOne(self.contact.phone);
-
-    };
-
-    var cleanPeople = function cleanPeople() {
-
-      // remove junk
-      self.people = _.reject(self.people, function(p) { return p.person == null; });
-
-      // dedupe
-      self.people = _.uniq(self.people, function(p) { return p.person._id ? p.person._id.toString() : p.person.toString(); });
-
-    };
-
-    var cleanWebsites = function cleanWebsites() {
-
-      // Format website
-      if (self.website) {
-        self.website = utils.getDomain(self.website);
-        self.website = self.website.replace('http://', '').replace('https://', '');
-      }
-
-      // Format website aliases
-      if (self.websiteAliases && self.websiteAliases.length >= 1) {
-        self.websiteAliases = _.map(self.websiteAliases, function(alias) {
-          var website = utils.getDomain(alias);
-          website = website.replace('http://', '').replace('https://', '');
-          return utils.getDomain(website);
-        });
-      }
-
-      // Add website to website aliases
-      // There are unique constraints on website and website aliases
-      // This enables us to enforce uniqueness across both and across documents
-      if (self.website && self.websiteAliases) {
-        self.websiteAliases.push(self.website)
-        self.websiteAliases = _.uniq(self.websiteAliases);
-      }
-
-    };
-
-    cleanContactInfo();
-    cleanPeople();
-    cleanWebsites();
+    cleanDoc(self);
 
     return next();
 

package/lib/Person.js

@@ -137,6 +137,98 @@ module.exports = function(mongoose, config) {
 
   /////////////
 
+  var cleanDoc = function cleanDoc(doc) {
+
+    var cleanContactInfo = function cleanContactInfo(obj) {
+
+      var thereCanOnlyBeOne = function thereCanOnlyBeOne(items) {
+
+        var primaryItems = _.filter(items, function(item) { return item.primary; });
+
+        if (primaryItems.length > 1) {
+
+          _.each(primaryItems, function(item, index) {
+            // skip the first one (leave it primary) and mark the rest as not primary
+            if (index >= 1) item.primary = false;
+          });
+
+        }
+
+        return items;
+
+      };
+
+      if (!obj || !obj.contact) return;
+
+      if (obj.contact.address) {
+
+        // must have something meaningful
+        obj.contact.address = _.map(obj.contact.address, function(address) {
+          if (!address.city && !address.state && !address.country) return null;
+          else return address;
+        });
+
+        // remove emptiness and dedupe
+        obj.contact.address = _.uniq(_.compact(obj.contact.address), function(item) { return item.city + item.state + item.country; });
+
+        // only one primary
+        obj.contact.address = thereCanOnlyBeOne(obj.contact.address);
+
+      }
+
+      if (obj.contact.email) {
+
+        // must have something meaningful
+        obj.contact.email = _.map(doc.contact.email, function(item) {
+          if (!item.email) return null;
+          else return item;
+        });
+
+        // remove emptiness and dedupe
+        obj.contact.email = _.uniq(_.compact(obj.contact.email), function(item) { return item.email; });
+
+        // only one primary
+        obj.contact.email = thereCanOnlyBeOne(obj.contact.email);
+
+      }
+
+      if (obj.contact.phone) {
+
+        // must have something meaningful
+        obj.contact.phone = _.map(doc.contact.phone, function(item) {
+          if (!item.number) return null;
+          else return item;
+        });
+
+        // remove emptiness and dedupe
+        obj.contact.phone = _.uniq(_.compact(obj.contact.phone), function(item) { return item.number; });
+
+        // only one primary
+        obj.contact.phone = thereCanOnlyBeOne(obj.contact.phone);
+
+      }
+
+    };
+
+    cleanContactInfo(doc);
+
+    // set full name for ease of searching
+    if (doc.fullName) doc.fullName = doc.name.first + ' ' + doc.name.last;
+
+    if (doc.sources) {
+
+      // must have person and customer refs
+      doc.sources = _.reject(doc.sources, function(source) { return !source.person || !source.customer; });
+
+      // dedupe and compact
+      doc.sources = _.compact(_.uniq(doc.sources, function(source) { return source.person.toString() + source.customer.toString(); }));
+
+    }
+
+  };
+
+  /////////////
+
   Person.virtual('name.full').get(function () {
     return this.name.first + ' ' + this.name.last;
   });
@@ -989,6 +1081,8 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
+    cleanDoc(update['$set']);
+
     self.findOneAndUpdate({ _id: personId }, update, { upsert: false, new: true }, cb);
 
   };
@@ -1086,57 +1180,59 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
-    var thereCanOnlyBeOne = function thereCanOnlyBeOne(items) {
-
-      var primaryItems = _.filter(items, function(item) { return item.primary; });
-
-      if (primaryItems.length > 1) {
-
-        _.each(primaryItems, function(item, index) {
-          // skip the first one (leave it primary) and mark the rest as not primary
-          if (index >= 1) item.primary = false;
-        });
-
-      }
-
-      return items;
-
-    };
-
-    // set full name for ease of searching
-    self.fullName = self.name.first + ' ' + self.name.last;
-
-    // must have something meaningful
-    self.contact.address = _.map(self.contact.address, function(address) {
-      if (!address.city && !address.state && !address.country) return null;
-      else return address;
-    });
-
-    self.contact.email = _.map(self.contact.email, function(item) {
-      if (!item.email) return null;
-      else return item;
-    });
-
-    self.contact.phone = _.map(self.contact.phone, function(item) {
-      if (!item.number) return null;
-      else return item;
-    });
-
-    // remove emptiness and dedupe
-    self.contact.address = _.uniq(_.compact(self.contact.address), function(item) { return item.city + item.state + item.country; });
-    self.contact.email = _.uniq(_.compact(self.contact.email), function(item) { return item.email; });
-    self.contact.phone = _.uniq(_.compact(self.contact.phone), function(item) { return item.number; });
-
-    // only one primary
-    self.contact.address = thereCanOnlyBeOne(self.contact.address);
-    self.contact.email = thereCanOnlyBeOne(self.contact.email);
-    self.contact.phone = thereCanOnlyBeOne(self.contact.phone);
-
-    // must have person and customer refs
-    self.sources = _.reject(self.sources, function(source) { return !source.person || !source.customer; });
-
-    // dedupe
-    self.sources = _.uniq(self.sources, function(source) { return source.person.toString() + source.customer.toString(); });
+    // var thereCanOnlyBeOne = function thereCanOnlyBeOne(items) {
+    //
+    //   var primaryItems = _.filter(items, function(item) { return item.primary; });
+    //
+    //   if (primaryItems.length > 1) {
+    //
+    //     _.each(primaryItems, function(item, index) {
+    //       // skip the first one (leave it primary) and mark the rest as not primary
+    //       if (index >= 1) item.primary = false;
+    //     });
+    //
+    //   }
+    //
+    //   return items;
+    //
+    // };
+    //
+    // // set full name for ease of searching
+    // self.fullName = self.name.first + ' ' + self.name.last;
+    //
+    // // must have something meaningful
+    // self.contact.address = _.map(self.contact.address, function(address) {
+    //   if (!address.city && !address.state && !address.country) return null;
+    //   else return address;
+    // });
+    //
+    // self.contact.email = _.map(self.contact.email, function(item) {
+    //   if (!item.email) return null;
+    //   else return item;
+    // });
+    //
+    // self.contact.phone = _.map(self.contact.phone, function(item) {
+    //   if (!item.number) return null;
+    //   else return item;
+    // });
+    //
+    // // remove emptiness and dedupe
+    // self.contact.address = _.uniq(_.compact(self.contact.address), function(item) { return item.city + item.state + item.country; });
+    // self.contact.email = _.uniq(_.compact(self.contact.email), function(item) { return item.email; });
+    // self.contact.phone = _.uniq(_.compact(self.contact.phone), function(item) { return item.number; });
+    //
+    // // only one primary
+    // self.contact.address = thereCanOnlyBeOne(self.contact.address);
+    // self.contact.email = thereCanOnlyBeOne(self.contact.email);
+    // self.contact.phone = thereCanOnlyBeOne(self.contact.phone);
+    //
+    // // must have person and customer refs
+    // self.sources = _.reject(self.sources, function(source) { return !source.person || !source.customer; });
+    //
+    // // dedupe
+    // self.sources = _.uniq(self.sources, function(source) { return source.person.toString() + source.customer.toString(); });
+
+    cleanDoc(self);
 
     next();
 

package/package.json

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