@dhyasama/totem-models 3.14.0 → 4.1.0

package/lib/Organization.js

@@ -213,125 +213,6 @@ 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'));
@@ -940,7 +821,7 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Organization.statics.getAcquistions = function getAcquistions(orgid, cb) {
+  Organization.statics.getAcquisitions = function getAcquisitions(orgid, cb) {
     // todo - logic to check public and private
     var self = this;
     self
@@ -1407,15 +1288,16 @@ module.exports = function(mongoose, config) {
 
   Organization.statics.modify = function(filter, update, cb) {
 
+    // VERY IMPORTANT NOTE
+    // findOneAndUpdate does not trigger pre-save hook so that code will not run here
+    // at this time, the only known and approved use of this method is for adding and removing roles in totem web
+
     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);
 
   };
@@ -1432,6 +1314,125 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
+    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);
+
+    };
+
     cleanDoc(self);
 
     return next();

package/lib/Person.js

@@ -42,7 +42,7 @@ module.exports = function(mongoose, config) {
 
       email: [{
         type: { type: String, enum: ['personal', 'work', 'assistant', 'other'] },
-        email: { type: String, default: '' },
+        email: { type: String, default: '', trim: true, lowercase: true },
         primary: { type: Boolean, default: false },
         inactive: { type: Boolean, default: false }
       }],
@@ -137,98 +137,6 @@ 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;
   });
@@ -1073,20 +981,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Person.statics.modify = function(personId, update, cb) {
-
-    if (!cb) throw new Error('cb  is required');
-    if (!personId) { return cb(new Error('personId is required'), null); }
-    if (!update) { return cb(new Error('update is required'), null); }
-
-    var self = this;
-
-    cleanDoc(update['$set']);
-
-    self.findOneAndUpdate({ _id: personId }, update, { upsert: false, new: true }, cb);
-
-  };
-
   Person.statics.addFlag = function(personId, creatorPersonId, text, cb) {
 
     Flag.createForModel({
@@ -1180,57 +1074,95 @@ 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 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(); }));
+
+      }
+
+    };
 
     cleanDoc(self);
 

package/package.json

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

package/test/Person.js

@@ -158,7 +158,7 @@ describe('Person', function() {
       Person.upsert(person3, 'test-user', function(err, person3) {
         Person.upsert(person4, 'test-user', function(err, person4) {
           Person.upsert(person5, 'test-user', function(err, person5) {
-            done();
+             done();
           });
         });
       });
@@ -581,25 +581,6 @@ describe('Person', function() {
 
   });
 
-  it('modifies a person', function(done) {
-
-    var update = {
-      $set: {
-        'title': 'Chief Testing Officer',
-        'entered.by': 'Testy McTester',
-        'entered.on': new Date()
-      }
-    };
-
-    Person.modify(person._id, update, function(err, org) {
-      should.not.exist(err);
-      should.exist(org);
-      org.title.should.equal('Chief Testing Officer');
-      done();
-    });
-
-  });
-
   it('lists all people', function(done) {
 
     Person.listAllPeople(function(err, people) {