@dhyasama/totem-models 3.2.0 → 3.2.1

package/lib/Document.js

@@ -25,7 +25,10 @@ module.exports = function(mongoose, config) {
 
     contentLength: { type: String, required: true },
 
-    s3key: { type: String, required: true }
+    s3: {
+      bucket: { type: String, required: true, trim: true },
+      key: { type: String, required: true, trim: true }
+    }
 
   });
 
@@ -61,7 +64,6 @@ module.exports = function(mongoose, config) {
     };
 
     doc.createdOn = new Date();
-    doc.customer = config.CUSTOMER_ID;
 
     this.create(doc, addToModel);
 

package/lib/Interaction.js

@@ -78,7 +78,7 @@ module.exports = function(mongoose, config) {
 
     var self = this;
     var query = self.find({ totemCustomerId: customerId, _id: { $gt: sinceObjectId } });
-
+    query.populate('attendees.external');
     query.exec(cb);
 
   };

package/lib/Message.js

@@ -25,7 +25,8 @@ module.exports = function(mongoose, config) {
       external: [{ type: Schema.ObjectId,  ref: 'Person', index: true }] // everyone else
     },
     notes: [ { type: Schema.ObjectId, ref: 'Note' } ],
-    documents: [ { type: Schema.ObjectId, ref: 'Document' } ]
+    documents: [ { type: Schema.ObjectId, ref: 'Document' } ],
+    raw: { type: Schema.Types.Mixed, required: true }
 
   });
 

package/lib/Organization.js

@@ -1306,7 +1306,7 @@ module.exports = function(mongoose, config) {
       self.people = _.reject(self.people, function(p) { return p.person == null; });
 
       // dedupe
-      self.people = _.uniq(self.people, function(p) { return p.person._id ? p.person._id : p.person; });
+      self.people = _.uniq(self.people, function(p) { return p.person._id ? p.person._id.toString() : p.person.toString(); });
 
     };
 

package/package.json

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

package/test/Document.js

@@ -51,7 +51,8 @@ describe('Document', function() {
 
     message = new Message({
       webhook: new mongoose.Types.ObjectId(),
-      customer: config.CUSTOMER_ID
+      customer: config.CUSTOMER_ID,
+      raw: { test: 'test' }
     });
 
     Message.upsert(message, function(err, result) {
@@ -129,11 +130,15 @@ describe('Document', function() {
   it('creates a document for an interaction', function(done) {
 
     Document.createForModel({
+      customer: config.CUSTOMER_ID,
       createdBy: documentCreator,
       name: 'your_mom.doc',
       contentType: 'application/doc',
       contentLength: 1248,
-      s3key: '/totem/docs'
+      s3: {
+        bucket: 'totem',
+        key: 'docs'
+      }
     }, Interaction, interaction._id, function(err, result) {
 
       should.not.exist(err);
@@ -151,11 +156,15 @@ describe('Document', function() {
   it('creates a document for a message', function(done) {
 
     Document.createForModel({
+      customer: config.CUSTOMER_ID,
       createdBy: documentCreator,
       name: 'plain.txt',
       contentType: 'text/plain',
       contentLength: 124,
-      s3key: '/totem/doculate'
+      s3: {
+        bucket: 'totem',
+        key: 'docs'
+      }
     }, Message, message._id, function(err, result) {
 
       should.not.exist(err);
@@ -173,11 +182,15 @@ describe('Document', function() {
   it('creates a document for an organization', function(done) {
 
     Document.createForModel({
+      customer: config.CUSTOMER_ID,
       createdBy: documentCreator,
       name: 'test_file.jpg',
       contentType: 'image/jpeg',
       contentLength: 12345,
-      s3key: '/totem/documents'
+      s3: {
+        bucket: 'totem',
+        key: 'docs'
+      }
     }, Organization, org._id, function(err, result) {
 
       should.not.exist(err);
@@ -197,11 +210,15 @@ describe('Document', function() {
   it('creates a document for a person', function(done) {
 
     Document.createForModel({
+      customer: config.CUSTOMER_ID,
       createdBy: documentCreator,
       name: 'test.pdf',
       contentType: 'application/pdf',
       contentLength: 54321,
-      s3key: '/documents/totem'
+      s3: {
+        bucket: 'totem',
+        key: 'docs'
+      }
     }, Person, person._id, function(err, result) {
 
       should.not.exist(err);

package/test/Message.js

@@ -34,7 +34,8 @@ describe('Message', function() {
       subject: 'Message one',
       recipients: {
         external: [externalAttendee1]
-      }
+      },
+      raw: { test: 'test' }
     });
 
     Message.upsert(message, function(err, result) {
@@ -53,7 +54,8 @@ describe('Message', function() {
       subject: 'Message two',
       recipients: {
         external: [externalAttendee2]
-      }
+      },
+      raw: { test: 'test' }
     });
 
     Message.upsert(message, function(err, result) {
@@ -114,7 +116,8 @@ describe('Message', function() {
       subject: 'test 3',
       recipients: {
         external: [new mongoose.Types.ObjectId()]
-      }
+      },
+      raw: { test: 'test' }
     });
 
     Message.upsert(message, function(err, result) {