Merge pull request #72 from formio/fix-created-comparison

Fixing the compaison for dates.

Author: travist

commands/clone.js

@@ -16,6 +16,7 @@ module.exports = function(program, next) {
     .option('-d, --dst-project <project_id>', 'The Destination project ID')
     .option('-p, --project <project_id>', 'The project ID that you wish to clone from one database to another.')
     .option('--forms <forms>', 'A comma-separated value of all the Form ID\'s you wish to clone. If included, then only the provided forms will be cloned.', false)
+    .option('--exclude <forms>', 'A comma-separated value of all the Form ID\'s you wish to exclude in the clone process.', false)
     .option('-u, --update-existing', 'Update existing Projects and Forms instead of cloning (No OSS).', true)
     .option('--update-existing-submissions', 'Update existing Submissions when found in the destination (slows down the clone process if set).', false)
     .option('--src-ca <source_ca>', 'The TLS certificate authority for the source mongo url')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/cli",
-  "version": "2.3.0",
+  "version": "2.3.1-rc.1",
   "description": "The Form.io Command Line Interface application.",
   "main": "index.js",
   "scripts": {

src/Cloner.js

@@ -32,6 +32,7 @@ class Cloner {
    * @param {*} options.includeSubmissionRevisions - Include submission revisions when cloning submissions.
    * @param {*} options.updateExistingSubmissions - Update existing submissions when found in the destination (performs a complete re-clone).
    * @param {*} options.forms - A comma-separated value of all the Form ID's you wish to clone. If included, then only the provided forms will be cloned.
+   * @param {*} options.exclude - A comma-separated value of all the Form ID's you wish to exclude from cloning.
    * @param {*} options.submissionsOnly - Only clone submissions.
    * @param {*} options.apiSource - Flag to define if we need to clone from an API.
    * @param {*} options.key - API Key to be used to authenticate in source.
@@ -48,6 +49,7 @@ class Cloner {
     this.src = null;
     this.dest = null;
     this.cloneState = {};
+    this.exclude = this.options.exclude ? this.options.exclude.split(',') : [];
 
     if (this.options.apiSource) {
       this.requestHeaders = {
@@ -230,14 +232,26 @@ class Cloner {
    * Determine if we should clone the given item.
    * @param {*} srcItem - The source item to check.
    */
-  shouldClone(collection, srcItem) {
+  shouldClone(collection, srcItem, updatedItem) {
     if (this.options.submissionsOnly && collection !== 'submissions') {
       return false;
     }
-    if (this.options.createdAfter && srcItem.created < parseInt(this.options.createdAfter, 10)) {
+    const srcCreated = (srcItem.created instanceof Date) ? srcItem.created.getTime() : parseInt(srcItem.created, 10);
+    if (this.options.createdAfter && srcCreated < parseInt(this.options.createdAfter, 10)) {
       return false;
     }
-    if (this.options.modifiedAfter && srcItem.modified < parseInt(this.options.modifiedAfter, 10)) {
+    // eslint-disable-next-line max-len
+    const srcModified = (srcItem.modified instanceof Date) ? srcItem.modified.getTime() : parseInt(srcItem.modified, 10);
+    if (this.options.modifiedAfter && srcModified < parseInt(this.options.modifiedAfter, 10)) {
+      return false;
+    }
+
+    // Make sure to not re-clone the same item it if has not been modified.
+    // eslint-disable-next-line max-len
+    const updatedCreated = (updatedItem.created instanceof Date) ? updatedItem.created.getTime() : parseInt(updatedItem.created, 10);
+    // eslint-disable-next-line max-len
+    const updatedModified = (updatedItem.modified instanceof Date) ? updatedItem.modified.getTime() : parseInt(updatedItem.modified, 10);
+    if (srcCreated === updatedCreated && srcModified === updatedModified) {
       return false;
     }
     return true;
@@ -324,6 +338,10 @@ class Cloner {
         }
       }
 
+      if (collection === 'forms' && this.exclude.includes(srcItem._id.toString())) {
+        return;
+      }
+
       if (eachItem) {
         eachItem(srcItem);
       }
@@ -340,7 +358,7 @@ class Cloner {
 
         // Call before handler and then update if it says we should.
         if (
-          this.shouldClone(collection, srcItem) &&
+          this.shouldClone(collection, srcItem, updatedItem) &&
           await this.before(collection, beforeEach, srcItem, updatedItem, destItem) !== false
         ) {
           if (destItem) {
@@ -869,6 +887,8 @@ class Cloner {
         const srcId = update.settings.role;
         update.settings.role = await this.getDestinationRoleId(srcId, destForm.project);
       }
+    }, null, (current) => {
+      return {$or: [{_id: current._id}, {machineName: current.machineName}]};
     });
   }
 
@@ -883,7 +903,7 @@ class Cloner {
     let compsWithEncryptedData = [];
     await this.upsertAll('forms', this.formQuery(srcProject), (form) => {
       process.stdout.write('\n');
-      process.stdout.write(`- Form: ${form.title}`);
+      process.stdout.write(`- Form: ${form.title} (${form._id})`);
     }, async(src, update, dest) => {
       if (this.options.submissionsOnly) {
         return false;
@@ -1030,6 +1050,9 @@ class Cloner {
       return;
     }
     const decryptedDstSettings = dest ? this.decrypt(this.options.dstDbSecret, dest['settings_encrypted'], true) : {};
+    if (!decryptedDstSettings) {
+      return;
+    }
     if (decryptedDstSettings.secret) {
       this.dstSecret = decryptedDstSettings.secret;
     }