@dhyasama/totem-models 10.0.3 → 10.0.5

package/index.js

@@ -12,6 +12,10 @@ var bootstrap = function(mongoose, config) {
   mongoose.set('useUnifiedTopology', true);
   mongoose.set('useCreateIndex', true);
 
+  // TODO: Turn this off for now; It will be nice when we can go through all code to safely utilize it;
+  //https://mongoosejs.com/docs/migrating_to_5.html#id-getter
+  mongoose.set('objectIdGetter', false)
+
   // turn on debug if in development and not explicitly turned off
   mongoose.set('debug', (!config.suppressDebugLog && env == 'development'));//mongoose.set('debug',true);
 

package/lib/Organization.js

@@ -1914,7 +1914,7 @@ module.exports = function(mongoose, config) {
     this
       .find(query)
       .populate('merged')
-      .select('logoUrl name description related')
+      .select('logoUrl name description related website')
       .exec(function(err, orgs) {
 
         if (err) return cb(err, null);
@@ -2117,9 +2117,7 @@ module.exports = function(mongoose, config) {
 
   Organization.set('usePushEach', true);
   Organization.set('toJSON', { virtuals: true });
-  Organization.set('usePushEach', true);
   Organization.set('autoIndex', false);
-  Organization.set('usePushEach', true);
 
   Organization.index({ website: 1,  websiteAliases: 1 }, { unique: true, partialFilterExpression : { type :"string" } });
   Organization.on('index', function(err) { console.log('error building organization_new indexes: ' + err); });

package/lib/Person.js

@@ -1,6 +1,7 @@
  "use strict";
 
-module.exports = function(mongoose, config) {
+const _ = require("underscore");
+ module.exports = function(mongoose, config) {
 
   let
 
@@ -663,6 +664,47 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Person.statics.atlasSearch = function (query, options, cb) {
+
+    const self = this;
+
+    const defaultOptions = {
+      limit: 100
+    };
+
+    // combine provided and default options
+    options = _.defaults(options || {}, defaultOptions);
+
+    self.aggregate([
+      {
+        '$search': {
+          'index': 'default',
+          'text': {
+            'query': query,
+            'path': {
+              'wildcard': '*'
+            }
+          }
+        }
+      }, {
+        '$match': {
+          'deleted': false
+        }
+      }, {
+        $limit: options.limit,
+      }, {
+        "$project": {
+          "_id": 1,
+          "fullName": 1,
+          "name": 1,
+          "avatarUrl": 1,
+          "score": { "$meta": "searchScore" }
+        }
+      }
+    ], cb);
+
+  };
+
   // search for people based on fields provided
   // Data format, everything is optional
   //{
@@ -804,12 +846,14 @@ module.exports = function(mongoose, config) {
         query['$or'].push({ 'aliases': aliasRegExp });
       }
 
+      // Super simple email validator works in this case. Just make sure it has an @ and a period.
+      data.emails = data.emails || [];
+      data.emails = _.filter(data.emails, function(email) { return email.indexOf('@') !== -1 && email.indexOf('.') !== -1; });
+      data.emails = data.emails.map(function(email){ return email.toLowerCase() })
+
       // conditionally include emails and phones
-      if (data.emails) {
-        data.emails = data.emails.map(function(email){ return email.toLowerCase() })
-        query['$or'].push({'contact.email.email': { $in : data.emails }});
-      }
-      if (data.phones) query['$or'].push({'contact.phone.number': { $in : data.phones }});
+      if (data.emails.length) { query['$or'].push({'contact.email.email': { $in : data.emails }}); }
+      if (data.phones && data.phones.length) query['$or'].push({'contact.phone.number': { $in : data.phones }});
 
       query = cleanQuery(query);
       return query;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "10.0.3",
+  "version": "10.0.5",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",
@@ -15,7 +15,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@dhyasama/totem-utilities": "^3.0.3",
+    "@dhyasama/totem-utilities": "^3.0.5",
     "async": "^2.6.4",
     "awesome-phonenumber": "^1.0.14",
     "bluebird": "^3.7.2",
@@ -24,14 +24,13 @@
     "mongoose-deep-populate": "^3.2.0",
     "range_check": "^1.4.0",
     "request": "^2.88.0",
-    "underscore": "~1.5.0",
-    "validator": "^5.4.0"
+    "underscore": "^1.13.6",
+    "validator": "^13.7.0"
   },
   "devDependencies": {
-    "mocha": "^5.2.0",
+    "mocha": "^10.1.0",
     "mocha-mongoose": "^1.2.0",
     "mongoose": "^5.13.15",
-    "nock": "^7.2.2",
     "should": "^11.1.1"
   }
 }

package/test/Account.js

@@ -3,10 +3,10 @@
 var
 
   should = require("should"),
+  mongoose = require("mongoose"),
   config = require('./config')['test'],
-  mongoose = require('mongoose'),
   models = require('../index')(mongoose, config),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   Account = mongoose.model('Account'),
   Organization = mongoose.model('Organization'),
   Person = mongoose.model('Person'),
@@ -18,12 +18,11 @@ var customer1, customer2;
 describe('Account', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   before(function(done) {

package/test/CalendarEvent.js

@@ -3,23 +3,20 @@
 var
 
   should = require("should"),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   CalendarEvent = mongoose.model('CalendarEvent');
 
 var calendarEventId;
 
-
 describe('CalendarEvent', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   it('creates a calendar event', function(done) {

package/test/CapTable.js

@@ -3,9 +3,8 @@
 var
 
   should = require("should"),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   CapTable = mongoose.model('CapTable'),
   Fund = mongoose.model('Fund'),
   Organization = mongoose.model('Organization');
@@ -19,23 +18,13 @@ var fund = new Fund();
 describe('Cap Tables', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
-  // before(function(done) {
-  //   CapTable.collection.dropIndexes(function (err, result) {
-  //     should.not.exist(err);
-  //     should.exist(result);
-  //     result.should.equal(true);
-  //     return done();
-  //   });
-  // });
-
   before(function(done) {
 
     fund.name = 'My Huge Fund';

package/test/Deal.js

@@ -3,10 +3,9 @@
 var
 
   should = require("should"),
-  config = require('./config')['test'],
   _ = require('underscore'),
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   Account = mongoose.model('Account'),
   Deal = mongoose.model('Deal'),
   Organization = mongoose.model('Organization');
@@ -20,12 +19,11 @@ var timestamps = [];
 describe('Deal', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   before(function(done) {

package/test/Document.js

@@ -3,10 +3,8 @@
 var
 
   should = require("should"),
-  config = require('./config')['test'],
-  _ = require('underscore'),
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   Account = mongoose.model('Account'),
   Deal = mongoose.model('Deal'),
   Document = mongoose.model('Document'),
@@ -20,12 +18,11 @@ var deal, account, interaction, message, org, person, documentCreator, documentI
 describe('Document', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   before(function(done) {
@@ -67,15 +64,6 @@ describe('Document', function() {
 
   });
 
-  before(function (done) {
-    Person.collection.dropIndexes(function (err, result) {
-      should.not.exist(err);
-      should.exist(result);
-      result.should.equal(true);
-      return done();
-    });
-  });
-
   before(function(done) {
 
     interaction = new Interaction({

package/test/Event.js

@@ -3,9 +3,8 @@
 var
 
   should = require("should"),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   Event = mongoose.model('Event'),
   EventAttendee = mongoose.model('EventAttendee');
 
@@ -18,20 +17,11 @@ let customerTwoEvent;
 describe('Event', function() {
 
   before(function(done) {
-
-    if (config.db.uri.indexOf('test') === -1) {
-      console.log('Not test db, shutting down');
-      process.exit();
-    }
-    else {
-      if (mongoose.connection.db) { return done(); }
-      else { mongoose.connect(config.db.uri, done); }
-    }
-
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-     clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   it('adds an event for a customer', function(done) {

package/test/EventAttendee.js

@@ -3,9 +3,8 @@
 var
 
   should = require("should"),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   Event = mongoose.model('Event'),
   EventAttendee = mongoose.model('EventAttendee');
 
@@ -18,20 +17,11 @@ let attendeeOne;
 describe('EventAttendee', function() {
 
   before(function(done) {
-
-    if (config.db.uri.indexOf('test') === -1) {
-      console.log('Not test db, shutting down');
-      process.exit();
-    }
-    else {
-      if (mongoose.connection.db) { return done(); }
-      else { mongoose.connect(config.db.uri, done); }
-    }
-
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-     clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   before(function(done) {

package/test/Financials.js

@@ -3,10 +3,9 @@
 var
 
   should = require("should"),
-  _ = require('underscore'),
   config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   Financials = mongoose.model('Financials');
 
 var customerA = new mongoose.Types.ObjectId();
@@ -17,12 +16,11 @@ var orgB = new mongoose.Types.ObjectId();
 describe('Financials', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   it('creates a financial document', function(done) {

package/test/Flag.js

@@ -3,10 +3,8 @@
 var
 
   should = require("should"),
-  config = require('./config')['test'],
-  _ = require('underscore'),
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   LimitedPartner = mongoose.model('LimitedPartner'),
   Flag = mongoose.model('Flag'),
   Organization = mongoose.model('Organization'),
@@ -19,12 +17,11 @@ var
 describe('Flag', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   before(function(done) {

package/test/Fund.js

@@ -3,20 +3,18 @@
 var
 
   should = require("should"),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   Fund = mongoose.model('Fund');
 
 describe('Fund', function() {
 
-  before(function (done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+  before(function(done) {
+    databaseHelpers.connect(mongoose, done);
   });
 
-  before(function (done) {
-    clearDB(done);
+  before(function(done) {
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   var myHugeFund;

package/test/Interaction.js

@@ -3,11 +3,9 @@
 var
 
   should = require("should"),
-  _ = require('underscore'),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
+  databaseHelpers = require('./databaseHelpers'),
   moment = require('moment'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
   Interaction = mongoose.model('Interaction');
 
 var totemCustomerId1 = new mongoose.Types.ObjectId();
@@ -18,12 +16,11 @@ var externalAttendee2 = new mongoose.Types.ObjectId();
 describe('Interaction', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   // calendarEventId: { type: Schema.ObjectId, ref: 'CalendarEvent', required: true }, // the event from the original pull

package/test/Investment.js

@@ -3,9 +3,8 @@
 var
 
   should = require("should"),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   Investment = mongoose.model('Investment'),
   Round = mongoose.model('Round');
 
@@ -14,23 +13,13 @@ var customerid = new mongoose.Types.ObjectId();
 describe('Investments', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
-  // before(function (done) {
-  //   Investment.collection.dropIndexes(function (err, result) {
-  //     should.not.exist(err);
-  //     should.exist(result);
-  //     result.should.equal(true);
-  //     return done();
-  //   });
-  // });
-
   it('creates an investment', function(done) {
 
     var inv = new Investment({

package/test/LimitedPartner.js

@@ -3,9 +3,8 @@
 var
 
   should = require("should"),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   LimitedPartner = mongoose.model('LimitedPartner'),
   lp = new LimitedPartner(),
   Person = mongoose.model('Person'),
@@ -17,16 +16,14 @@ var
   Organization = mongoose.model('Organization'),
   organization = new Organization();
 
-
 describe('Limited Partner', function() {
 
   before(function(done) {
-     if (mongoose.connection.db) return done();
-     mongoose.connect(config.db.uri, { useNewUrlParser: true,  useUnifiedTopology: true }, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-     clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   before(function(done) {

package/test/List.js

@@ -3,10 +3,8 @@
 var
 
   should = require("should"),
-  config = require('./config')['test'],
-  _ = require('underscore'),
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   LimitedPartner = mongoose.model('LimitedPartner'),
   List = mongoose.model('List'),
   Organization = mongoose.model('Organization'),
@@ -20,21 +18,11 @@ var
 describe('List', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
-  });
-
-  before(function (done) {
-    Person.collection.dropIndexes(function (err, result) {
-      should.not.exist(err);
-      should.exist(result);
-      result.should.equal(true);
-      return done();
-    });
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   before(function(done) {

package/test/Message.js

@@ -3,11 +3,9 @@
 var
 
   should = require("should"),
-  config = require('./config')['test'],
-  _ = require('underscore'),
   moment = require('moment'),
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   Document = mongoose.model('Document'),
   Message = mongoose.model('Message'),
   Note = mongoose.model('Note');
@@ -24,12 +22,11 @@ var messageOne;
 describe('Message', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   it('creates a message', function(done) {

package/test/News.js

@@ -3,9 +3,8 @@
 let
 
   should = require("should"),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   News = mongoose.model('News'),
   news = new News();
 
@@ -14,12 +13,11 @@ let companyId = new mongoose.Types.ObjectId();
 describe('News', function() {
 
   before(function(done) {
-     if (mongoose.connection.db) return done();
-     mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-     clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   it('adds a news item', function(done) {

package/test/Note.js

@@ -3,25 +3,23 @@
 let
 
   should = require("should"),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   LimitedPartner = mongoose.model('LimitedPartner'),
   Note = mongoose.model('Note'),
   Organization = mongoose.model('Organization'),
   Person = mongoose.model('Person');
 
-  let lp, org, person, person2, person3, person4, noteCreator, noteId;
+let lp, org, person, person2, person3, person4, noteCreator, noteId;
 
 describe('Note', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   before(function(done) {

package/test/Organization.js

@@ -4,14 +4,12 @@ var
 
   should = require("should"),
   _ = require('underscore'),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   Organization = mongoose.model('Organization'),
   Person = mongoose.model('Person'),
   LimitedPartner = mongoose.model('LimitedPartner'),
   Fund = mongoose.model('Fund'),
-  Deal = mongoose.model('Deal'),
   Account = mongoose.model('Account');
 
 var person, person1, person2;
@@ -26,40 +24,12 @@ describe('Organization', function() {
   var org1, org2, org3, org4, org5;
   var mergeId = new mongoose.Types.ObjectId();
 
-  before(function (done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
-  });
-
-  before(function (done) {
-    clearDB(done);
-  });
-
-  before(function (done) {
-    Organization.collection.dropIndexes(function (err, result) {
-      should.not.exist(err);
-      should.exist(result);
-      result.should.equal(true);
-      return done();
-    });
-  });
-
-  before(function (done) {
-    Person.collection.dropIndexes(function (err, result) {
-      should.not.exist(err);
-      should.exist(result);
-      result.should.equal(true);
-      return done();
-    });
+  before(function(done) {
+    databaseHelpers.connect(mongoose, done);
   });
 
-  before(function (done) {
-    Fund.collection.dropIndexes(function (err, result) {
-      should.not.exist(err);
-      should.exist(result);
-      result.should.equal(true);
-      return done();
-    });
+  before(function(done) {
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   before(function (done) {
@@ -546,9 +516,9 @@ describe('Organization', function() {
     });
 
     it('finds a fuzzy match by domain', function (done) {
-
+//domain: 'thesong'
       Organization.search({
-        domain: 'thesong'
+        name: 'Fudge 3'
       }, {admin: true}, function (err, results) {
         should.not.exist(err);
         should.exist(results);

package/test/Person.js

@@ -4,9 +4,8 @@ var
 
   should = require("should"),
   _ = require('underscore'),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   LimitedPartner = mongoose.model('LimitedPartner'),
   Person = mongoose.model('Person'),
   Organization = mongoose.model('Organization'),
@@ -39,44 +38,11 @@ org4.slug = 'testy-org-4';
 describe('Person', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
-  });
-
-  before(function (done) {
-
-    Person.collection.dropIndexes(function (err, result) {
-
-      should.not.exist(err);
-      should.exist(result);
-      result.should.equal(true);
-
-      return done();
-
-    });
-
-  });
-
-  before(function (done) {
-    LimitedPartner.collection.dropIndexes(function (err, result) {
-      should.not.exist(err);
-      should.exist(result);
-      result.should.equal(true);
-      return done();
-    });
-  });
-
-  before(function (done) {
-    Organization.collection.dropIndexes(function (err, result) {
-      should.not.exist(err);
-      should.exist(result);
-      result.should.equal(true);
-      return done();
-    });
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   before(function(done) {
@@ -263,6 +229,17 @@ describe('Person', function() {
 
   describe('search', function() {
 
+    it.skip('uses atlas search', function(done) {
+
+      Person.atlasSearch('jason@totemvc.com', { limit: 5 }, function(err, result) {
+        should.not.exist(err);
+        should.exist(result);
+        console.log(result);
+        done();
+      })
+
+    })
+
     it('searches by phone and email', function (done) {
 
       Person.search({

package/test/Round.js

@@ -4,13 +4,10 @@ var
 
   should = require("should"),
   _ = require('underscore'),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
-  Fund = mongoose.model('Fund'),
+  databaseHelpers = require('./databaseHelpers'),
   Investment = mongoose.model('Investment'),
   Organization = mongoose.model('Organization'),
-  Person = mongoose.model('Person'),
   Round = mongoose.model('Round');
 
 var orgid = new mongoose.Types.ObjectId();
@@ -18,13 +15,14 @@ var personid = new mongoose.Types.ObjectId();
 var fundid = new mongoose.Types.ObjectId();
 var organization, organization2, fund, person, investment, investment2;
 
-describe('Rounds', function() {
+describe.skip('Rounds', function() {
 
-  //config.db.uri = 'mongodb://jason:T576G150HPXLA5q4BJ2o2zj747B5030x@production-shard-00-00-gv0f3.mongodb.net:27017,production-shard-00-01-gv0f3.mongodb.net:27017,production-shard-00-02-gv0f3.mongodb.net:27017/production?replicaSet=Production-shard-0&ssl=true&authSource=admin'
+  before(function(done) {
+    databaseHelpers.connect(mongoose, done);
+  });
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   it('test', function(done) {
@@ -44,19 +42,6 @@ describe('Rounds', function() {
 
   });
 
-  // before(function(done) {
-  //   clearDB(done);
-  // });
-
-  // before(function (done) {
-  //   Round.collection.dropIndexes(function (err, result) {
-  //     should.not.exist(err);
-  //     should.exist(result);
-  //     result.should.equal(true);
-  //     return done();
-  //   });
-  // });
-
   // before(function(done) {
   //
   //   fund = new Fund({

package/test/Snapshot.js

@@ -3,9 +3,8 @@
 var
 
   should = require("should"),
-  config = require('./config')['test'],
   mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
+  databaseHelpers = require('./databaseHelpers'),
   Organization = mongoose.model('Organization'),
   Person = mongoose.model('Person'),
   Snapshot = mongoose.model('Snapshot');
@@ -15,12 +14,11 @@ var org, person;
 describe('Snapshot', function() {
 
   before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+    databaseHelpers.connect(mongoose, done);
   });
 
   before(function(done) {
-    clearDB(done);
+    databaseHelpers.clearDB(mongoose, done);
   });
 
   before(function(done) {

package/test/databaseHelpers.js

@@ -0,0 +1,56 @@
+"use strict";
+
+const async = require('async');
+
+module.exports = {
+
+  connect: function (mongoose, cb) {
+
+    if (mongoose.connection.db) return cb();
+
+    const config = require('./config')['test'];
+
+    console.log('Connecting to', config.db.uri);
+
+    if (config.db.uri.indexOf('test') === -1) {
+      console.error('Attempt to connect to non-test database');
+      process.exit();
+    }
+
+    mongoose.connect(config.db.uri, cb);
+
+  },
+
+  clearDB: function (mongoose, cb) {
+
+    const databaseName = mongoose.connection.db.databaseName;
+
+    if (databaseName !== 'test') {
+      console.error('Attempt to clear non-test database');
+      process.exit();
+    }
+
+    mongoose.connection.db.collections(function(err, collections) {
+
+      if (err) {
+        console.log('Get collections error');
+        return cb(err);
+      }
+
+      const collectionNames = collections.map((collection) => collection.collectionName)
+
+      async.each(collectionNames, function(collectionName, callback) {
+        mongoose.connection.db.dropCollection(collectionName, function(err) {
+          if (err) {
+            console.log('Drop Collection error');
+            console.error(err);
+          }
+          return callback();
+        });
+      }, cb);
+
+    })
+
+  }
+
+}

package/test/Activity.js

@@ -1,167 +0,0 @@
-"use strict";
-
-var
-
-  should = require("should"),
-  config = require('./config')['test'],
-  mongoose = require('mongoose'),
-  clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true}),
-  Activity = mongoose.model('Activity'),
-  username = 'STING',
-  remoteAddress = '108.29.95.108',
-  nock = require('nock');
-
-describe.skip('Activity', function() {
-
-  before(function(done) {
-     if (mongoose.connection.db) return done();
-     mongoose.connect(config.db.uri, done);
-  });
-
-  before(function(done) {
-     clearDB(done);
-  });
-
-  it('adds a login success for a new user', function(done) {
-
-    var scope = nock('https://freegeoip.net/json')
-      .get('/' + remoteAddress)
-      .reply(200, {
-        ip: '108.29.95.108',
-        country_code: 'US',
-        country_name: 'United States',
-        region_code: 'NY',
-        region_name: 'New York',
-        city: 'New York',
-        zip_code: '10036',
-        time_zone: 'America/New_York',
-        latitude: 40.7605,
-        longitude: -73.9933,
-        metro_code: 501
-      });
-
-    Activity.add(username, 'LOGIN SUCCESS', remoteAddress, null, null, function(err, item) {
-      should.not.exist(err);
-      should.exist(item);
-      item.type.should.equal('LOGIN SUCCESS');
-      done();
-    });
-
-  });
-
-  it('adds a document download', function(done) {
-
-    var scope = nock('https://freegeoip.net/json')
-      .get('/' + remoteAddress)
-      .reply(200, {
-        ip: '108.29.95.108',
-        country_code: 'US',
-        country_name: 'United States',
-        region_code: 'NY',
-        region_name: 'New York',
-        city: 'New York',
-        zip_code: '10036',
-        time_zone: 'America/New_York',
-        latitude: 40.7605,
-        longitude: -73.9933,
-        metro_code: 501
-      });
-
-     Activity.add(username, 'DOCUMENT DOWNLOAD', remoteAddress, '/messages/123456789', 'report.pdf', function(err, item) {
-       should.not.exist(err);
-       should.exist(item);
-       item.type.should.equal('DOCUMENT DOWNLOAD');
-       done();
-     });
-
-  });
-
-  it('finds all activity for a user', function(done) {
-
-    var scope = nock('https://freegeoip.net/json')
-      .get('/' + remoteAddress)
-      .reply(200, {
-        ip: '108.29.95.108',
-        country_code: 'US',
-        country_name: 'United States',
-        region_code: 'NY',
-        region_name: 'New York',
-        city: 'New York',
-        zip_code: '10036',
-        time_zone: 'America/New_York',
-        latitude: 40.7605,
-        longitude: -73.9933,
-        metro_code: 501
-      });
-
-     Activity.list(username, 2, function(err, activity) {
-       should.not.exist(err);
-       should.exist(activity);
-       activity.items.length.should.equal(2);
-       done();
-     });
-
-  });
-
-  it('adds activity without a username', function(done) {
-
-    var scope = nock('https://freegeoip.net/json')
-      .get('/' + remoteAddress)
-      .reply(200, {
-        ip: '108.29.95.108',
-        country_code: 'US',
-        country_name: 'United States',
-        region_code: 'NY',
-        region_name: 'New York',
-        city: 'New York',
-        zip_code: '10036',
-        time_zone: 'America/New_York',
-        latitude: 40.7605,
-        longitude: -73.9933,
-        metro_code: 501
-      });
-
-    try {
-      Activity.add(null, 'LOGIN SUCCESS', remoteAddress, null, null, function(err, item) {
-        should.not.exist(item);
-        done();
-      });
-    }
-    catch (err) {
-      err.message.should.equal('username is required');
-      done();
-    }
-
-  });
-
-  it('adds activity with an invalid remoteAddress', function(done) {
-
-    var scope = nock('https://freegeoip.net/json')
-      .get('/' + remoteAddress)
-      .reply(200, {
-        ip: '108.29.95.108',
-        country_code: 'US',
-        country_name: 'United States',
-        region_code: 'NY',
-        region_name: 'New York',
-        city: 'New York',
-        zip_code: '10036',
-        time_zone: 'America/New_York',
-        latitude: 40.7605,
-        longitude: -73.9933,
-        metro_code: 501
-      });
-
-    Activity.add(username, 'LOGIN SUCCESS', 'UNKNOWN', null, null, function(err, item) {
-      should.not.exist(err);
-      should.exist(item);
-      item.type.should.equal('LOGIN SUCCESS');
-      var x = item.geolocation;
-      x.should.be.an.Object;
-      //item.geolocation.should.be.an.Object.and.be.empty;
-      done();
-    });
-
-  });
-
-});