@dhyasama/totem-models 2.6.1 → 2.7.1

package/lib/Interaction.js

@@ -84,6 +84,9 @@ module.exports = function(mongoose, config) {
 
   Interaction.statics.getForPeople = function getForPeople(personIds, 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;
 
     options.limit = options.limit || -1;
@@ -128,6 +131,17 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Interaction.statics.getForPeopleLite = function getForPeopleLite(personIds, cb) {
+
+    // This doesn't filter by customer so is only usable by admin tools
+    if (config.CUSTOMER_ID != 'GLOBAL_PROCESS') return cb(new Error('Access denied'), null);
+
+    var self = this;
+    var query = self.find({'attendees.external': { $in : personIds }});
+    query.exec(cb);
+
+  };
+
   Interaction.statics.getNotes = function getNotes(personIds, options, cb) {
 
     var self = this;

package/lib/Organization.js

@@ -1146,7 +1146,7 @@ module.exports = function(mongoose, config) {
       if (data.domain) {
         data.domain = data.domain.toLowerCase();
         var domainRegExp = options.fuzzy ? new RegExp(data.domain, 'i') : new RegExp('^' + data.domain + '$', 'i');
-        query['$or'].push({ 'website': domainRegExp });
+        query['$or'].push({ 'website': domainRegExp }, {'websiteAliases': domainRegExp});
       }
 
       // remove if unused

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "2.6.1",
+  "version": "2.7.1",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",
@@ -15,7 +15,7 @@
     "@dhyasama/ffvc-crypto": "^1.0.0",
     "@dhyasama/ffvc-geoip": "^1.0.0",
     "@dhyasama/ffvc-s3": "^1.0.0",
-    "@dhyasama/ffvc-utilities": "^2.0.0",
+    "@dhyasama/ffvc-utilities": "^2.2.0",
     "async": "^2.6.0",
     "awesome-phonenumber": "^1.0.14",
     "bcrypt": "^0.8.0",

package/test/Interaction.js

@@ -0,0 +1,162 @@
+"use strict";
+
+var
+
+  should = require("should"),
+  _ = require('underscore'),
+  config = require('./config')['test'],
+  mongoose = require('mongoose'),
+  moment = require('moment'),
+  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  Interaction = mongoose.model('Interaction');
+
+var totemCustomerId1 = new mongoose.Types.ObjectId();
+var totemCustomerId2 = new mongoose.Types.ObjectId();
+var externalAttendee1 = new mongoose.Types.ObjectId();
+var externalAttendee2 = new mongoose.Types.ObjectId();
+
+describe.only('Interaction', function() {
+
+  before(function(done) {
+    if (mongoose.connection.db) return done();
+    mongoose.connect(config.db.uri, done);
+  });
+
+  before(function(done) {
+    clearDB(done);
+  });
+
+  // calendarEventId: { type: Schema.ObjectId, ref: 'CalendarEvent', required: true }, // the event from the original pull
+  // providerEventId: { type: String, required: true, index: true, trim: true }, // unique id from the calendar provider
+  // totemCustomerId: { type: Schema.ObjectId, ref: 'Organization', index: true, required: true },
+  // summary: { type: String, required: true, trim: true },
+  // startTime: { type: Date, index: true },
+  // recurring: { type: Boolean, default: false },
+  // attendees: {
+  //   internal: [{ type: Schema.ObjectId, ref: 'Person', index: true }], // people from customer
+  //     external: [{ type: Schema.ObjectId,  ref: 'Person', index: true }] // everyone else
+  // },
+  // notes: [ { type: Schema.ObjectId, ref: 'Note' } ]
+
+  it('creates an interaction', function(done) {
+
+    var interaction = new Interaction({
+      calendarEventId: new mongoose.Types.ObjectId(),
+      providerEventId: 'abc124',
+      totemCustomerId: totemCustomerId1,
+      startTime: new Date(),
+      summary: 'test 1',
+      attendees: {
+        external: [externalAttendee1]
+      }
+    });
+
+    Interaction.upsert(interaction, function(err, result) {
+      should.not.exist(err);
+      should.exist(result);
+      done();
+    });
+
+  });
+
+  it('creates another interaction', function(done) {
+
+    var interaction = new Interaction({
+      calendarEventId: new mongoose.Types.ObjectId(),
+      providerEventId: 'abc124',
+      totemCustomerId: totemCustomerId2,
+      startTime: new Date(),
+      summary: 'test 2',
+      attendees: {
+        external: [externalAttendee2]
+      }
+    });
+
+    Interaction.upsert(interaction, function(err, result) {
+      should.not.exist(err);
+      should.exist(result);
+      done();
+    });
+
+  });
+
+  it('gets interactions for a person', function(done) {
+
+    config.CUSTOMER_ID = totemCustomerId1;
+
+    Interaction.getForPeople([externalAttendee1], { 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 1');
+      done();
+    });
+
+  });
+
+  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',
+      totemCustomerId: totemCustomerId2,
+      startTime: new Date(),
+      summary: 'test 3',
+      attendees: {
+        external: [new mongoose.Types.ObjectId()]
+      }
+    });
+
+    Interaction.upsert(interaction, function(err, result) {
+
+      should.not.exist(err);
+      should.exist(result);
+
+      Interaction.getForCustomer(totemCustomerId2, null, function(err, result) {
+
+        should.not.exist(err);
+        should.exist(result);
+        result.length.should.equal(2);
+
+        Interaction.getForCustomer(totemCustomerId1, null, function(err, result) {
+          should.not.exist(err);
+          should.exist(result);
+          result.length.should.equal(1);
+          done();
+        });
+
+      });
+
+    });
+
+  });
+
+});

package/.npmignore

@@ -1,14 +0,0 @@
-lib-cov
-*.seed
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-
-npm-debug.log
-node_modules
-
-.DS_Store
-.idea