@dhyasama/totem-models 11.1.0 → 11.3.0

package/lib/DiffbotOrganization.js

@@ -12,13 +12,13 @@ module.exports = function(mongoose, config) {
       org: {
         type: Schema.ObjectId,
         ref: 'Organization',
-        required: false,
-        default: null
+        required: true,
+        unique: true
       },
 
-      updatedOn: { type: Date, required: false, default: null },
+      updatedOn: { type: Date, required: true, default: new Date() },
 
-      entity: { type: Schema.Types.Mixed, required: false, default: null },
+      entity: { type: Schema.Types.Mixed, required: true },
 
     });
 
@@ -33,7 +33,7 @@ module.exports = function(mongoose, config) {
     options = helpers.getDefaultOptions(options);
 
     self
-      .find({ org: id })
+      .findOne({ org: id })
       .populate('org')
       .exec(cb);
 
@@ -50,7 +50,7 @@ module.exports = function(mongoose, config) {
     options = helpers.getDefaultOptions(options);
 
     self
-      .find({ org: id })
+      .findOne({ org: id })
       .exec(cb);
 
   };

package/lib/Interaction.js

@@ -189,6 +189,49 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Interaction.statics.getForTimeline = function getForTimeline(customerId, options, cb) {
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!customerId) { return cb(new Error('customerId is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(customerId)) { return cb(new Error('customerId is not a valid ObjectId'), null); }
+
+    const self = this;
+    const startDate = options.startDate || moment().subtract(20, 'years').startOf('day').toISOString();
+    const endDate = options.endDate || moment().toISOString();
+
+    self.aggregate([
+      {
+        $match: {
+          totemCustomerId: customerId,
+          startTime: {
+            $gte: startDate,
+            $lte: endDate
+          }
+        }
+      },
+      {
+        $sort: {
+          startTime: -1
+        }
+      },
+      {
+        $group: {
+          _id: "$providerEventId", // Group by providerEventId to deduplicate
+          doc: { $first: "$$ROOT" } // Take the first (latest) document encountered for each providerEventId after sorting
+        }
+      },
+      {
+        $replaceRoot: { newRoot: "$doc" } // Replace the root to output the original document structure
+      },
+      {
+        $sort: {
+          startTime: -1 // Final sort by startTime in descending order to order the output
+        }
+      }
+    ]).exec(cb);
+
+  };
+
   Interaction.statics.getMostRecent = function getMostRecent(customerId, personIds, cb) {
 
     // Gets the most recent interaction with a customer across a list of people

package/lib/Message.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const moment = require("moment/moment");
 module.exports = function(mongoose, config) {
 
   let
@@ -7,6 +8,7 @@ module.exports = function(mongoose, config) {
     Schema = mongoose.Schema,
     async = require('async'),
     _ = require('underscore'),
+    moment = require('moment'),
     helpers = require('../helpers'),
     Document = mongoose.model('Document'),
     Note = mongoose.model('Note');
@@ -246,9 +248,20 @@ module.exports = function(mongoose, config) {
 
     const self = this;
 
-    let query = self.find({ customer: options.CUSTOMER_ID, organization: { $in : orgIds } });
+    let query = self.find({ customer: options.CUSTOMER_ID });
+    query.find({ organization: { $in : orgIds }});
+
+    if (options.startDate) {
+      const startDate = options.startDate || moment().subtract(20, 'years').startOf('day').toISOString();
+      query.where('messageDate').gte(startDate)
+    }
+
+    if (options.endDate) {
+      const endDate = options.endDate || moment().toISOString();
+      query.where('messageDate').lte(endDate)
+    }
+
     query.populate('documents');
-    
     query.exec(cb);
 
   };

package/lib/News.js

@@ -1,11 +1,13 @@
 "use strict";
 
+const moment = require("moment/moment");
 module.exports = function(mongoose, config) {
 
   let
 
     Schema = mongoose.Schema,
     helpers = require('../helpers'),
+    moment = require('moment'),
 
     News = new Schema({
 
@@ -25,7 +27,7 @@ module.exports = function(mongoose, config) {
 
       sentiment: { type: Number, required: false, default: null },
 
-      diffbotUri: { type: String, required: false, default: null },
+      diffbotUri: { type: String, required: true, unique: true },
 
       org: {
         type: Schema.ObjectId,
@@ -60,18 +62,28 @@ module.exports = function(mongoose, config) {
 
   News.statics.getByIds = function getByIds(ids, options, cb) {
 
-    const self = this;
-
     if (!cb) { throw new Error('cb is required'); }
     if (!ids) { return cb(new Error('ids is required'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
 
     options = helpers.getDefaultOptions(options);
 
-    self
-      .find({ org: { $in : ids } })
-      .sort('-createdOn')
-      .exec(cb);
+    const self = this;
+
+    let query = self.find({ org: { $in : ids } })
+
+    if (options.startDate) {
+      const startDate = options.startDate || moment().subtract(20, 'years').startOf('day').toISOString();
+      query.where('publishedOn').gte(startDate)
+    }
+
+    if (options.endDate) {
+      const endDate = options.endDate || moment().toISOString();
+      query.where('publishedOn').lte(endDate)
+    }
+
+    query.sort('-createdOn')
+    query.exec(cb);
 
   };
 
@@ -95,7 +107,6 @@ module.exports = function(mongoose, config) {
   };
 
   News.statics.upsert = function (news, cb) {
-    news.markModified('extracted');
     news.save(cb);
   };
 

package/lib/Person.js

@@ -1217,7 +1217,9 @@ module.exports = function(mongoose, config) {
       cleanContactInfo(doc);
 
       // set full name for ease of searching
-      if (doc.fullName) doc.fullName = doc.name.first + ' ' + doc.name.last;
+      doc.fullName = '';
+      if(doc.name.first) doc.fullName += doc.name.first;
+      if(doc.name.last) doc.fullName += ' ' + doc.name.last;
 
       if (doc.sources) {
 

package/package.json

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