@dhyasama/totem-models 1.22.1 → 1.22.3

package/lib/List.js

@@ -127,8 +127,12 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
+    // DANGER
+    // Note this is not filtered by customer!
+    // It is used for merging which spans customers
+
     self
-      .find({ 'customer': config.CUSTOMER_ID, limitedPartners: lpId })
+      .find({ limitedPartners: lpId })
       .populate('limitedPartners', 'name logoUrl')
       .populate('organizations', 'name logoUrl')
       .populate('people', 'name title avatarUrl')
@@ -141,8 +145,12 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
+    // DANGER
+    // Note this is not filtered by customer!
+    // It is used for merging which spans customers
+
     self
-      .find({ 'customer': config.CUSTOMER_ID, organizations: orgId })
+      .find({ organizations: orgId })
       .populate('limitedPartners', 'name logoUrl')
       .populate('organizations', 'name logoUrl')
       .populate('people', 'name title avatarUrl')
@@ -155,8 +163,12 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
+    // DANGER
+    // Note this is not filtered by customer!
+    // It is used for merging which spans customers
+
     self
-      .find({ 'customer': config.CUSTOMER_ID, people: personId })
+      .find({ people: personId })
       .populate('limitedPartners', 'name logoUrl')
       .populate('organizations', 'name logoUrl')
       .populate('people', 'name title avatarUrl')

package/lib/Organization.js

@@ -941,6 +941,16 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Organization.statics.listCustomers = function getById(cb) {
+
+    var self = this;
+
+    self
+      .find({$where:'this.customer && this.customer.totemUrl && this.customer.totemUrl.length >=1'})
+      .exec(cb);
+
+  };
+
   Organization.statics.listPage = function (skip, cb) {
 
     this
@@ -1152,6 +1162,49 @@ 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;
+
+    };
+
+    // 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);
+
     // Format website
     if (self.website) self.website = utils.getDomain(self.website);
 

package/lib/Person.js

