@dhyasama/totem-merge 6.4.0 → 6.6.0

package/lib/helpers.js

@@ -97,10 +97,10 @@ var unique = function unique(array, key) {
       val = item;
     }
     else if (typeOf(item) == 'object') {
-      val = key == 'number' ? phoneFormatter.normalize(item[key]) : item[key];
+      val = key == 'number' && item[key] ? phoneFormatter.normalize(item[key]) : item[key];
     }
     else {
-      val = key == 'number' ? phoneFormatter.normalize(item) : item;
+      val = key == 'number' && item[key] ? phoneFormatter.normalize(item) : item;
     }
 
     // take one last shot

package/lib/organizations.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 let async = require('async');
 let _ = require('underscore');
@@ -43,6 +43,7 @@ var merge = function merge(context, target, source, mergedBy, customerId, cb) {
     });
 
   }
+
   else {
 
     // mergedBy can be either an account or a username
@@ -70,7 +71,7 @@ var merge = function merge(context, target, source, mergedBy, customerId, cb) {
       saveOrganization.bind(null, target, username),
 
       // Change source references to target
-      updateReferences.bind(null, context, target, source, mergedBy, customerId)
+      updateReferences.bind(null, context, target, source, mergedBy)
 
     ], function(err, results) {
 
@@ -125,7 +126,7 @@ var mergeSourceIntoTarget = function mergeEntities(target, source, cb) {
 
   // mark as entered by system
   target.entered = {
-    by: 'ff-merge',
+    by: 'merge-package',
     on: new Date()
   };
 
@@ -148,7 +149,7 @@ var verifyOkToMerge = function verifyOkToMerge(target, source, cb) {
 
 };
 
-var updateReferences = function updateReferences(context, target, source, mergedBy, customerId, cb) {
+var updateReferences = function updateReferences(context, target, source, mergedBy, cb) {
 
   logger.writeToInfoLog('Update references...');
 
@@ -171,16 +172,60 @@ var updateReferences = function updateReferences(context, target, source, merged
   // and get cleaned and updated on each pull anyway
 
   async.parallel([
-    updateDeals.bind(context, newOrgId, oldOrgId, mergedBy, customerId),
-    updateLists.bind(context, newOrgId, oldOrgId, username),
-    updateMessages.bind(context, newOrgId, oldOrgId, username),
-    updateNews.bind(context, newOrgId, oldOrgId, username),
-    updateOrganizations.bind(context, newOrgId, oldOrgId, username)
-  ], cb)
+    updateCapTables.bind(context, newOrgId, oldOrgId),
+    updateDeals.bind(context, newOrgId, oldOrgId),
+    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),
+    updateRounds.bind(context, newOrgId, oldOrgId)
+  ], cb);
 
 };
 
-var updateDeals = function updateDeals(newOrgId, oldOrgId, user, customerId, cb) {
+var updateCapTables = function updateCapTables(newOrgId, oldOrgId, cb) {
+
+  logger.writeToInfoLog('  Updating cap tables...');
+
+  var self = this;
+
+  // Get all cap tables for this org
+  self.CapTable.collection.find({ 'organization': 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) {
+      tasks.push({
+        id: item._id,
+        update: { $set: { organization: newOrgId } }
+      });
+    });
+
+    logger.writeToInfoLog('    Found ' + tasks.length + ' cap table references to update');
+
+    var queue = async.queue(function(task, callback) {
+
+      self.CapTable.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 updateDeals = function updateDeals(newOrgId, oldOrgId, cb) {
 
   logger.writeToInfoLog('  Updating deals...');
 
@@ -206,7 +251,48 @@ var updateDeals = function updateDeals(newOrgId, oldOrgId, user, customerId, cb)
 
     var queue = async.queue(function(task, callback) {
 
-      self.Deal.modifyById(task.id, task.update, { CUSTOMER_ID: customerId }, function(err, result) {
+      self.Deal.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 updateFinancials = function updateFinancials(newOrgId, oldOrgId, cb) {
+
+  logger.writeToInfoLog('  Updating financials...');
+
+  var self = this;
+
+  // Get all financials for this org
+  self.Financials.collection.find({ 'organization': 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) {
+      tasks.push({
+        id: item._id,
+        update: { $set: { organization: newOrgId } }
+      });
+    });
+
+    logger.writeToInfoLog('    Found ' + tasks.length + ' financials references to update');
+
+    var queue = async.queue(function(task, callback) {
+
+      self.Financials.modifyById(task.id, task.update, function(err, result) {
         if (err) { return callback(err, null); }
         else if (result) { updated.push(result); }
         return callback(null, result);
@@ -221,7 +307,7 @@ var updateDeals = function updateDeals(newOrgId, oldOrgId, user, customerId, cb)
 
 };
 
-var updateLists = function updateLists(newOrgId, oldOrgId, user, cb) {
+var updateLists = function updateLists(newOrgId, oldOrgId, cb) {
 
   logger.writeToInfoLog('  Updating lists...');
 
@@ -267,7 +353,7 @@ var updateLists = function updateLists(newOrgId, oldOrgId, user, cb) {
 
 };
 
-var updateMessages = function updateMessages(newOrgId, oldOrgId, user, cb) {
+var updateMessages = function updateMessages(newOrgId, oldOrgId, cb) {
 
   logger.writeToInfoLog('  Updating messages...');
 
@@ -306,7 +392,7 @@ var updateMessages = function updateMessages(newOrgId, oldOrgId, user, cb) {
 
 };
 
-var updateNews = function updateNews(newOrgId, oldOrgId, user, cb) {
+var updateNews = function updateNews(newOrgId, oldOrgId, cb) {
 
   logger.writeToInfoLog('  Updating news...');
 
@@ -345,7 +431,7 @@ var updateNews = function updateNews(newOrgId, oldOrgId, user, cb) {
 
 };
 
-var updateOrganizations = function updateOrganizations(newOrgId, oldOrgId, user, cb) {
+var updateOrganizations = function updateOrganizations(newOrgId, oldOrgId, cb) {
 
   logger.writeToInfoLog('  Updating orgs...');
 
@@ -373,11 +459,11 @@ var updateOrganizations = function updateOrganizations(newOrgId, oldOrgId, user,
         return o;
       });
 
-      var publicBy = item["operating.acquired.public.by"];
-      var privateBy = item["operating.acquired.private.by"];
+      var publicBy = item['operating.acquired.public.by'];
+      var privateBy = item['operating.acquired.private.by'];
 
-      if (publicBy && publicBy.toString() === oldOrgId) { setObj["operating.acquired.public.by"] = newOrgId; }
-      if (privateBy && privateBy.toString() === oldOrgId) { setObj["operating.acquired.private.by"] = newOrgId; }
+      if (publicBy && publicBy.toString() === oldOrgId) { setObj['operating.acquired.public.by'] = newOrgId; }
+      if (privateBy && privateBy.toString() === oldOrgId) { setObj['operating.acquired.private.by'] = newOrgId; }
 
       tasks.push({
         id: item._id,
@@ -406,4 +492,45 @@ var updateOrganizations = function updateOrganizations(newOrgId, oldOrgId, user,
 
 };
 
+var updateRounds = function updateRounds(newOrgId, oldOrgId, cb) {
+
+  logger.writeToInfoLog('  Updating rounds...');
+
+  var self = this;
+
+  // Get all rounds for this org
+  self.Round.collection.find({ 'organization': 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) {
+      tasks.push({
+        id: item._id,
+        update: { $set: { organization: newOrgId } }
+      });
+    });
+
+    logger.writeToInfoLog('    Found ' + tasks.length + ' round references to update');
+
+    var queue = async.queue(function(task, callback) {
+
+      self.Round.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);
+
+  });
+
+};
+
 module.exports.merge = merge;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-merge",
-  "version": "6.4.0",
+  "version": "6.6.0",
   "description": "Org and person merging package",
   "main": "index.js",
   "engines": {
@@ -22,10 +22,10 @@
     "commander": "^2.20.3",
     "mongoose": "~4.5.7",
     "phone-formatter": "0.0.2",
-    "underscore": "^1.8.3"
+    "underscore": "^1.13.2"
   },
   "devDependencies": {
-    "@dhyasama/totem-models": "^8.0.4",
+    "@dhyasama/totem-models": "^9.51.0",
     "mocha": "^5.2.0",
     "mocha-mongoose": "^1.1.1",
     "should": "^8.2.2"