@dhyasama/totem-models 7.57.0 → 8.0.0

package/test/List.js

@@ -39,15 +39,15 @@ describe('List', 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();
 
@@ -57,15 +57,16 @@ describe('List', 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();
 
@@ -118,7 +119,7 @@ describe('List', function() {
 
   it('creates an empty list', function(done) {
 
-    List.createList('My Awesome List', {}, creator, function(err, result) {
+    List.createList('My Awesome List', {}, creator, { CUSTOMER_ID: org._id }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       myAwesomeList = result;
@@ -130,10 +131,7 @@ describe('List', function() {
 
   it('creates an empty list for another customer', function(done) {
 
-    var previousCustomerId = config.CUSTOMER_ID;
-    config.CUSTOMER_ID = secondCustomerId;
-
-    List.createList('All the News', {}, creator, function(err, result) {
+    List.createList('All the News', {}, creator, { CUSTOMER_ID: secondCustomerId }, function(err, result) {
 
       should.not.exist(err);
       should.exist(result);
@@ -141,9 +139,6 @@ describe('List', function() {
       secondCustomerList = result;
       secondCustomerList.toJSON().toString().length.should.be.above(0);
 
-      // Restore original value
-      config.CUSTOMER_ID = previousCustomerId;
-
       return done();
 
     });
@@ -151,7 +146,7 @@ describe('List', function() {
   });
 
   it('adds an lp', function(done) {
-    List.addItem(myAwesomeList.id, lp.id, 'limitedPartners', function(err, result) {
+    List.addItem(myAwesomeList.id, lp.id, 'limitedPartners', { CUSTOMER_ID: org._id }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.limitedPartners.length.should.equal(1);
@@ -162,7 +157,7 @@ describe('List', function() {
   });
 
   it('adds an organization', function(done) {
-    List.addItem(myAwesomeList.id, org.id, 'organizations', function(err, result) {
+    List.addItem(myAwesomeList.id, org.id, 'organizations', { CUSTOMER_ID: org._id }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.organizations.length.should.equal(1);
@@ -173,7 +168,7 @@ describe('List', function() {
   });
 
   it('adds a person', function(done) {
-    List.addItem(myAwesomeList.id, person.id, 'people', function(err, result) {
+    List.addItem(myAwesomeList.id, person.id, 'people', { CUSTOMER_ID: org._id }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.people.length.should.equal(1);
@@ -184,7 +179,7 @@ describe('List', function() {
   });
 
   it('adds a person again and dedupes', function(done) {
-    List.addItem(myAwesomeList.id, person.id, 'people', function(err, result) {
+    List.addItem(myAwesomeList.id, person.id, 'people', { CUSTOMER_ID: org._id }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.people.length.should.equal(1);
@@ -195,7 +190,7 @@ describe('List', function() {
   });
 
   it('removes an lp', function(done) {
-    List.removeItem(myAwesomeList.id, myAwesomeList.limitedPartners[0], 'limitedPartners', function(err, result) {
+    List.removeItem(myAwesomeList.id, myAwesomeList.limitedPartners[0], 'limitedPartners', { CUSTOMER_ID: org._id }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.limitedPartners.length.should.equal(0);
@@ -206,7 +201,7 @@ describe('List', function() {
   });
 
   it('gets a list by id', function(done) {
-    List.getById(myAwesomeList.id, function(err, result) {
+    List.getById(myAwesomeList.id, { CUSTOMER_ID: org._id }, function(err, result) {
 
       should.not.exist(err);
       should.exist(result);
@@ -226,7 +221,7 @@ describe('List', function() {
   });
 
   it('tries to get a list belonging to a different customer', function(done) {
-    List.getById(secondCustomerList.id, function(err, result) {
+    List.getById(secondCustomerList.id, { CUSTOMER_ID: org._id }, function(err, result) {
       should.not.exist(err);
       should.not.exist(result);
       return done();
@@ -234,7 +229,7 @@ describe('List', function() {
   });
 
   it('aggregates items in a list', function(done) {
-    List.getById(myAwesomeList.id, function(err, result) {
+    List.getById(myAwesomeList.id, { CUSTOMER_ID: org._id }, function(err, result) {
 
       should.not.exist(err);
       should.exist(result);
@@ -253,7 +248,7 @@ describe('List', function() {
   });
 
   it('gets all lists for a customer', function(done) {
-    List.getLists(function(err, result) {
+    List.getLists({ CUSTOMER_ID: org._id }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.length.should.equal(1);
@@ -264,7 +259,7 @@ describe('List', function() {
 
   it('modifies a list by id', function (done) {
 
-    List.getById(myAwesomeList.id, function(err, list) {
+    List.getById(myAwesomeList.id, { CUSTOMER_ID: org._id },  function(err, list) {
 
       should.not.exist(err);
       should.exist(list);
@@ -299,7 +294,7 @@ describe('List', function() {
 
   it('deletes a list', function(done) {
 
-    List.remove(myAwesomeList.id, function(err, result) {
+    List.remove(myAwesomeList.id, { CUSTOMER_ID: org._id }, function(err, result) {
 
       should.not.exist(err);
       should.exist(result);

package/test/Message.js

@@ -86,10 +86,8 @@ describe('Message', function() {
 
   it('creates a document for a message', function(done) {
 
-    config.CUSTOMER_ID = totemCustomerId1;
-
     Document.createForModel({
-      customer: config.CUSTOMER_ID,
+      customer: totemCustomerId1,
       createdBy: new mongoose.Types.ObjectId(),
       name: 'plain.txt',
       contentType: 'text/plain',
@@ -115,11 +113,10 @@ describe('Message', function() {
 
   it('creates a note for a message', function(done) {
 
-    config.CUSTOMER_ID = totemCustomerId1;
-
     Note.createForModel({
       createdBy: new mongoose.Types.ObjectId(),
-      text: 'Best note ever!'
+      text: 'Best note ever!',
+      customer: totemCustomerId1
     }, Message, messageOne._id, function(err, result) {
 
       should.not.exist(err);
@@ -136,9 +133,7 @@ describe('Message', function() {
 
   it('gets a message by id', function(done) {
 
-    config.CUSTOMER_ID = totemCustomerId1;
-
-    Message.getById(messageOne.id, function(err, result) {
+    Message.getById(messageOne.id, { CUSTOMER_ID: totemCustomerId1 }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.subject.should.equal('Message one');
@@ -151,9 +146,7 @@ describe('Message', function() {
 
   it('gets messages for a person', function(done) {
 
-    config.CUSTOMER_ID = totemCustomerId1;
-
-    Message.getForPeople([externalAttendee1], { before: moment().add(1, 'hour').toISOString()}, function(err, result) {
+    Message.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);
@@ -165,9 +158,7 @@ describe('Message', function() {
 
   it('gets messages for an org', function(done) {
 
-    config.CUSTOMER_ID = totemCustomerId1;
-
-    Message.getForOrg(orgId1, { before: moment().add(1, 'hour').toISOString()}, function(err, result) {
+    Message.getForOrg(orgId1, { CUSTOMER_ID: totemCustomerId1, before: moment().add(1, 'hour').toISOString()}, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.length.should.equal(1);
@@ -177,36 +168,8 @@ describe('Message', function() {
 
   });
 
-  it('tries to get messages for a person as an admin process', function(done) {
-
-    config.CUSTOMER_ID = 'GLOBAL_PROCESS';
-
-    Message.getForPeople([externalAttendee1], { before: moment().add(1, 'hour').toISOString()}, function(err, result) {
-      should.exist(err);
-      should.not.exist(result);
-      done();
-    });
-
-  });
-
-  it('gets messages for a person as an admin process', function(done) {
-
-    config.CUSTOMER_ID = totemCustomerId2;
-
-    Message.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].subject.should.equal('Message two');
-      done();
-    });
-
-  });
-
   it('gets messages for a customer', function(done) {
 
-    config.CUSTOMER_ID = totemCustomerId2;
-
     var message = new Message({
       webhook: new mongoose.Types.ObjectId(),
       customer: totemCustomerId2,
@@ -245,9 +208,7 @@ describe('Message', function() {
 
   it('tries to get a message belonging to another customer', function(done) {
 
-    config.CUSTOMER_ID = totemCustomerId2;
-
-    Message.getById(messageOne.id, function(err, result) {
+    Message.getById(messageOne.id, { CUSTOMER_ID: totemCustomerId2 }, function(err, result) {
       should.not.exist(err);
       should.not.exist(result);
       done();

package/test/News.js

@@ -1,18 +1,15 @@
 "use strict";
 
-var
+let
 
   should = require("should"),
   config = require('./config')['test'],
   mongoose = require('mongoose'),
   clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
   News = mongoose.model('News'),
-  news = new News(),
-  //fund._id = new mongoose.Types.ObjectId();
-  Fund = mongoose.model('Fund'),
-  fund = new Fund();
-
+  news = new News();
 
+let companyId = new mongoose.Types.ObjectId();
 
 describe('News', function() {
 
@@ -44,9 +41,9 @@ describe('News', function() {
 
   it('updates a news item', function(done) {
 
-     news.excerpt = 'Amazing new search portal';
+     let update = { $set: { org: companyId } };
 
-     News.upsert(news, function(err, item) {
+     News.modifyById(news._id, update, function(err, item) {
        should.not.exist(err);
        should.exist(item);
        news = item;
@@ -55,29 +52,15 @@ describe('News', function() {
 
   });
 
-  it('gets a news item by id', function(done) {
-     News.getById(news.id, function(err, item) {
-       should.not.exist(err);
-       should.exist(item);
-       item.id.should.equal(news.id);
-       done();
-     });
-  });
+  it('gets news items for a company', function(done) {
 
-  it('lists all news items', function(done) {
-     News.list(function(err, items) {
-       should.not.exist(err);
-       should.exist(items);
-       items.length.should.equal(1);
-       done();
-     });
-  });
+    News.listForCompany(news._id, function(err, items) {
+      should.not.exist(err);
+      should.exist(items);
+      done();
+    });
 
-  it('deletes a news item', function(done) {
-     News.delete(news.id, function(err, item) {
-       should.not.exist(err);
-       done();
-     });
   });
 
+
 });

package/test/Note.js

@@ -1,10 +1,9 @@
 "use strict";
 
-var
+let
 
   should = require("should"),
   config = require('./config')['test'],
-  _ = require('underscore'),
   mongoose = require('mongoose'),
   clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
   LimitedPartner = mongoose.model('LimitedPartner'),
@@ -12,9 +11,7 @@ var
   Organization = mongoose.model('Organization'),
   Person = mongoose.model('Person');
 
-  var lp, org, person, person2, person3, person4, noteCreator;
-  var accountId = new mongoose.Types.ObjectId();
-  var noteId, groupNoteId;
+  let lp, org, person, person2, person3, person4, noteCreator, noteId;
 
 describe('Note', function() {
 
@@ -29,15 +26,15 @@ describe('Note', 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 +44,16 @@ describe('Note', 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 +170,8 @@ describe('Note', function() {
 
     Note.createForModel({
       createdBy: noteCreator,
-      text: 'Best note ever!'
+      text: 'Best note ever!',
+      customer: org
     }, Organization, org._id, function(err, result) {
 
       should.not.exist(err);
@@ -193,7 +192,8 @@ describe('Note', function() {
 
     Note.createForModel({
       createdBy: noteCreator,
-      text: 'Best note ever!'
+      text: 'Best note ever!',
+      customer: org
     }, LimitedPartner, lp._id, function(err, result) {
 
       should.not.exist(err);
@@ -212,7 +212,8 @@ describe('Note', function() {
 
     Note.createForModel({
       createdBy: noteCreator,
-      text: 'Best note ever!'
+      text: 'Best note ever!',
+      customer: org
     }, Person, person._id, function(err, result) {
 
       should.not.exist(err);
@@ -228,7 +229,7 @@ describe('Note', function() {
   });
 
   it('gets a note by id', function(done) {
-    Note.getById(noteId, function(err, result) {
+    Note.getById(noteId, { CUSTOMER_ID: org._id }, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       result.text.should.equal('Best note ever!');
@@ -238,7 +239,7 @@ describe('Note', function() {
 
   it('modifies a note by id', function (done) {
 
-    Note.getById(noteId, function(err, note) {
+    Note.getById(noteId, { CUSTOMER_ID: org._id }, function(err, note) {
 
       should.not.exist(err);
       should.exist(note);
@@ -252,7 +253,7 @@ describe('Note', function() {
         }
       };
 
-      Note.modifyById(noteId, update, function (err, result) {
+      Note.modifyById(noteId, update, { CUSTOMER_ID: org._id }, function (err, result) {
         should.not.exist(err);
         should.exist(result);
         result.createdBy.toString().should.equal(newCreatedBy.toString());
@@ -264,7 +265,7 @@ describe('Note', function() {
   });
 
   it('deletes a note', function(done) {
-    Note.delete(noteId, function(err, result) {
+    Note.delete(noteId, org._id, function(err, result) {
       should.not.exist(err);
       should.exist(result);
       //result.id.should.equal(noteId.toString());