@dhyasama/totem-models 6.21.9 → 6.22.0

package/lib/Organization.js

@@ -402,6 +402,129 @@ module.exports = function(mongoose, config) {
 
   };
 
+  var prepForSave = function prepForSave(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) {
+
+      if (!obj || !obj.people) return;
+
+      // 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) {
+
+      if (!obj) return;
+
+      // 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);
+
+  };
+
 
 
   ///////////////////////////////////////////////////////////////////////////////////////
@@ -870,13 +993,8 @@ module.exports = function(mongoose, config) {
 
   Organization.methods.addDeal = function(deal) {
 
-    console.log('Organization.methods.addDeal');
-    console.log(deal);
-
     var self = this;
 
-    console.log(self.deals);
-
     // Validate inputs
     if (!deal) throw new Error('deal is required');
 
@@ -1453,6 +1571,49 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Organization.statics.getByIdAsGlobal = function getByIdAsGlobal(id, options, cb) {
+
+    var self = this;
+
+    // Save original id so we can put it back when we're done
+    var orginalCustomerId = config.CUSTOMER_ID;
+
+    // Switch to global
+    config.CUSTOMER_ID = "GLOBAL_PROCESS";
+    console.log('config.CUSTOMER_ID pre query', config.CUSTOMER_ID);
+
+    try {
+
+      self.findById(id, function(err, result) {
+
+        // Put original id back
+        config.CUSTOMER_ID = orginalCustomerId;
+        console.log('config.CUSTOMER_ID post query', config.CUSTOMER_ID);
+
+        if (err) { return cb(err, null); }
+
+        return cb(null, result);
+
+      });
+
+
+    }
+    catch(err) {
+
+      // Put original id back
+      config.CUSTOMER_ID = orginalCustomerId;
+      console.log('config.CUSTOMER_ID post query', config.CUSTOMER_ID);
+
+      console.log('ERROR WITH ORGANIZATION.GETBYIDGLOBAL');
+      console.log('config.CUSTOMER_ID', config.CUSTOMER_ID);
+      console.log(err);
+
+      return cb(err, null);
+
+    }
+
+  };
+
   Organization.statics.getByIdRaw = function getByIdRaw(id, options, cb) {
 
     // directly from mongo driver to avoid mongoose middlewares
@@ -1465,7 +1626,6 @@ module.exports = function(mongoose, config) {
 
       if (err) return cb(err, null);
       else if (!result) return cb(null, null);
-      else if (result.people.length == 0) return cb(null, result);
 
       // hydrate so we can use the populate method to get people
       // note the hydrated version is not returned
@@ -1934,128 +2094,7 @@ module.exports = function(mongoose, config) {
 
   Organization.pre('save', function(next) {
 
-    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);
+    prepForSave(this);
 
     return next();
 

package/package.json

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

package/test/Organization.js

@@ -23,7 +23,7 @@ var account;
 var customer1, customer2;
 var deal;
 
-describe.only('Organization', function() {
+describe('Organization', function() {
 
   var org1, org2, org3, org4, org5;
   var mergeId = new mongoose.Types.ObjectId();
@@ -78,6 +78,10 @@ describe.only('Organization', function() {
     org2.social.facebook = 'https://facebook.com/abc';
     org2.social.linkedin = 'http://www.linkedin.com/in/abc';
     org2.social.twitter = 'twitter.com/abc';
+    org2.iLevel.push({
+      customer: new mongoose.Types.ObjectId(),
+      url: 'https://ilevel.com/test'
+    });
 
     org3 = new Organization();
     org3.name = 'Fudge 3';
@@ -675,6 +679,17 @@ describe.only('Organization', function() {
 
     });
 
+    it('finds an org as global', function (done) {
+
+      Organization.getByIdAsGlobal(org2._id, {}, function (err, result) {
+        should.not.exist(err);
+        should.exist(result);
+        result.iLevel.length.should.equal(1);
+        done();
+      });
+
+    });
+
     it('gets an org by id', function (done) {
 
       Organization.getById(org1.id, {role: 'lp-full'}, function (err, org) {
@@ -710,7 +725,25 @@ describe.only('Organization', function() {
         }
       };
 
-      Organization.modify(org1._id, update, function (err, org) {
+      Organization.modify({ _id: org1._id }, update, function (err, org) {
+        should.not.exist(err);
+        should.exist(org);
+        org.name.should.equal('I updated my name!');
+        done();
+      });
+
+    });
+
+    it('modifies a company by id', function (done) {
+
+      var update = {
+        $set: {
+          'entered.by': 'Testy McTester 2',
+          'entered.on': new Date()
+        }
+      };
+
+      Organization.modifyById(org1._id, update, function (err, org) {
         should.not.exist(err);
         should.exist(org);
         org.name.should.equal('I updated my name!');