@@ -1112,9 +1112,52 @@ 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);
+
     // Reset counters so we can calc from scratch
     _.each(self.sources, function(source) {
       source.interactions.calendar = 0;

package/package.json

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

package/test/Organization.js

@@ -3,6 +3,7 @@
 var
 
   should = require("should"),
+  _ = require('underscore'),
   config = require('./config')['test'],
   mongoose = require('mongoose'),
   clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
@@ -800,6 +801,110 @@ describe('Organization', function() {
 
   });
 
+  it('cleans contact info', function(done) {
+
+    var o = new Organization();
+    o.name = 'ORG';
+    o.slug = 'org';
+    o.website = 'org.org';
+
+    o.contact.address = [];
+    o.contact.address.push({
+      city: 'Testville',
+      state: 'Test',
+      country: 'TSA',
+      type: 'work',
+      primary: true
+    });
+    o.contact.address.push({
+      city: 'Testville',
+      state: 'Test',
+      country: 'TSA',
+      type: 'other',
+      primary: true
+    });
+    o.contact.address.push({
+      city: 'Bangor',
+      state: 'ME',
+      country: 'USA',
+      type: 'other',
+      primary: true
+    });
+    o.contact.address.push({
+      city: '',
+      state: '',
+      country: '',
+      type: 'other',
+      primary: true
+    });
+
+    o.contact.email = [];
+    o.contact.email.push({
+      email: 'test@org.org',
+      type: 'work',
+      primary: true
+    });
+    o.contact.email.push({
+      email: 'test@org.org',
+      type: 'other',
+      primary: true
+    });
+    o.contact.email.push({
+      email: 'admin@org.org',
+      type: 'other',
+      primary: true
+    });
+    o.contact.email.push({
+      email: '',
+      type: 'test',
+      primary: false
+    });
+
+    o.contact.phone = [];
+    o.contact.phone.push({
+      number: '2075551212',
+      type: 'work',
+      primary: true
+    });
+    o.contact.phone.push({
+      number: '2075551212',
+      type: 'other',
+      primary: true
+    });
+    o.contact.phone.push({
+      number: null,
+      type: null,
+      primary: null
+    });
+    o.contact.phone.push({
+      number: '3455551212',
+      type: 'other',
+      primary: true
+    });
+
+    Organization.upsert(o, 'test-user', function(err, org) {
+
+      should.not.exist(err);
+      should.exist(org);
+
+      org.contact.address.length.should.equal(2);
+      org.contact.email.length.should.equal(2);
+      org.contact.phone.length.should.equal(2);
+
+      var primaryAddresses = _.filter(org.contact.address, function(item) { return item.primary; });
+      primaryAddresses.length.should.be.lessThan(2);
+
+      var primaryEmails = _.filter(org.contact.email, function(item) { return item.primary; });
+      primaryEmails.length.should.be.lessThan(2);
+
+      var primaryPhones = _.filter(org.contact.phone, function(item) { return item.primary; });
+      primaryPhones.length.should.be.lessThan(2);
+
+      done();
+
+    });
+  });
+
   describe('State', function() {
 
     it('gets ipo info', function(done) {

package/test/Person.js

@@ -854,6 +854,109 @@ describe('Person', function() {
 
   });
 
+  it('cleans contact info', function(done) {
+
+    var p = new Person();
+    p.name = { first: 'Testy', last: 'Tester' };
+    p.slug = 'testy-tester';
+
+    p.contact.address = [];
+    p.contact.address.push({
+      city: 'Testville',
+      state: 'Test',
+      country: 'TSA',
+      type: 'work',
+      primary: true
+    });
+    p.contact.address.push({
+      city: 'Testville',
+      state: 'Test',
+      country: 'TSA',
+      type: 'other',
+      primary: true
+    });
+    p.contact.address.push({
+      city: 'Bangor',
+      state: 'ME',
+      country: 'USA',
+      type: 'other',
+      primary: true
+    });
+    p.contact.address.push({
+      city: '',
+      state: '',
+      country: '',
+      type: 'other',
+      primary: true
+    });
+
+    p.contact.email = [];
+    p.contact.email.push({
+      email: 'test@org.org',
+      type: 'work',
+      primary: true
+    });
+    p.contact.email.push({
+      email: 'test@org.org',
+      type: 'other',
+      primary: true
+    });
+    p.contact.email.push({
+      email: 'admin@org.org',
+      type: 'other',
+      primary: true
+    });
+    p.contact.email.push({
+      email: '',
+      type: 'other',
+      primary: false
+    });
+
+    p.contact.phone = [];
+    p.contact.phone.push({
+      number: '2075551212',
+      type: 'work',
+      primary: true
+    });
+    p.contact.phone.push({
+      number: '2075551212',
+      type: 'other',
+      primary: true
+    });
+    p.contact.phone.push({
+      number: null,
+      type: 'other',
+      primary: null
+    });
+    p.contact.phone.push({
+      number: '3455551212',
+      type: 'other',
+      primary: true
+    });
+
+    Person.upsert(p, 'test-user', function(err, person) {
+
+      should.not.exist(err);
+      should.exist(person);
+
+      person.contact.address.length.should.equal(2);
+      person.contact.email.length.should.equal(2);
+      person.contact.phone.length.should.equal(2);
+
+      var primaryAddresses = _.filter(person.contact.address, function(item) { return item.primary; });
+      primaryAddresses.length.should.be.lessThan(2);
+
+      var primaryEmails = _.filter(person.contact.email, function(item) { return item.primary; });
+      primaryEmails.length.should.be.lessThan(2);
+
+      var primaryPhones = _.filter(person.contact.phone, function(item) { return item.primary; });
+      primaryPhones.length.should.be.lessThan(2);
+
+      done();
+
+    });
+  });
+
   // describe('sources', function() {
   //
   //   // can only add source if global process