@dhyasama/totem-merge 6.14.0 → 6.16.0

package/index.js

@@ -21,6 +21,7 @@ var Merge = function(mongoose, config) {
   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/people.js

@@ -90,8 +90,6 @@ var mergeSourceIntoTarget = function mergeEntities(target, source, cb) {
     'deleted',
     'entered',
     '__v',
-    'status',
-    'lps',
     'subscriptions',
     'account',
     'sources'
@@ -99,7 +97,7 @@ var mergeSourceIntoTarget = function mergeEntities(target, source, cb) {
 
   var mergeSources = function mergeSources(target, source) {
 
-    // Note interaction counts are not combined here but will be updated on next calendar pull
+    // Note: source interaction counts are not merged; they refresh via downstream sync
 
     var targetSources = target.sources || [];
     var sourceSources = source.sources || [];
@@ -240,8 +238,10 @@ var updateDocuments = function updateDocuments(newPersonId, oldPersonId, user, c
 
   var self = this;
 
-  // Get all documents for this person
-  self.Document.collection.find({ $or: [{ 'source.person': oldPersonId }, { 'referrer.person': oldPersonId }]}).toArray(function(err, items) {
+  if (!self.Document || !self.Document.collection) { return cb(null, []); }
+
+  // Get all documents created by this person
+  self.Document.collection.find({ 'createdBy': oldPersonId }).toArray(function(err, items) {
 
     if (err) return cb(err, null);
     else if (!items || items.length === 0) return cb(null, []);
@@ -253,13 +253,14 @@ var updateDocuments = function updateDocuments(newPersonId, oldPersonId, user, c
 
       var setObj = {};
 
-      if (item.source && item.source.person && item.source.person.toString() === oldPersonId.toString()) { setObj.source = { person: newPersonId }; }
-      if (item.referrer && item.referrer.person && item.referrer.person.toString() === oldPersonId.toString()) { setObj.referrer = { person: newPersonId }; }
+      if (item.createdBy && item.createdBy.toString && item.createdBy.toString() === oldPersonId.toString()) { setObj.createdBy = newPersonId; }
 
-      tasks.push({
-        id: item._id,
-        update: { $set: setObj }
-      });
+      if (Object.keys(setObj).length > 0) {
+        tasks.push({
+          id: item._id,
+          update: { $set: setObj }
+        });
+      }
 
     });
 
@@ -317,7 +318,7 @@ var updateMeetings = function updateMeetings(newPersonId, oldPersonId, user, cb)
     console.log('    Found ' + tasks.length + ' meeting references to update');
 
     var queue = async.queue(function(task, callback) {
-      self.Meeting.modifyById(task.id, task.update, function(err, result) {
+      self.Meeting.findByIdAndUpdate(task.id, task.update, { upsert: false, new: true }, function(err, result) {
         if (err) { return callback(err, null); }
         else if (result) { updated.push(result); }
         return callback(null, result);
@@ -491,7 +492,7 @@ var updateOrganizations = function updateOrganizations(newPersonId, oldPersonId,
   var self = this;
 
   // Get all orgs for this person
-  self.Organization.collection.find({ $or: [{ 'people.person': oldPersonId }, { 'chair.first': oldPersonId }, { 'chair.second': oldPersonId }] }).toArray(function(err, orgs) {
+  self.Organization.collection.find({ $or: [{ 'people.person': oldPersonId }, { 'chairs.first': oldPersonId }, { 'chairs.second': oldPersonId }] }).toArray(function(err, orgs) {
 
     if (err) return cb(err, null);
     else if (!orgs || orgs.length === 0) return cb(null, []);
@@ -525,13 +526,14 @@ var updateOrganizations = function updateOrganizations(newPersonId, oldPersonId,
       // and be unable to determine which data to keep. We still can't know for sure, but let's default to keeping the
       // target/new person's data. We do that by removing the source/old person here and then map the target/new person id.
 
-      var oldPerson = _.find(org.people, function(person) { return person.person.toString() === oldPersonId.toString(); });
-      var newPerson = _.find(org.people, function(person) { return person.person.toString() === newPersonId.toString(); });
+      var peopleArr = org.people || [];
+      var oldPerson = _.find(peopleArr, function(person) { return person.person && person.person.toString() === oldPersonId.toString(); });
+      var newPerson = _.find(peopleArr, function(person) { return person.person && person.person.toString() === newPersonId.toString(); });
 
       // Both people are at this org
       if (oldPerson && newPerson) {
-        org.people = _.reject(org.people, function(person) {
-          return person.person.toString() === oldPersonId.toString();
+        org.people = _.reject(peopleArr, function(person) {
+          return person.person && person.person.toString() === oldPersonId.toString();
         });
       }
 
@@ -545,14 +547,14 @@ var updateOrganizations = function updateOrganizations(newPersonId, oldPersonId,
       // note this must be done before mapping the old id to the new id
       checkIfBothPeopleAtOrg(org);
 
-      setObj.people = _.map(org.people, function(person) {
-        if (person.person.toString() === oldPersonId.toString()) { person.person = newPersonId; }
+      setObj.people = _.map(org.people || [], function(person) {
+        if (person && person.person && person.person.toString() === oldPersonId.toString()) { person.person = newPersonId; }
         return person;
       });
 
-      setObj.chairs = _.map(org.chairs, function(chair) {
-        if (chair.first && chair.first.toString() === oldPersonId.toString()) { chair.first = newPersonId; }
-        if (chair.second && chair.second.toString() === oldPersonId.toString()) { chair.second = newPersonId; }
+      setObj.chairs = _.map(org.chairs || [], function(chair) {
+        if (chair && chair.first && chair.first.toString() === oldPersonId.toString()) { chair.first = newPersonId; }
+        if (chair && chair.second && chair.second.toString() === oldPersonId.toString()) { chair.second = newPersonId; }
         return chair;
       });
 
@@ -587,26 +589,26 @@ var updatePeople = function updatePeople(newPersonId, oldPersonId, user, cb) {
 
   var self = this;
 
-  // Get all orgs for this person
-  self.Organization.collection.find({ 'related': oldPersonId }).toArray(function(err, items) {
+  // Update Person.related where oldPersonId appears
+  self.Person.collection.find({ 'related': oldPersonId }).toArray(function(err, people) {
 
     if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    else if (!people || people.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
 
-    _.each(items, function(item) {
+    _.each(people, function(personDoc) {
 
       var setObj = {};
 
-      setObj.related = _.map(item.related, function(person) {
-        if (person.toString() === oldPersonId.toString()) { person = newPersonId; }
+      setObj.related = _.map(personDoc.related || [], function(person) {
+        if (person && person.toString() === oldPersonId.toString()) { person = newPersonId; }
         return person;
       });
 
       tasks.push({
-        id: item._id,
+        id: personDoc._id,
         update: { $set: setObj }
       });
 
@@ -615,7 +617,7 @@ var updatePeople = function updatePeople(newPersonId, oldPersonId, user, cb) {
     console.log('    Found ' + tasks.length + ' person references to update');
 
     var queue = async.queue(function(task, callback) {
-      self.Organization.modifyById(task.id, task.update, function(err, result) {
+      self.Person.modifyById(task.id, task.update, function(err, result) {
         if (err) { return callback(err, null); }
         else if (result) { updated.push(result); }
         return callback(null, result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-merge",
-  "version": "6.14.0",
+  "version": "6.16.0",
   "description": "Org and person merging package",
   "main": "index.js",
   "scripts": {

package/test/index.js

@@ -15,7 +15,7 @@ var clearDB = require('mocha-mongoose')(config.db.uri, {noClear: true});
 var Merge = require('../index.js');
 var merge;
 var Deal = mongoose.model('Deal');
-var Interaction = mongoose.model('Interaction');
+// var Interaction = mongoose.model('Interaction'); // deprecated
 var List = mongoose.model('List');
 var Message = mongoose.model('Message');
 var News = mongoose.model('News');
@@ -305,29 +305,7 @@ describe('Merge', function() {
 
   });
 
-  // Interaction prep
-  before(function(done) {
-
-    var interaction = new Interaction({
-      calendarEventId: new mongoose.Types.ObjectId(),
-      providerEventId: 'ABC123',
-      totemCustomerId: customer._id,
-      summary: 'Test',
-      startTime: new Date(),
-      recurring: false,
-      attendees: {
-        internal: [person2],
-        external: [person1, person3]
-      }
-    });
-
-    Interaction.upsert(interaction, function(err, result) {
-      should.not.exist(err);
-      should.exist(result);
-      return done();
-    });
-
-  });
+  // Interaction prep removed (replaced by meetings schema)
 
   describe('Orgs', function() {