@dhyasama/totem-merge 6.12.0 → 6.14.0

package/index.js

@@ -13,17 +13,14 @@ var Merge = function(mongoose, config) {
   this.Deal = mongoose.model('Deal');
   this.Document = mongoose.model('Document');
   this.Financials = mongoose.model('Financials');
-  this.Flag = mongoose.model('Flag');
-  this.Interaction = mongoose.model('Interaction');
   this.LimitedPartner = mongoose.model('LimitedPartner');
-  this.List = mongoose.model('List');
   this.Message = mongoose.model('Message');
+  this.Meeting = mongoose.model('Meeting');
   this.News = mongoose.model('News');
   this.Note = mongoose.model('Note');
   this.Organization = mongoose.model('Organization');
   this.Person = mongoose.model('Person');
   this.Round = mongoose.model('Round');
-  this.Snapshot = mongoose.model('Snapshot');
 
   // can choose to flag an entity as needing to be merged rather than actually merging it
   // particularly useful for automated processes, e.g., a batch import that detects dupes

package/lib/organizations.js

@@ -109,7 +109,7 @@ var mergeSourceIntoTarget = function mergeEntities(target, source, cb) {
     '__v'
   ];
 
-  helpers.mergeObjects(target, source, doNotMergeKeys);
+  helpers.mergeObjects(target.toObject(), source.toObject(), doNotMergeKeys);
 
   // keep a list of copied orgs
   target.merge(source.id);
@@ -175,7 +175,6 @@ var updateReferences = function updateReferences(context, target, source, merged
     updateCapTables.bind(context, newOrgId, oldOrgId),
     updateDeals.bind(context, newOrgId, oldOrgId, customerId),
     updateFinancials.bind(context, newOrgId, oldOrgId),
-    updateLists.bind(context, newOrgId, oldOrgId),
     updateMessages.bind(context, newOrgId, oldOrgId),
     updateNews.bind(context, newOrgId, oldOrgId),
     updateOrganizations.bind(context, newOrgId, oldOrgId),
@@ -307,52 +306,6 @@ var updateFinancials = function updateFinancials(newOrgId, oldOrgId, cb) {
 
 };
 
-var updateLists = function updateLists(newOrgId, oldOrgId, cb) {
-
-  logger.writeToInfoLog('  Updating lists...');
-
-  var self = this;
-
-  self.List.collection.find({ 'organizations': oldOrgId }).toArray(function(err, items) {
-
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
-
-    var tasks = [];
-    var updated = [];
-
-    _.each(items, function(item) {
-
-      var orgs = _.map(item.organizations, function(o) {
-        if (o.toString() === oldOrgId.toString()) { o = newOrgId; }
-        return o;
-      });
-
-      tasks.push({
-        id: item._id,
-        update: { $set: { organizations: orgs } }
-      });
-
-    });
-
-    logger.writeToInfoLog('    Found ' + tasks.length + ' list references to update');
-
-    var queue = async.queue(function(task, callback) {
-      self.List.modifyById(task.id, task.update, function(err, result) {
-        if (err) { return callback(err, null); }
-        else if (result) { updated.push(result); }
-        return callback(null, result);
-      });
-    }, 8);
-
-    queue.drain = function() { return cb(null, updated); };
-
-    queue.push(tasks);
-
-  });
-
-};
-
 var updateMessages = function updateMessages(newOrgId, oldOrgId, cb) {
 
   logger.writeToInfoLog('  Updating messages...');

package/lib/people.js

@@ -118,7 +118,7 @@ var mergeSourceIntoTarget = function mergeEntities(target, source, cb) {
 
   };
 
-  helpers.mergeObjects(target, source, doNotMergeKeys);
+  helpers.mergeObjects(target.toObject(), source.toObject(), doNotMergeKeys);
 
   target.sources = mergeSources(target, source);
 
@@ -171,14 +171,10 @@ var updateReferences = function updateReferences(context, target, source, merged
 
     updateDocuments.bind(context, newPersonId, oldPersonId, null),
 
-    updateFlags.bind(context, newPersonId, oldPersonId, username),
-
-    updateInteractions.bind(context, newPersonId, oldPersonId, username),
+    updateMeetings.bind(context, newPersonId, oldPersonId, username),
 
     updateLimitedPartners.bind(context, newPersonId, oldPersonId, mergedBy),
 
-    updateLists.bind(context, newPersonId, oldPersonId, null),
-
     updateMessages.bind(context, newPersonId, oldPersonId, null),
 
     updateNotes.bind(context, newPersonId, oldPersonId, username),
@@ -285,60 +281,18 @@ var updateDocuments = function updateDocuments(newPersonId, oldPersonId, user, c
 
 };
 
-var updateFlags = function updateFlags(newPersonId, oldPersonId, user, cb) {
+var updateMeetings = function updateMeetings(newPersonId, oldPersonId, user, cb) {
 
-  console.log('  Updating flags...');
+  console.log('  Updating meetings...');
 
   var self = this;
 
-  // Get all flags for this person
-  self.Flag.collection.find({ 'createdBy': oldPersonId }).toArray(function(err, items) {
-
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
-
-    var tasks = [];
-    var updated = [];
-
-    _.each(items, function(item) {
-
-      var setObj = {};
-
-      if (item.createdBy.toString() === oldPersonId.toString()) { setObj.createdBy = newPersonId; }
-
-      tasks.push({
-        id: item._id,
-        update: { $set: setObj }
-      });
-
-    });
-
-    console.log('    Found ' + tasks.length + ' flag references to update');
-
-    var queue = async.queue(function(task, callback) {
-      self.Flag.modifyById(task.id, task.update, function(err, result) {
-        if (err) { return callback(err, null); }
-        else if (result) { updated.push(result); }
-        return callback(null, result);
-      });
-    }, 8);
-
-    queue.drain = function() { return cb(null, updated); };
-
-    queue.push(tasks);
-
-  });
-
-};
-
-var updateInteractions = function updateInteractions(newPersonId, oldPersonId, user, cb) {
-
-  console.log('  Updating interactions...');
-
-  var self = this;
+  if (!self.Meeting || !self.Meeting.collection) {
+    return cb(null, []);
+  }
 
-  // Get all interactions for this person
-  self.Interaction.collection.find({ $or: [{ 'attendees.external': oldPersonId }, { 'attendees.internal': oldPersonId }] }).toArray(function(err, items) {
+  // Get all meetings containing the old person id in people array
+  self.Meeting.collection.find({ 'people': oldPersonId }).toArray(function(err, items) {
 
     if (err) return cb(err, null);
     else if (!items || items.length === 0) return cb(null, []);
@@ -348,31 +302,22 @@ var updateInteractions = function updateInteractions(newPersonId, oldPersonId, u
 
     _.each(items, function(item) {
 
-      item.attendees.internal = _.map(item.attendees.internal, function(attendee) {
-        if (attendee.toString() === oldPersonId.toString()) { attendee = newPersonId; }
-        return attendee;
-      });
-
-      item.attendees.external = _.map(item.attendees.external, function(attendee) {
-        if (attendee.toString() === oldPersonId.toString()) { attendee = newPersonId; }
-        return attendee;
+      item.people = _.map(item.people, function(person) {
+        if (person.toString() === oldPersonId.toString()) { person = newPersonId; }
+        return person;
       });
 
       tasks.push({
         id: item._id,
-        update: { $set: {
-            'attendees.internal': item.attendees.internal,
-            'attendees.external': item.attendees.external
-          }
-        }
+        update: { $set: { 'people': item.people } }
       });
 
     });
 
-    console.log('    Found ' + tasks.length + ' interaction references to update');
+    console.log('    Found ' + tasks.length + ' meeting references to update');
 
     var queue = async.queue(function(task, callback) {
-      self.Interaction.modifyById(task.id, task.update, function(err, result) {
+      self.Meeting.modifyById(task.id, task.update, function(err, result) {
         if (err) { return callback(err, null); }
         else if (result) { updated.push(result); }
         return callback(null, result);
@@ -437,57 +382,6 @@ var updateLimitedPartners = function updateLimitedPartners(newPersonId, oldPerso
 
 };
 
-var updateLists = function updateLists(newPersonId, oldPersonId, user, cb) {
-
-  console.log('  Updating lists...');
-
-  var self = this;
-
-  // Get all lists for this person
-  self.List.collection.find({ $or: [{ 'people': oldPersonId }, { 'createdBy': oldPersonId }] }).toArray(function(err, items) {
-
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
-
-    var tasks = [];
-    var updated = [];
-
-    _.each(items, function(item) {
-
-      var setObj = {};
-
-      if (item.createdBy.toString() === oldPersonId.toString()) { setObj.createdBy = newPersonId; }
-
-      setObj.people = _.map(item.people, function(person) {
-        if (person.toString() === oldPersonId.toString()) { person = newPersonId; }
-        return person;
-      });
-
-      tasks.push({
-        id: item._id,
-        update: { $set: setObj }
-      });
-
-    });
-
-    console.log('    Found ' + tasks.length + ' list references to update');
-
-    var queue = async.queue(function(task, callback) {
-      self.List.modifyById(task.id, task.update, function(err, result) {
-        if (err) { return callback(err, null); }
-        else if (result) { updated.push(result); }
-        return callback(null, result);
-      });
-    }, 8);
-
-    queue.drain = function() { return cb(null, updated); };
-
-    queue.push(tasks);
-
-  });
-
-};
-
 var updateMessages = function updateMessages(newPersonId, oldPersonId, user, cb) {
 
   console.log('  Updating messages...');

package/package.json

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