@dhyasama/totem-merge 6.16.0 → 6.18.0

package/lib/helpers.js

@@ -24,17 +24,32 @@ var mergeObjects = function mergeObjects(target, source, doNotMergeKeys) {
   if (source == 'undefined') return;
   else if (source == 'MongooseDocument { undefined }') return;
 
-  var jsonSource = JSON.parse(JSON.stringify(source));
+  // Safely convert potential Mongoose documents to plain objects without
+  // invoking virtual getters, which can throw during serialization
+  var toPlainObject = function toPlainObject(value) {
+    if (!value) return value;
+    if (typeof value.toObject === 'function') {
+      try {
+        return value.toObject({ virtuals: false, getters: false, depopulate: true, minimize: false });
+      }
+      catch (e) {
+        // fall through to JSON stringify fallback below
+      }
+    }
+    try { return JSON.parse(JSON.stringify(value)); } catch (e) { return {}; }
+  };
+
+  var jsonSource = toPlainObject(source);
 
   for (var key in jsonSource) {
 
     if (doNotMergeKeys.indexOf(key) >= 0) continue;
 
-    var sourceItem = source[key];
+    var sourceItem = jsonSource[key];
     if (!sourceItem) continue;
 
     var type = typeOf(target[key]);
-    if (type == 'null') type = typeOf(source[key]);
+    if (type == 'null') type = typeOf(sourceItem);
 
     if (type == 'object') {
       mergeObjects(target[key], sourceItem, doNotMergeKeys);
@@ -71,22 +86,11 @@ var typeOf = function typeOf(input) {
 // Deduping with some type support
 var unique = function unique(array, key) {
 
-  // translate each of these to "company"
-  var companyKeys = [
-    'first',
-    'second',
-    'boards',
-    'leadership',
-    'pcs',
-    'investments'
-  ];
+  // legacy keys mapped to 'company' removed as schemas evolved
 
   // for arrays of objects, specify the object key to use for comparison
   if (key == 'people') key = 'person';
   else if (key == 'phone') key = 'number';
-  else if (companyKeys.indexOf(key) >= 0) key = 'company';
-  else if (key == 'orgs') key = 'org';
-  else if (key == 'investedIn') key = 'id';
 
   array = _.compact(array);
 

package/lib/organizations.js

@@ -109,7 +109,7 @@ var mergeSourceIntoTarget = function mergeEntities(target, source, cb) {
     '__v'
   ];
 
-  helpers.mergeObjects(target.toObject(), source.toObject(), doNotMergeKeys);
+  helpers.mergeObjects(target, source, doNotMergeKeys);
 
   // keep a list of copied orgs
   target.merge(source.id);

package/lib/people.js

@@ -116,7 +116,7 @@ var mergeSourceIntoTarget = function mergeEntities(target, source, cb) {
 
   };
 
-  helpers.mergeObjects(target.toObject(), source.toObject(), doNotMergeKeys);
+  helpers.mergeObjects(target, source, doNotMergeKeys);
 
   target.sources = mergeSources(target, source);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-merge",
-  "version": "6.16.0",
+  "version": "6.18.0",
   "description": "Org and person merging package",
   "main": "index.js",
   "scripts": {
@@ -22,7 +22,7 @@
     "underscore": "^1.13.6"
   },
   "devDependencies": {
-    "@dhyasama/totem-models": "^11.110.0",
+    "@dhyasama/totem-models": "^11.111.0",
     "mocha": "^5.2.0",
     "mocha-mongoose": "^1.1.1",
     "should": "^8.2.2"

package/test/index.js

@@ -179,7 +179,6 @@ describe('Merge', function() {
       should.not.exist(err);
       should.exist(newOrg1);
 
-      // getbyid to populate investedIn
       Organization.getById(newOrg1.id, { CUSTOMER_ID: customer._id, role: 'none' }, function(err, result1) {
 
         should.not.exist(err);
@@ -329,8 +328,6 @@ describe('Merge', function() {
       config.flag = false;
       merge = new Merge(mongoose, config);
 
-      org1.investedIn = [];
-
       Organization.upsert(org2, 'testy', function(err, result) {
 
         should.not.exist(err);