@dhyasama/totem-merge 6.2.0 → 6.3.0

package/lib/helpers.js

@@ -1,7 +1,7 @@
 "use strict";
 
 var _ = require('underscore');
-var utilities = require('@dhyasama/ffvc-utilities');
+var utilities = require('@dhyasama/totem-utilities');
 var phoneFormatter = require('phone-formatter');
 
 var createSnapshot = module.exports.createSnapshot = function createSnapshot(context, collectionName, doc, createdBy, cb) {

package/lib/organizations.js

@@ -1,10 +1,11 @@
 "use strict";
 
-var async = require('async');
-var _ = require('underscore');
-var helpers = require('./helpers');
-var ObjectId = require('mongodb').ObjectID;
-var logger;
+let async = require('async');
+let _ = require('underscore');
+let helpers = require('./helpers');
+let mongoose = require('mongoose');
+let ObjectId = mongoose.Types.ObjectId;
+let logger;
 
 var merge = function merge(context, target, source, mergedBy, cb) {
 

package/lib/people.js

@@ -1,9 +1,10 @@
 "use strict";
 
-var async = require('async');
-var _ = require('underscore');
-var helpers = require('./helpers');
-var ObjectId = require('mongodb').ObjectID;
+let async = require('async');
+let _ = require('underscore');
+let helpers = require('./helpers');
+let mongoose = require('mongoose');
+let ObjectId = mongoose.Types.ObjectId;
 
 var merge = function merge(context, target, source, mergedBy, cb) {
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-merge",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "description": "Org and person merging package",
   "main": "index.js",
   "scripts": {
@@ -13,7 +13,8 @@
   },
   "author": "Jason Reynolds",
   "dependencies": {
-    "@dhyasama/totem-logger": "^1.2.0",
+    "@dhyasama/totem-utilities": "^3.0.0",
+    "@dhyasama/totem-logger": "^2.0.0",
     "async": "^2.0.0-rc.3",
     "commander": "^2.14.1",
     "mongoose": "~4.5.7",
@@ -21,7 +22,7 @@
     "underscore": "^1.8.3"
   },
   "devDependencies": {
-    "@dhyasama/totem-models": "^6.0.0",
+    "@dhyasama/totem-models": "^8.0.0",
     "mocha": "^5.2.0",
     "mocha-mongoose": "^1.1.1",
     "should": "^8.2.2"

package/test/index.js

@@ -488,7 +488,7 @@ describe('Merge', function() {
         stage: 'New'
       });
 
-      Deal.upsert(deal, new mongoose.Types.ObjectId(), function(err, result1) {
+      Deal.upsert(deal, { CUSTOMER_ID: customer._id, account: new mongoose.Types.ObjectId() }, function(err, result1) {
 
         should.not.exist(err);
         should.exist(result1);