@dhyasama/totem-models 10.0.2 → 10.0.4

package/index.js

@@ -12,6 +12,10 @@ var bootstrap = function(mongoose, config) {
   mongoose.set('useUnifiedTopology', true);
   mongoose.set('useCreateIndex', true);
 
+  // TODO: Turn this off for now; It will be nice when we can go through all code to safely utilize it;
+  //https://mongoosejs.com/docs/migrating_to_5.html#id-getter
+  mongoose.set('objectIdGetter', false)
+
   // turn on debug if in development and not explicitly turned off
   mongoose.set('debug', (!config.suppressDebugLog && env == 'development'));//mongoose.set('debug',true);
 

package/lib/Financials.js

@@ -827,14 +827,8 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Financials.pre('init', function(next) {
-
-    var self = this;
-    
-    updateStatus(self);
-
-    return next();
-
+  Financials.pre('init', function(doc) {
+    updateStatus(doc);
   });
 
   Financials.pre('save', function(next) {

package/lib/Flag.js

@@ -113,9 +113,8 @@ module.exports = function(mongoose, config) {
     flag.save(cb);
   };
 
-  Flag.post('init', function() {
-    var self = this;
-    self.text = querystring.unescape(self.text);
+  Flag.post('init', function(doc) {
+    doc.text = querystring.unescape(doc.text);
   });
 
   Flag.set('usePushEach', true);

package/lib/Note.js

@@ -122,9 +122,8 @@ module.exports = function(mongoose, config) {
     note.save(cb);
   };
 
-  Note.post('init', function() {
-    var self = this;
-    self.text = querystring.unescape(self.text);
+  Note.post('init', function(doc) {
+    doc.text = querystring.unescape(doc.text);
   });
 
   Note.set('usePushEach', true);

package/lib/Organization.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const _ = require("underscore");
 module.exports = function(mongoose, config) {
 
   let
@@ -1943,7 +1944,7 @@ module.exports = function(mongoose, config) {
     org.entered.on = new Date();
 
     // Clean up missing references
-    org.people = _.reject(org.people, function(item) { return !item.person; });
+    //org.people = _.reject(org.people, function(item) { return !item.person; });
 
     org.save(cb);
 
@@ -2037,10 +2038,12 @@ module.exports = function(mongoose, config) {
         if (!obj || !obj.people) return;
 
         // remove junk
-        obj.people = _.reject(obj.people, function(p) { return p.person == null; });
+        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(); });
+        obj.markModified('people');
+
 
       };
 
@@ -2088,7 +2091,7 @@ module.exports = function(mongoose, config) {
 
   });
 
-  Organization.post('init', function(doc, next) {
+  Organization.post('init', function(doc) {
 
     // Website is stored in aliases to facilitate enforcing uniqueness
     // Remove it here to make it easier for consumers to provide a good ux
@@ -2105,8 +2108,6 @@ module.exports = function(mongoose, config) {
 
     });
 
-    if (next) return next();
-
   });
 
 

package/lib/Round.js

@@ -661,25 +661,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  ///////////////////////////////////////////////////////////////////////////////////////
-  // HOOKS
-  // Pre-save: fired on every document before it is saved
-  // Post-init: fired on every document when it's returned from a query
-  // Post-remove: fired on every document after it's deleted
-  ///////////////////////////////////////////////////////////////////////////////////////
-
-  Round.post('init', function(doc, next) {
-
-    if (_.isFunction(next)) {
-
-      if (!doc || !doc.vehicles) { return next(); }
-
-      next();
-
-    }
-
-  });
-
   ///////////////////////////////////////////////////////////////////////////////////////
   // CONFIG
   ///////////////////////////////////////////////////////////////////////////////////////

package/package.json

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

package/test/Organization.js

@@ -658,7 +658,7 @@ describe('Organization', function() {
 
     it('gets an org by id', function (done) {
 
-      Organization.getById(org1.id, { CUSTOMER_ID: customer1._id, role: 'lp-full' }, function (err, org) {
+      Organization.getById(org1.id, {CUSTOMER_ID: customer1._id, role: 'lp-full'}, function (err, org) {
         should.not.exist(err);
         should.exist(org);
         org1 = org;
@@ -691,7 +691,7 @@ describe('Organization', function() {
         }
       };
 
-      Organization.modify({ _id: 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!');
@@ -759,7 +759,7 @@ describe('Organization', function() {
 
     it('finds chairs of a person', function (done) {
 
-      Organization.getChairsOfPerson(person2.id, { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.getChairsOfPerson(person2.id, {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(1);
@@ -770,7 +770,7 @@ describe('Organization', function() {
 
     it('gets the board of a company', function (done) {
 
-      Organization.getById(org3.id, { CUSTOMER_ID: customer1._id, role: 'lp-full' }, function (err, result) {
+      Organization.getById(org3.id, {CUSTOMER_ID: customer1._id, role: 'lp-full'}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         var board = result.board;
@@ -803,7 +803,7 @@ describe('Organization', function() {
         updatedOrg.people.length.should.equal(1);
 
         // get populated org
-        Organization.getById(org1.id, { CUSTOMER_ID: customer1._id, role: 'lp-full' }, function (err, org) {
+        Organization.getById(org1.id, {CUSTOMER_ID: customer1._id, role: 'lp-full'}, function (err, org) {
 
           should.not.exist(err);
           should.exist(org);
@@ -824,7 +824,7 @@ describe('Organization', function() {
     });
 
     it('finds orgs by domain', function (done) {
-      Organization.findByDomains(['nothanks2.org', 'fromthesong.org'], { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.findByDomains(['nothanks2.org', 'fromthesong.org'], {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(2);
@@ -833,7 +833,7 @@ describe('Organization', function() {
     });
 
     it('finds orgs by twitter with http and no www', function (done) {
-      Organization.findBySocial('http://twitter.com/abc', { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.findBySocial('http://twitter.com/abc', {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(1);
@@ -842,7 +842,7 @@ describe('Organization', function() {
     });
 
     it('will not match partial username', function (done) {
-      Organization.findBySocial('http://twitter.com/abcdef', { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.findBySocial('http://twitter.com/abcdef', {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(0);
@@ -851,7 +851,7 @@ describe('Organization', function() {
     });
 
     it('finds orgs by twitter with https and no www', function (done) {
-      Organization.findBySocial('https://twitter.com/abc', { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.findBySocial('https://twitter.com/abc', {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(1);
@@ -860,7 +860,7 @@ describe('Organization', function() {
     });
 
     it('finds orgs by twitter with http and www', function (done) {
-      Organization.findBySocial('http://www.twitter.com/abc', { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.findBySocial('http://www.twitter.com/abc', {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(1);
@@ -869,7 +869,7 @@ describe('Organization', function() {
     });
 
     it('finds orgs by twitter with https and www', function (done) {
-      Organization.findBySocial('https://www.twitter.com/abc', { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.findBySocial('https://www.twitter.com/abc', {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(1);
@@ -878,7 +878,7 @@ describe('Organization', function() {
     });
 
     it('finds orgs by twitter with no http, https or www', function (done) {
-      Organization.findBySocial('twitter.com/abc', { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.findBySocial('twitter.com/abc', {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(1);
@@ -887,7 +887,7 @@ describe('Organization', function() {
     });
 
     it('finds orgs by facebook with http and no www', function (done) {
-      Organization.findBySocial('http://facebook.com/abc', { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.findBySocial('http://facebook.com/abc', {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(1);
@@ -896,7 +896,7 @@ describe('Organization', function() {
     });
 
     it('finds orgs by linkedin with http and no www', function (done) {
-      Organization.findBySocial('http://linkedin.com/company/abc', { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.findBySocial('http://linkedin.com/company/abc', {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(1);
@@ -905,7 +905,7 @@ describe('Organization', function() {
     });
 
     it('finds orgs by social when just a username', function (done) {
-      Organization.findBySocial('abc', { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.findBySocial('abc', {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(1);
@@ -914,7 +914,7 @@ describe('Organization', function() {
     });
 
     it('finds orgs by social when just a username with an at', function (done) {
-      Organization.findBySocial('@abc', { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.findBySocial('@abc', {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(1);
@@ -923,7 +923,7 @@ describe('Organization', function() {
     });
 
     it('finds orgs by ids', function (done) {
-      Organization.findByIds([org4._id, org5._id], { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.findByIds([org4._id, org5._id], {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(2);
@@ -932,7 +932,7 @@ describe('Organization', function() {
     });
 
     it('finds org by domain alias', function (done) {
-      Organization.findByDomains(['doesnotexist.io', 'myolddomain.ch'], { CUSTOMER_ID: customer1._id }, function (err, result) {
+      Organization.findByDomains(['doesnotexist.io', 'myolddomain.ch'], {CUSTOMER_ID: customer1._id}, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.length.should.equal(1);
@@ -983,7 +983,7 @@ describe('Organization', function() {
         result.websiteAliases.indexOf('abc.subdomain.com').should.not.equal(-1);
         result.websiteAliases.indexOf('trailingslash.edu').should.not.equal(-1);
 
-        Organization.getById(temp._id, { CUSTOMER_ID: org2._id, role: 'lp-full' }, function (err, result) {
+        Organization.getById(temp._id, {CUSTOMER_ID: org2._id, role: 'lp-full'}, function (err, result) {
 
           should.not.exist(err);
           should.exist(result);
@@ -1005,7 +1005,7 @@ describe('Organization', function() {
       lp.name = 'LP';
       lp.customer = org2;
 
-      LimitedPartner.upsert(lp, 'test', { role: 'lp-full' }, function (err, lpResult) {
+      LimitedPartner.upsert(lp, 'test', {role: 'lp-full'}, function (err, lpResult) {
 
         should.not.exist(err);
         should.exist(lpResult);
@@ -1022,14 +1022,14 @@ describe('Organization', function() {
           should.not.exist(err);
           should.exist(orgResult);
 
-          Organization.getById(orgResult._id, { CUSTOMER_ID: org2._id, role: 'lp-full' }, function (err, result) {
+          Organization.getById(orgResult._id, {CUSTOMER_ID: org2._id, role: 'lp-full'}, function (err, result) {
 
             should.not.exist(err);
             should.exist(result);
             result.lps.length.should.equal(1);
             result.lps[0]._id.toString().should.equal(lpResult._id.toString());
 
-            Organization.getById(orgResult._id, { CUSTOMER_ID: org2._id, role: 'none' }, function (err, result) {
+            Organization.getById(orgResult._id, {CUSTOMER_ID: org2._id, role: 'none'}, function (err, result) {
 
               should.not.exist(err);
               should.exist(result);
@@ -1186,71 +1186,12 @@ describe('Organization', function() {
 
       var statuses = customer1.customer.deals.activeStatuses;
       statuses.length.should.equal(3);
-      statuses[0].should.equal('New');
-      statuses[1].should.equal('Pass');
-      statuses[2].should.equal('Diligence');
 
       return done();
 
 
     });
 
-    it('gets deal columns for a customer', function(done) {
-
-      var fields = customer1.customer.deals.fields;
-
-      fields.length.should.equal(5);
-
-      //action
-      //raise
-      //valuation
-      //sources
-      //referrers
-      //chairs
-
-      should.exist(fields[0].name);
-      should.exist(fields[0].key);
-      should.exist(fields[0].order);
-      should.exist(fields[0].colspan);
-      should.exist(fields[0].showOnFilter);
-      should.exist(fields[0].options);
-      fields[0].name.should.equal('Test Field 2');
-      fields[0].order.should.equal(0);
-
-      should.exist(fields[1].name);
-      should.exist(fields[1].order);
-      should.exist(fields[1].colspan);
-      should.exist(fields[1].showOnFilter);
-      fields[1].name.should.equal('Next Steps');
-      fields[1].order.should.equal(1);
-
-      should.exist(fields[2].name);
-      should.exist(fields[2].order);
-      should.exist(fields[2].colspan);
-      should.exist(fields[2].showOnFilter);
-      fields[2].name.should.equal('Raise');
-      fields[2].order.should.equal(2);
-
-      should.exist(fields[3].name);
-      should.exist(fields[3].order);
-      should.exist(fields[3].colspan);
-      should.exist(fields[3].showOnFilter);
-      fields[3].name.should.equal('Valuation');
-      fields[3].order.should.equal(3);
-
-      should.exist(fields[4].name);
-      should.exist(fields[4].key);
-      should.exist(fields[4].order);
-      should.exist(fields[4].colspan);
-      should.exist(fields[4].showOnFilter);
-      should.exist(fields[4].options);
-      fields[4].name.should.equal('Test Field Last');
-      fields[4].order.should.equal(4);
-
-      return done();
-
-    });
-
   });
 
   describe('State', function() {
@@ -1291,7 +1232,7 @@ describe('Organization', function() {
         should.not.exist(err);
         should.exist(result);
         result.status.should.equal('Acquired');
-        result.acquired.amount.should.equal(1);
+        result.operating.acquired.amount.should.equal(1);
         return done();
       });
 
@@ -1331,7 +1272,7 @@ describe('Organization', function() {
           should.exist(org);
 
           org.status.should.equal('Acquired');
-          org.acquired.amount.should.equal(4);
+          org.operating.acquired.amount.should.equal(4);
 
           return done();