@dhyasama/totem-models 3.6.2 → 3.7.0

package/lib/Message.js

@@ -154,6 +154,36 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Message.statics.getForOrg = function getForOrg(orgId, options, cb) {
+
+    // This filters by customer so is NOT usable by admin tools
+    if (config.CUSTOMER_ID == 'GLOBAL_PROCESS') return cb(new Error('Access denied. Use getForPeopleLite.'), null);
+
+    var self = this;
+    var query = self.find({ customer: config.CUSTOMER_ID, organization: orgId });
+    query.populate('recipients.internal', 'name title avatarUrl doNotDisplay');
+    query.populate('recipients.external', 'name title avatarUrl doNotDisplay');
+    query.populate({
+      path: 'notes',
+      match: { customer: config.CUSTOMER_ID }
+    });
+    query.populate({
+      path: 'documents',
+      match: { customer: config.CUSTOMER_ID }
+    });
+    query.deepPopulate([
+      'notes.createdBy',
+      'documents.createdBy'
+    ], {
+      populate: {
+        'notes.createdBy': { select: 'name avatarUrl title' },
+        'documents.createdBy': { select: 'name avatarUrl title' }
+      }
+    });
+    query.exec(cb);
+
+  };
+
   Message.statics.getForPeople = function getForPeople(personIds, options, cb) {
 
     // This filters by customer so is NOT usable by admin tools

package/lib/Round.js

@@ -142,12 +142,20 @@ module.exports = function(mongoose, config) {
         };
       });
 
+      var websites = rounds[0].organization.websiteAliases || [];
+      websites.push(rounds[0].organization.website);
+      websites = _.compact(websites);
+      websites = _.uniq(websites);
+
       // construct the org
       var org = {
         _id: rounds[0].organization._id,
         name: rounds[0].organization.name,
         logoUrl: rounds[0].organization.logoUrl,
         description: rounds[0].organization.description,
+        website: rounds[0].organization.website,
+        websiteAliases: rounds[0].organization.websiteAliases,
+        websites: websites,
         contact: rounds[0].organization.contact,
         filters: rounds[0].organization.filters,
         status: rounds[0].organization.status,

package/package.json

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

package/test/Financials.js

@@ -14,7 +14,7 @@ var customerB = new mongoose.Types.ObjectId();
 var orgA = new mongoose.Types.ObjectId();
 var orgB = new mongoose.Types.ObjectId();
 
-describe('Financials', function() {
+describe.skip('Financials', function() {
 
   before(function(done) {
     if (mongoose.connection.db) return done();

package/test/Message.js

@@ -16,6 +16,8 @@ var totemCustomerId1 = new mongoose.Types.ObjectId();
 var totemCustomerId2 = new mongoose.Types.ObjectId();
 var externalAttendee1 = new mongoose.Types.ObjectId();
 var externalAttendee2 = new mongoose.Types.ObjectId();
+var orgId1 = new mongoose.Types.ObjectId();
+var orgId2 = new mongoose.Types.ObjectId();
 
 var messageOne;
 
@@ -35,6 +37,7 @@ describe('Message', function() {
     var message = new Message({
       webhook: new mongoose.Types.ObjectId(),
       customer: totemCustomerId1,
+      organization: orgId1,
       subject: 'Message one',
       type: 'email',
       subtype: 'boards',
@@ -58,6 +61,7 @@ describe('Message', function() {
     var message = new Message({
       webhook: new mongoose.Types.ObjectId(),
       customer: totemCustomerId2,
+      organization: orgId2,
       subject: 'Message two',
       type: 'email',
       subtype: 'boards',
@@ -153,6 +157,20 @@ 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) {
+      should.not.exist(err);
+      should.exist(result);
+      result.length.should.equal(1);
+      result[0].subject.should.equal('Message one');
+      done();
+    });
+
+  });
+
   it('tries to get messages for a person as an admin process', function(done) {
 
     config.CUSTOMER_ID = 'GLOBAL_PROCESS';