@dhyasama/totem-models 7.57.0 → 8.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "7.57.0",
+  "version": "8.0.0",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",
@@ -23,7 +23,6 @@
     "moment": "^2.24.0",
     "mongoose-deep-populate": "^3.0.0",
     "mongoose-filter-denormalize": "^0.2.1",
-    "mongoose-post-find": "0.0.2",
     "phone-formatter": "0.0.2",
     "underscore": "~1.5.0",
     "validator": "^5.4.0"
@@ -31,7 +30,7 @@
   "devDependencies": {
     "mocha": "^5.2.0",
     "mocha-mongoose": "^1.2.0",
-    "mongoose": "~4.6.4",
+    "mongoose": "~4.5.7",
     "nock": "^7.2.2",
     "rewire": "^3.0.2",
     "should": "^11.1.1"

package/test/Account.js

@@ -7,15 +7,13 @@ var
   mongoose = require('mongoose'),
   models = require('../index')(mongoose, config),
   clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
-  Crypto = require('@dhyasama/ffvc-crypto'),
-  crypto = new Crypto({'key': config.crypto.key}),
   Account = mongoose.model('Account'),
   Organization = mongoose.model('Organization'),
   Person = mongoose.model('Person'),
   person = new Person();
 
 var accountid;
-var customer;
+var customer1, customer2;
 
 describe('Account', function() {
 
@@ -30,16 +28,31 @@ describe('Account', function() {
 
   before(function(done) {
 
-    customer = new Organization();
-    customer.name = 'Fudgesicle';
-    customer.slug = 'fudgesicle';
-    customer.website = 'yum.io';
-    customer.deleted = false;
-    customer.aliases.push('sicle');
-    customer.crunchbase.uuid = 'jkl';
-    customer.crunchbase.url = 'jkl';
+    customer1 = new Organization();
+    customer1.name = 'Fudgesicle';
+    customer1.slug = 'fudgesicle';
+    customer1.website = 'yum.io';
+    customer1.deleted = false;
+    customer1.aliases.push('sicle');
+    customer1.crunchbase.uuid = 'jkl';
+    customer1.crunchbase.url = 'jkl';
 
-    Organization.upsert(customer, 'test-user', function (err, no5) {
+    Organization.upsert(customer1, 'test-user', function (err, no5) {
+      done();
+    });
+
+  });
+
+  before(function(done) {
+
+    customer2 = new Organization();
+    customer2.name = 'Creamsicle';
+    customer2.slug = 'Creamsicle';
+    customer2.website = 'superyum.io';
+    customer2.deleted = false;
+    customer2.aliases.push('Cream');
+
+    Organization.upsert(customer2, 'test-user', function (err, no5) {
       done();
     });
 
@@ -55,48 +68,49 @@ describe('Account', function() {
       should.not.exist(err);
       should.exist(newPerson);
 
-      crypto.hash('testy', function(err, hash) {
-
-        should.not.exist(err);
-        should.exist(hash);
-
-        var account = new Account();
+      var account = new Account();
 
-        account.username = 'testy';
-        account.email = 'test@totemvc.com';
-        account.person = newPerson;
-        account.active = true;
-        account.customer = customer;
-
-        Account.upsert(account, function(err, updatedAccount) {
-          should.not.exist(err);
-          should.exist(updatedAccount);
-          accountid = updatedAccount.id;
-          done();
-        });
+      account.username = 'testy';
+      account.email = 'test@totemvc.com';
+      account.person = newPerson;
+      account.active = true;
+      account.org = customer1;
 
+      Account.upsert(account, function(err, updatedAccount) {
+        should.not.exist(err);
+        should.exist(updatedAccount);
+        accountid = updatedAccount.id;
+        done();
       });
 
     });
 
   });
 
-  it('finds by id', function(done) {
+  it('creates another account', function(done) {
 
-    Account.getById(accountid, function(err, account) {
+    var account = new Account();
+
+    account.username = 'tipsy';
+    account.email = 'tipsy@totemvc.com';
+    account.person = person;
+    account.active = true;
+    account.org = customer2;
+
+    Account.upsert(account, function(err, updatedAccount) {
       should.not.exist(err);
-      should.exist(account);
-      account.id.should.equal(accountid);
+      should.exist(updatedAccount);
       done();
     });
 
   });
 
-  it('finds by username', function(done) {
+  it('finds by id', function(done) {
 
-    Account.findByUsername('testy', function(err, account) {
+    Account.getById(accountid, function(err, account) {
       should.not.exist(err);
       should.exist(account);
+      account.id.should.equal(accountid);
       done();
     });
 
@@ -124,7 +138,7 @@ describe('Account', function() {
 
   it('lists all active accounts', function(done) {
 
-    Account.listAllAccounts(function(err, result) {
+    Account.listAllAccounts({ isWorkerProcess: false }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       done();
@@ -134,9 +148,10 @@ describe('Account', function() {
 
   it('lists accounts for customer', function(done) {
 
-    Account.getForCustomer(customer._id, function(err, result) {
+    Account.getForCustomer(customer1._id, function(err, result) {
       should.not.exist(err);
       should.exist(result);
+      result.length.should.equal(1);
       done();
     });
 

package/test/Deal.js

@@ -60,8 +60,6 @@ describe('Deal', function() {
 
       customer = result;
 
-      config.CUSTOMER_ID = customer._id.toString();
-
       return done();
 
     });
@@ -74,6 +72,7 @@ describe('Deal', function() {
     account.username = 'test-user';
     account.email = 'test@totemvc.com';
     account.person = new mongoose.Types.ObjectId();
+    account.org = customer._id;
 
     Account.upsert(account, function (err, result) {
 
@@ -102,7 +101,7 @@ describe('Deal', function() {
       }
     });
 
-    Deal.upsert(deal, account, function(err, result) {
+    Deal.upsert(deal, { account: account, CUSTOMER_ID: customer._id }, function(err, result) {
 
       should.not.exist(err);
       should.exist(result);
@@ -116,7 +115,7 @@ describe('Deal', function() {
   });
 
   it('gets a deal by id', function(done) {
-    Deal.getById(dealId, function(err, result) {
+    Deal.getById(dealId, { CUSTOMER_ID: customer._id }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result._id.toString().should.equal(dealId.toString());
@@ -126,14 +125,14 @@ describe('Deal', function() {
 
   it('adds a document to a deal', function(done) {
 
-    Deal.getById(dealId, function(err, deal) {
+    Deal.getById(dealId, { CUSTOMER_ID: customer._id }, function(err, deal) {
 
       should.not.exist(err);
       should.exist(deal);
 
       deal.documents.push(new mongoose.Types.ObjectId());
 
-      Deal.upsert(deal, account, function(err, result) {
+      Deal.upsert(deal, { account: account, CUSTOMER_ID: customer._id }, function(err, result) {
 
         should.not.exist(err);
         should.exist(result);
@@ -147,14 +146,14 @@ describe('Deal', function() {
 
   it('changes the deal stage', function(done) {
 
-    Deal.getById(dealId, function(err, deal) {
+    Deal.getById(dealId, { CUSTOMER_ID: customer._id }, function(err, deal) {
 
       should.not.exist(err);
       should.exist(deal);
 
       deal.stage = 'Pass';
 
-      Deal.upsert(deal, account, function(err, result) {
+      Deal.upsert(deal, { account: account, CUSTOMER_ID: customer._id }, function(err, result) {
 
         should.not.exist(err);
         should.exist(result);
@@ -168,7 +167,7 @@ describe('Deal', function() {
 
   it('modifies a deal by id', function (done) {
 
-    Deal.getById(dealId, function(err, deal) {
+    Deal.getById(dealId, { CUSTOMER_ID: customer._id }, function(err, deal) {
 
       should.not.exist(err);
       should.exist(deal);
@@ -182,7 +181,7 @@ describe('Deal', function() {
         }
       };
 
-      Deal.modifyById(dealId, update, function (err, result) {
+      Deal.modifyById(dealId, update, { CUSTOMER_ID: customer._id }, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.source.person.toString().should.equal(newSource.toString());
@@ -201,7 +200,7 @@ describe('Deal', function() {
       stage: 'New'
     });
 
-    Deal.upsert(d, account, function(err, result) {
+    Deal.upsert(d, { account: account, CUSTOMER_ID: customer._id }, function(err, result) {
 
       should.not.exist(err);
       should.exist(result);
@@ -212,12 +211,12 @@ describe('Deal', function() {
         stage: 'New'
       });
 
-      Deal.upsert(d, account, function(err, result) {
+      Deal.upsert(d, { account: account, CUSTOMER_ID: customer._id }, function(err, result) {
 
         should.not.exist(err);
         should.exist(result);
 
-        Deal.getForCustomer(config.CUSTOMER_ID, {}, function(err, result) {
+        Deal.getForCustomer(customer._id, {}, function(err, result) {
 
           should.not.exist(err);
           should.exist(result)
@@ -240,7 +239,7 @@ describe('Deal', function() {
 
   it('gets new deals for a customer', function(done) {
 
-    Deal.getForCustomer(config.CUSTOMER_ID, { since: timestamps[0] }, function(err, result) {
+    Deal.getForCustomer(customer._id, { since: timestamps[0] }, function(err, result) {
 
       should.not.exist(err);
       should.exist(result);
@@ -253,23 +252,8 @@ describe('Deal', function() {
 
   });
 
-  it('gets all deals', function(done) {
-
-    var temp = config.CUSTOMER_ID;
-    config.CUSTOMER_ID = 'GLOBAL_PROCESS';
-
-    Deal.getAll(function(err, result) {
-      should.not.exist(err);
-      should.exist(result)
-      result.length.should.equal(3);
-      config.CUSTOMER_ID = temp;
-      return done();
-    });
-
-  });
-
   it('deletes a deal', function(done) {
-    Deal.delete(dealId, function(err, result) {
+    Deal.delete(dealId, { CUSTOMER_ID: customer._id }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       return done();

package/test/Document.js

@@ -28,29 +28,17 @@ describe('Document', function() {
     clearDB(done);
   });
 
-  before(function (done) {
-    Person.collection.dropIndexes(function (err, result) {
-      should.not.exist(err);
-      should.exist(result);
-      result.should.equal(true);
-      return done();
-    });
-  });
-
   before(function(done) {
 
-    interaction = new Interaction({
-      calendarEventId: new mongoose.Types.ObjectId(),
-      providerEventId: 'abc123',
-      totemCustomerId: config.CUSTOMER_ID,
-      summary: 'Test'
-    });
+    org = new Organization();
+    org.name = 'Big Org';
+    org.slug = 'big-org';
 
-    Interaction.upsert(interaction, function(err, result) {
+    Organization.upsert(org, 'test', function(err, result) {
 
       should.not.exist(err);
       should.exist(result);
-      interaction = result;
+      org = result;
 
       return done();
 
@@ -58,21 +46,20 @@ describe('Document', function() {
 
   });
 
-  before(function(done) {
+  before(function (done) {
 
-    message = new Message({
-      webhook: new mongoose.Types.ObjectId(),
-      customer: config.CUSTOMER_ID,
-      type: 'email',
-      subtype: 'boards',
-      raw: { test: 'test' }
-    });
+    account = new Account();
+    account.username = 'test-user';
+    account.email = 'test@totemvc.com';
+    account.person = new mongoose.Types.ObjectId();
+    account.org = org;
 
-    Message.upsert(message, function(err, result) {
+    Account.upsert(account, function (err, result) {
 
       should.not.exist(err);
       should.exist(result);
-      message = result;
+
+      account = result;
 
       return done();
 
@@ -80,17 +67,29 @@ describe('Document', function() {
 
   });
 
+  before(function (done) {
+    Person.collection.dropIndexes(function (err, result) {
+      should.not.exist(err);
+      should.exist(result);
+      result.should.equal(true);
+      return done();
+    });
+  });
+
   before(function(done) {
 
-    org = new Organization();
-    org.name = 'Big Org';
-    org.slug = 'big-org';
+    interaction = new Interaction({
+      calendarEventId: new mongoose.Types.ObjectId(),
+      providerEventId: 'abc123',
+      totemCustomerId: account.org._id,
+      summary: 'Test'
+    });
 
-    Organization.upsert(org, 'test', function(err, result) {
+    Interaction.upsert(interaction, function(err, result) {
 
       should.not.exist(err);
       should.exist(result);
-      org = result;
+      interaction = result;
 
       return done();
 
@@ -98,19 +97,21 @@ describe('Document', function() {
 
   });
 
-  before(function (done) {
+  before(function(done) {
 
-    account = new Account();
-    account.username = 'test-user';
-    account.email = 'test@totemvc.com';
-    account.person = new mongoose.Types.ObjectId();
+    message = new Message({
+      webhook: new mongoose.Types.ObjectId(),
+      customer: account.org._id,
+      type: 'email',
+      subtype: 'boards',
+      raw: { test: 'test' }
+    });
 
-    Account.upsert(account, function (err, result) {
+    Message.upsert(message, function(err, result) {
 
       should.not.exist(err);
       should.exist(result);
-
-      account = result;
+      message = result;
 
       return done();
 
@@ -125,7 +126,7 @@ describe('Document', function() {
     deal.organization = new mongoose.Types.ObjectId();
     deal.stage = 'New';
 
-    Deal.upsert(deal, account, function(err, result) {
+    Deal.upsert(deal, { account: account, CUSTOMER_ID: account.org._id }, function(err, result) {
 
       should.not.exist(err);
       should.exist(result);
@@ -182,7 +183,7 @@ describe('Document', function() {
   it('creates a document for an interaction', function(done) {
 
     Document.createForModel({
-      customer: config.CUSTOMER_ID,
+      customer: account.org._id,
       createdBy: documentCreator,
       name: 'your_mom.doc',
       contentType: 'application/doc',
@@ -209,7 +210,7 @@ describe('Document', function() {
   it('creates a document for a message', function(done) {
 
     Document.createForModel({
-      customer: config.CUSTOMER_ID,
+      customer: account.org._id,
       createdBy: documentCreator,
       name: 'plain.txt',
       contentType: 'text/plain',
@@ -236,7 +237,7 @@ describe('Document', function() {
   it('creates a document for an organization', function(done) {
 
     Document.createForModel({
-      customer: config.CUSTOMER_ID,
+      customer: account.org._id,
       createdBy: documentCreator,
       name: 'test_file.jpg',
       contentType: 'image/jpeg',
@@ -265,7 +266,7 @@ describe('Document', function() {
   it('creates a document for a person', function(done) {
 
     Document.createForModel({
-      customer: config.CUSTOMER_ID,
+      customer: account.org._id,
       createdBy: documentCreator,
       name: 'test.pdf',
       contentType: 'application/pdf',
@@ -292,7 +293,7 @@ describe('Document', function() {
   it('creates a document for a deal', function(done) {
 
     Document.createForModel({
-      customer: config.CUSTOMER_ID,
+      customer: account.org._id,
       createdBy: documentCreator,
       name: 'test.pdf',
       contentType: 'application/pdf',
@@ -317,7 +318,7 @@ describe('Document', function() {
   });
 
   it('gets a document by id', function(done) {
-    Document.getById(documentId, function(err, result) {
+    Document.getById(documentId, { CUSTOMER_ID: account.org._id }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.name.should.equal('test_file.jpg');
@@ -327,7 +328,7 @@ describe('Document', function() {
 
   it('modifies a doc by id', function (done) {
 
-    Document.getById(documentId, function(err, doc) {
+    Document.getById(documentId, { CUSTOMER_ID: account.org._id }, function(err, doc) {
 
       should.not.exist(err);
       should.exist(doc);
@@ -341,7 +342,7 @@ describe('Document', function() {
         }
       };
 
-      Document.modifyById(documentId, update, function (err, result) {
+      Document.modifyById(documentId, update, { CUSTOMER_ID: account.org._id }, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.createdBy.toString().should.equal(newCreatedBy.toString());
@@ -353,7 +354,7 @@ describe('Document', function() {
   });
 
   it('deletes a document', function(done) {
-    Document.delete(documentId, function(err, result) {
+    Document.delete(documentId, { CUSTOMER_ID: account.org._id }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       return done();

package/test/Financials.js

@@ -88,10 +88,12 @@ describe('Financials', function() {
   });
 
   // getByOrg
+  // getByPostmarkMessageId
   // getByUUID
   // getForCampaign
   // getForCustomer
-  // getToSend
+  // getUUIDsToSendInitial
+  // getUUIDsToSendReminder
   // removeCustomerFinancials
   // upsert
 
@@ -129,9 +131,9 @@ describe('Financials', function() {
 
     });
 
-    it('removes financials for a customer', function(done) {
+    it.skip('removes financials for a customer', function(done) {
 
-      config.CUSTOMER_ID = customerA;
+      //config.CUSTOMER_ID = customerA;
 
       Financials.find({}, function(err, result) {
 

package/test/Flag.js

@@ -29,15 +29,15 @@ describe('Flag', function() {
 
   before(function(done) {
 
-    lp = new LimitedPartner();
-    lp.name = 'Big LP';
-    lp.slug = 'big-lp';
+    org = new Organization();
+    org.name = 'Big Org';
+    org.slug = 'big-org';
 
-    LimitedPartner.upsert(lp, 'test', 'lp-full', function(err, result) {
+    Organization.upsert(org, 'test', function(err, result) {
 
       should.not.exist(err);
       should.exist(result);
-      lp = result;
+      org = result;
 
       return done();
 
@@ -47,15 +47,16 @@ describe('Flag', function() {
 
   before(function(done) {
 
-    org = new Organization();
-    org.name = 'Big Org';
-    org.slug = 'big-org';
+    lp = new LimitedPartner();
+    lp.name = 'Big LP';
+    lp.slug = 'big-lp';
+    lp.customer = org;
 
-    Organization.upsert(org, 'test', function(err, result) {
+    LimitedPartner.upsert(lp, 'test', { role: 'lp-full' }, function(err, result) {
 
       should.not.exist(err);
       should.exist(result);
-      org = result;
+      lp = result;
 
       return done();
 
@@ -172,7 +173,8 @@ describe('Flag', function() {
 
     Flag.createForModel({
       createdBy: flagCreator,
-      text: 'Best flag ever!'
+      text: 'Best flag ever!',
+      customer: org
     }, Organization, org._id, function(err, result) {
 
       should.not.exist(err);
@@ -193,7 +195,8 @@ describe('Flag', function() {
 
     Flag.createForModel({
       createdBy: flagCreator,
-      text: 'Best flag ever!'
+      text: 'Best flag ever!',
+      customer: org
     }, LimitedPartner, lp._id, function(err, result) {
 
       should.not.exist(err);
@@ -212,7 +215,8 @@ describe('Flag', function() {
 
     Flag.createForModel({
       createdBy: flagCreator,
-      text: 'Best flag ever!'
+      text: 'Best flag ever!',
+      customer: org
     }, Person, person._id, function(err, result) {
 
       should.not.exist(err);
@@ -264,7 +268,7 @@ describe('Flag', function() {
   });
 
   it('deletes a flag', function(done) {
-    Flag.delete(flagId, function(err, result) {
+    Flag.delete(flagId, org._id, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       return done();

package/test/Interaction.js

@@ -82,9 +82,7 @@ describe('Interaction', function() {
 
   it('gets interactions for a person', function(done) {
 
-    config.CUSTOMER_ID = totemCustomerId1;
-
-    Interaction.getForPeople([externalAttendee1], { before: moment().add(1, 'hour').toISOString()}, function(err, result) {
+    Interaction.getForPeople([externalAttendee1], { CUSTOMER_ID: totemCustomerId1, before: moment().add(1, 'hour').toISOString()}, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.length.should.equal(1);
@@ -94,36 +92,8 @@ describe('Interaction', function() {
 
   });
 
-  it('tries to get interactions for a person as an admin process', function(done) {
-
-    config.CUSTOMER_ID = 'GLOBAL_PROCESS';
-
-    Interaction.getForPeople([externalAttendee1], { before: moment().add(1, 'hour').toISOString()}, function(err, result) {
-      should.exist(err);
-      should.not.exist(result);
-      done();
-    });
-
-  });
-
-  it('gets interactions for a person as an admin process', function(done) {
-
-    config.CUSTOMER_ID = totemCustomerId2;
-
-    Interaction.getForPeople([externalAttendee2], { before: moment().add(1, 'hour').toISOString()}, function(err, result) {
-      should.not.exist(err);
-      should.exist(result);
-      result.length.should.equal(1);
-      result[0].summary.should.equal('test 2');
-      done();
-    });
-
-  });
-
   it('gets interactions for a customer', function(done) {
 
-    config.CUSTOMER_ID = totemCustomerId2;
-
     var interaction = new Interaction({
       calendarEventId: new mongoose.Types.ObjectId(),
       providerEventId: 'abc124',