Merge pull request #54 from revlis-x/master

Fix wrong type coercion for bool commandline options
vuestorefront · Dec 4, 2018 · 6d36b1c · 6d36b1c
2 parents 7134d9f + 16e6016
commit 6d36b1c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 22 deletions.
diff --git a/src/adapters/magento/category.js b/src/adapters/magento/category.js
@@ -76,7 +76,7 @@ class CategoryAdapter extends AbstractMagentoAdapter {
         return done(item);
       }
 
-      if (this.extendedCategories === true) {
+      if (this.extendedCategories) {
 
         this.api.categories.getSingle(item.id).then((result) => { 
           this._addSingleCategoryData(item, result); 

diff --git a/src/cli.js b/src/cli.js
@@ -15,6 +15,8 @@ let kue = require('kue');
 let queue = kue.createQueue(Object.assign(config.kue, { redis: config.redis }));
 
 const reindexAttributes = (adapterName, removeNonExistent) => {
+  removeNonExistent = (removeNonExistent == 'true')
+
   return new Promise((resolve, reject) => {
     let adapter = factory.getAdapter(adapterName, 'attribute');
     let tsk = new Date().getTime();
@@ -35,6 +37,8 @@ const reindexAttributes = (adapterName, removeNonExistent) => {
 }
 
 const reindexReviews = (adapterName, removeNonExistent) => {
+  removeNonExistent = (removeNonExistent == 'true')
+
   return new Promise((resolve, reject) => {
     let adapter = factory.getAdapter(adapterName, 'review');
     let tsk = new Date().getTime();
@@ -60,6 +64,8 @@ const reindexReviews = (adapterName, removeNonExistent) => {
  * Re-index cms blocks
  */
 const reindexBlocks = (adapterName, removeNonExistent) => {
+  removeNonExistent = (removeNonExistent == 'true')
+
   return new Promise((resolve, reject) => {
     let adapter = factory.getAdapter(adapterName, 'cms_block');
     let tsk = new Date().getTime();
@@ -83,6 +89,8 @@ const reindexBlocks = (adapterName, removeNonExistent) => {
  * Re-index cms pages
  */
 const reindexPages = (adapterName, removeNonExistent) => {
+  removeNonExistent = (removeNonExistent == 'true')
+
   return new Promise((resolve, reject) => {
     let adapter = factory.getAdapter(adapterName, 'cms_page');
     let tsk = new Date().getTime();
@@ -102,6 +110,9 @@ const reindexPages = (adapterName, removeNonExistent) => {
 }
 
 const reindexCategories = (adapterName, removeNonExistent, extendedCategories) => {
+  removeNonExistent = (removeNonExistent == 'true')
+  extendedCategories = (extendedCategories == 'true')
+
   return new Promise((resolve, reject) => {
     let adapter = factory.getAdapter(adapterName, 'category');
     let tsk = new Date().getTime();
@@ -123,6 +134,8 @@ const reindexCategories = (adapterName, removeNonExistent, extendedCategories) =
 }
 
 const reindexTaxRules = (adapterName, removeNonExistent) => {
+  removeNonExistent = (removeNonExistent == 'true')
+
   return new Promise((resolve, reject) => {
     let adapter = factory.getAdapter(adapterName, 'taxrule');
     let tsk = new Date().getTime();
@@ -169,6 +182,9 @@ function cleanup(adapterName, cleanupType, transactionKey) {
 }
 
 function reindexProducts(adapterName, removeNonExistent, partitions, partitionSize, initQueue, skus, updatedAfter = null) {
+  removeNonExistent = (removeNonExistent == 'true')
+  initQueue = (initQueue == true || initQueue == 'true')
+
   let adapter = factory.getAdapter(adapterName, 'product');
 
   if (updatedAfter) {
@@ -318,7 +334,7 @@ program
   .command('categories')
   .option('--adapter <adapter>', 'name of the adapter', 'magento')
   .option('--removeNonExistent <removeNonExistent>', 'remove non existent products', false)
-  .option('--extendedCategories <extendedCategories>', '', true)
+  .option('--extendedCategories <extendedCategories>', 'extended categories import', false)
   .action(async (cmd) => {
     await reindexCategories(cmd.adapter, cmd.removeNonExistent, cmd.extendedCategories);
   });
@@ -339,7 +355,7 @@ program
   .option('--partitionSize <partitionSize>', 'size of the partitions', 200)
   .option('--initQueue <initQueue>', 'use the queue', true)
   .option('--skus <skus>', 'comma delimited list of SKUs to fetch fresh informations from', '')
-  .option('--extendedCategories <extendedCategories>', '', true)
+  .option('--extendedCategories <extendedCategories>', 'extended categories import', false)
   .action((cmd) => {
     fullReindex(cmd.adapter, true, cmd.partitions, cmd.partitionSize, cmd.initQueue, cmd.skus, cmd.extendedCategories);
   });

diff --git a/src/test_categoryextended.sh b/src/test_categoryextended.sh
@@ -11,8 +11,3 @@ echo 'Default store - in our case United States / en'
 export MAGENTO_URL=http://demo-magento2.vuestorefront.io/rest
 
 node --harmony cli.js categories --removeNonExistent=true --extendedCategories=true
-
-
-
-
-
diff --git a/src/test_fullreindex.sh b/src/test_fullreindex.sh
@@ -19,7 +19,3 @@ node --harmony cli.js productcategories
 node --harmony cli.js attributes --removeNonExistent=true
 node --harmony cli.js taxrule --removeNonExistent=true
 node --harmony cli.js products --removeNonExistent=true --partitions=1
-
-
-
-
diff --git a/src/test_multistore.sh b/src/test_multistore.sh
@@ -49,8 +49,3 @@ node --harmony cli.js productcategories
 node --harmony cli.js attributes --removeNonExistent=true
 node --harmony cli.js taxrule --removeNonExistent=true
 node --harmony cli.js products --removeNonExistent=true --partitions=1
-
-
-
-
-
diff --git a/src/test_product.sh b/src/test_product.sh
@@ -12,8 +12,3 @@ echo 'Default store - in our case United States / en'
 export MAGENTO_URL=http://demo-magento2.vuestorefront.io/rest
 
 node --harmony cli.js products --removeNonExistent=true --partitions=1
-
-
-
-
-