@dhyasama/totem-merge 6.20.0 → 7.0.0

package/cli.js

@@ -14,17 +14,14 @@ mongoose.connection.on('error', function(err) {
   done(err);
 });
 
-mongoose.connect(config.db.uri, function (err, res) {
+mongoose.connect(config.db.uri).then(function() {
 
-  if (err) { done(err); }
-  else {
+  console.log('Connected to ' + config.db.uri.substring(config.db.uri.indexOf('@') + 1) + '\n');
 
-    console.log('Connected to ' + config.db.uri.substring(config.db.uri.indexOf('@') + 1) + '\n');
-
-    buildProgram();
-
-  }
+  buildProgram();
 
+}).catch(function(err) {
+  done(err);
 });
 
 // npm start p 5637a8c0281347cc0bbfca30 5637a8c0281347cc0bbfca3e jason

package/lib/helpers.js

@@ -74,7 +74,7 @@ var removeEntity = module.exports.removeEntity = function removeEntity(context,
 
   context.logger.writeToInfoLog('Removing entity - ' + entity._id.toString());
 
-  entity.remove(cb);
+  entity.deleteOne().then(function() { cb(null, entity); }).catch(cb);
 
 };
 

package/lib/organizations.js

@@ -159,8 +159,8 @@ var updateReferences = function updateReferences(context, target, source, merged
   if (!source) return cb(new Error('source is required'), null);
   if (!cb) throw new Error('cb is required');
 
-  var oldOrgId = ObjectId(source.id);
-  var newOrgId = ObjectId(target.id);
+  var oldOrgId = new ObjectId(source.id);
+  var newOrgId = new ObjectId(target.id);
 
   logger.writeToInfoLog('  Target: ' + newOrgId.toString());
   logger.writeToInfoLog('  Source: ' + oldOrgId.toString());
@@ -190,10 +190,9 @@ var updateCapTables = function updateCapTables(newOrgId, oldOrgId, cb) {
   var self = this;
 
   // Get all cap tables for this org
-  self.CapTable.collection.find({ 'organization': oldOrgId }).toArray(function(err, items) {
+  self.CapTable.collection.find({ 'organization': oldOrgId }).toArray().then(function(items) {
 
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    if (!items || items.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -209,18 +208,17 @@ var updateCapTables = function updateCapTables(newOrgId, oldOrgId, cb) {
 
     var queue = async.queue(function(task, callback) {
 
-      self.CapTable.collection.updateOne({ _id: task.id }, task.update, function(err, result) {
-        if (err) { return callback(err, null); }
-        else if (result) { updated.push(result); }
+      self.CapTable.collection.updateOne({ _id: task.id }, task.update).then(function(result) {
+        if (result) { updated.push(result); }
         return callback(null, result);
-      });
+      }).catch(function(err) { return callback(err, null); });
     }, 8);
 
     queue.drain = function() { return cb(null, updated); };
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 
@@ -231,10 +229,9 @@ var updateDeals = function updateDeals(newOrgId, oldOrgId, customerId, cb) {
   var self = this;
 
   // Get all deals for this org
-  self.Deal.collection.find({ 'organization': oldOrgId }).toArray(function(err, items) {
+  self.Deal.collection.find({ 'organization': oldOrgId }).toArray().then(function(items) {
 
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    if (!items || items.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -261,7 +258,7 @@ var updateDeals = function updateDeals(newOrgId, oldOrgId, customerId, cb) {
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 
@@ -272,10 +269,9 @@ var updateFinancials = function updateFinancials(newOrgId, oldOrgId, cb) {
   var self = this;
 
   // Get all financials for this org
-  self.Financials.collection.find({ 'organization': oldOrgId }).toArray(function(err, items) {
+  self.Financials.collection.find({ 'organization': oldOrgId }).toArray().then(function(items) {
 
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    if (!items || items.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -291,18 +287,17 @@ var updateFinancials = function updateFinancials(newOrgId, oldOrgId, cb) {
 
     var queue = async.queue(function(task, callback) {
 
-      self.Financials.collection.updateOne({ _id: task.id }, task.update, function(err, result) {
-        if (err) { return callback(err, null); }
-        else if (result) { updated.push(result); }
+      self.Financials.collection.updateOne({ _id: task.id }, task.update).then(function(result) {
+        if (result) { updated.push(result); }
         return callback(null, result);
-      });
+      }).catch(function(err) { return callback(err, null); });
     }, 8);
 
     queue.drain = function() { return cb(null, updated); };
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 
@@ -312,10 +307,9 @@ var updateMessages = function updateMessages(newOrgId, oldOrgId, cb) {
 
   var self = this;
 
-  self.Message.collection.find({ 'organization': oldOrgId }).toArray(function(err, items) {
+  self.Message.collection.find({ 'organization': oldOrgId }).toArray().then(function(items) {
 
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    if (!items || items.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -341,7 +335,7 @@ var updateMessages = function updateMessages(newOrgId, oldOrgId, cb) {
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 
@@ -351,10 +345,9 @@ var updateNews = function updateNews(newOrgId, oldOrgId, cb) {
 
   var self = this;
 
-  self.News.collection.find({ 'org': oldOrgId }).toArray(function(err, items) {
+  self.News.collection.find({ 'org': oldOrgId }).toArray().then(function(items) {
 
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    if (!items || items.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -380,7 +373,7 @@ var updateNews = function updateNews(newOrgId, oldOrgId, cb) {
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 
@@ -390,10 +383,9 @@ var updateOrganizations = function updateOrganizations(newOrgId, oldOrgId, cb) {
 
   var self = this;
 
-  self.Organization.collection.find({ $or: [{ 'merged': oldOrgId }, { 'operating.acquired.public.by': oldOrgId }, { 'operating.acquired.private.by': oldOrgId }, { 'related': oldOrgId }] }).toArray(function(err, items) {
+  self.Organization.collection.find({ $or: [{ 'merged': oldOrgId }, { 'operating.acquired.public.by': oldOrgId }, { 'operating.acquired.private.by': oldOrgId }, { 'related': oldOrgId }] }).toArray().then(function(items) {
 
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    if (!items || items.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -441,7 +433,7 @@ var updateOrganizations = function updateOrganizations(newOrgId, oldOrgId, cb) {
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 
@@ -452,10 +444,9 @@ var updateRounds = function updateRounds(newOrgId, oldOrgId, cb) {
   var self = this;
 
   // Get all rounds for this org
-  self.Round.collection.find({ 'organization': oldOrgId }).toArray(function(err, items) {
+  self.Round.collection.find({ 'organization': oldOrgId }).toArray().then(function(items) {
 
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    if (!items || items.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -471,18 +462,17 @@ var updateRounds = function updateRounds(newOrgId, oldOrgId, cb) {
 
     var queue = async.queue(function(task, callback) {
 
-      self.Round.collection.updateOne({ _id: task.id }, task.update, function(err, result) {
-        if (err) { return callback(err, null); }
-        else if (result) { updated.push(result); }
+      self.Round.collection.updateOne({ _id: task.id }, task.update).then(function(result) {
+        if (result) { updated.push(result); }
         return callback(null, result);
-      });
+      }).catch(function(err) { return callback(err, null); });
     }, 8);
 
     queue.drain = function() { return cb(null, updated); };
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 

package/lib/people.js

@@ -151,8 +151,8 @@ var updateReferences = function updateReferences(context, target, source, merged
   if (!source) return cb(new Error('source is required'), null);
   if (!cb) throw new Error('cb is required');
 
-  var oldPersonId = ObjectId(source.id);
-  var newPersonId = ObjectId(target.id);
+  var oldPersonId = new ObjectId(source.id);
+  var newPersonId = new ObjectId(target.id);
 
   console.log('  Target:', newPersonId.toString());
   console.log('  Source:', oldPersonId.toString());
@@ -192,10 +192,9 @@ var updateDeals = function updateDeals(newPersonId, oldPersonId, user, cb) {
   var self = this;
 
   // Get all deals for this person
-  self.Deal.collection.find({ $or: [{ 'source.person': oldPersonId }, { 'referrer.person': oldPersonId }]}).toArray(function(err, items) {
+  self.Deal.collection.find({ $or: [{ 'source.person': oldPersonId }, { 'referrer.person': oldPersonId }]}).toArray().then(function(items) {
 
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    if (!items || items.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -228,7 +227,7 @@ var updateDeals = function updateDeals(newPersonId, oldPersonId, user, cb) {
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 
@@ -241,10 +240,9 @@ var updateDocuments = function updateDocuments(newPersonId, oldPersonId, user, c
   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) {
+  self.Document.collection.find({ 'createdBy': oldPersonId }).toArray().then(function(items) {
 
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    if (!items || items.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -278,7 +276,7 @@ var updateDocuments = function updateDocuments(newPersonId, oldPersonId, user, c
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 
@@ -293,10 +291,9 @@ var updateMeetings = function updateMeetings(newPersonId, oldPersonId, user, cb)
   }
 
   // Get all meetings containing the old person id in people array
-  self.Meeting.collection.find({ 'people': oldPersonId }).toArray(function(err, items) {
+  self.Meeting.collection.find({ 'people': oldPersonId }).toArray().then(function(items) {
 
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    if (!items || items.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -318,18 +315,17 @@ 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.findByIdAndUpdate(task.id, task.update, { upsert: false, new: true }, function(err, result) {
-        if (err) { return callback(err, null); }
-        else if (result) { updated.push(result); }
+      self.Meeting.findByIdAndUpdate(task.id, task.update, { upsert: false, new: true }).then(function(result) {
+        if (result) { updated.push(result); }
         return callback(null, result);
-      });
+      }).catch(function(err) { return callback(err, null); });
     }, 8);
 
     queue.drain = function() { return cb(null, updated); };
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 
@@ -340,10 +336,9 @@ var updateLimitedPartners = function updateLimitedPartners(newPersonId, oldPerso
   var self = this;
 
   // Get all lps for this person
-  self.LimitedPartner.collection.find({ 'people': oldPersonId }).toArray(function(err, items) {
+  self.LimitedPartner.collection.find({ 'people': oldPersonId }).toArray().then(function(items) {
 
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    if (!items || items.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -379,7 +374,7 @@ var updateLimitedPartners = function updateLimitedPartners(newPersonId, oldPerso
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 
@@ -390,10 +385,9 @@ var updateMessages = function updateMessages(newPersonId, oldPersonId, user, cb)
   var self = this;
 
   // Get all messages for this person
-  self.Message.collection.find({ $or: [{ 'recipients.external': oldPersonId }, { 'recipients.internal': oldPersonId }] }).toArray(function(err, items) {
+  self.Message.collection.find({ $or: [{ 'recipients.external': oldPersonId }, { 'recipients.internal': oldPersonId }] }).toArray().then(function(items) {
 
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    if (!items || items.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -435,7 +429,7 @@ var updateMessages = function updateMessages(newPersonId, oldPersonId, user, cb)
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 
@@ -446,10 +440,9 @@ var updateNotes = function updateNotes(newPersonId, oldPersonId, user, cb) {
   var self = this;
 
   // Get all notes for this person
-  self.Note.collection.find({ 'createdBy': oldPersonId }).toArray(function(err, items) {
+  self.Note.collection.find({ 'createdBy': oldPersonId }).toArray().then(function(items) {
 
-    if (err) return cb(err, null);
-    else if (!items || items.length === 0) return cb(null, []);
+    if (!items || items.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -481,7 +474,7 @@ var updateNotes = function updateNotes(newPersonId, oldPersonId, user, cb) {
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 
@@ -492,10 +485,9 @@ var updateOrganizations = function updateOrganizations(newPersonId, oldPersonId,
   var self = this;
 
   // Get all orgs for this person
-  self.Organization.collection.find({ $or: [{ 'people.person': oldPersonId }, { 'chairs.first': oldPersonId }, { 'chairs.second': oldPersonId }] }).toArray(function(err, orgs) {
+  self.Organization.collection.find({ $or: [{ 'people.person': oldPersonId }, { 'chairs.first': oldPersonId }, { 'chairs.second': oldPersonId }] }).toArray().then(function(orgs) {
 
-    if (err) return cb(err, null);
-    else if (!orgs || orgs.length === 0) return cb(null, []);
+    if (!orgs || orgs.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -579,7 +571,7 @@ var updateOrganizations = function updateOrganizations(newPersonId, oldPersonId,
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 
@@ -590,10 +582,9 @@ var updatePeople = function updatePeople(newPersonId, oldPersonId, user, cb) {
   var self = this;
 
   // Update Person.related where oldPersonId appears
-  self.Person.collection.find({ 'related': oldPersonId }).toArray(function(err, people) {
+  self.Person.collection.find({ 'related': oldPersonId }).toArray().then(function(people) {
 
-    if (err) return cb(err, null);
-    else if (!people || people.length === 0) return cb(null, []);
+    if (!people || people.length === 0) return cb(null, []);
 
     var tasks = [];
     var updated = [];
@@ -628,7 +619,7 @@ var updatePeople = function updatePeople(newPersonId, oldPersonId, user, cb) {
 
     queue.push(tasks);
 
-  });
+  }).catch(function(err) { cb(err, null); });
 
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-merge",
-  "version": "6.20.0",
+  "version": "7.0.0",
   "description": "Org and person merging package",
   "main": "index.js",
   "scripts": {
@@ -12,15 +12,20 @@
     "registry": "https://registry.npmjs.org/"
   },
   "author": "Jason Reynolds",
+  "engines": {
+    "node": ">=18"
+  },
   "dependencies": {
     "@dhyasama/totem-logger": "^2.1.0",
-    "@dhyasama/totem-utilities": "^3.0.5",
+    "@dhyasama/totem-utilities": "^4.0.0",
     "async": "^2.6.4",
     "commander": "^2.20.3",
-    "mongoose": "~4.5.7",
     "phone-formatter": "0.0.2",
     "underscore": "^1.13.6"
   },
+  "peerDependencies": {
+    "mongoose": "^8.23.0"
+  },
   "devDependencies": {
     "@dhyasama/totem-models": "^11.125.0",
     "mocha": "^5.2.0",

package/test/index.js

@@ -29,9 +29,9 @@ var person1, person2, person3;
 describe('Merge', function() {
 
   // connect to test db
-  before(function(done) {
-    if (mongoose.connection.db) return done();
-    mongoose.connect(config.db.uri, done);
+  before(async function() {
+    if (mongoose.connection.db) return;
+    await mongoose.connect(config.db.uri);
   });
 
   // clear test db
@@ -631,16 +631,14 @@ describe('Merge', function() {
 
             org6 = result2;
 
-            News.findById(news.id, function(err, result3) {
-
-              should.not.exist(err);
+            News.findById(news.id).exec().then(function(result3) {
               should.exist(result3);
 
               result3.org.toString().should.equal(org6._id.toString());
 
               return done();
 
-            });
+            }).catch(done);
 
           });