Merge pull request #148 from DivanteLtd/develop

v1.6.0

Author: pkarw

README.md

@@ -131,6 +131,14 @@ You can run the following command to execute the full import:
 ``bash
  yarn mage2vs import --store-code=de
  ```
+ 
+## Executing delta indexer
+
+You can use the following command to run a delta indexer for a specific storeview:
+
+```
+yarn mage2vs productsdelta --store-code=de
+```
 
 License
 -------

config/default.json

@@ -4,6 +4,9 @@
     "port": 8080,
     "searchEngine": "elasticsearch"
   },
+  "orders": {
+    "useServerQueue": false
+  },
   "elasticsearch": {
     "host": "localhost",
     "port": 9200,

config/elastic.schema.block.extension.json

@@ -0,0 +1 @@
+{}

config/elastic.schema.block.json

@@ -0,0 +1,18 @@
+{
+    "properties": {
+        "id": {
+            "type": "long"
+        },
+        "identifier": {
+            "type": "keyword"
+        },
+        "creation_time": { 
+            "type": "date",           
+            "format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis"
+         },        
+         "update_time": { 
+            "type": "date",           
+            "format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis"
+         }
+    }
+}

config/elastic.schema.page.extension.json

@@ -0,0 +1 @@
+{}

config/elastic.schema.page.json

@@ -0,0 +1,18 @@
+{
+    "properties": {
+        "id": {
+            "type": "long"
+        },
+        "identifier": {
+            "type": "keyword"
+        },
+        "creation_time": { 
+            "type": "date",           
+            "format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis"
+         },        
+         "update_time": { 
+            "type": "date",           
+            "format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis"
+         }
+    }
+}

config/elastic.schema.product.extension.json

@@ -3,6 +3,8 @@
        "position": {"type": "integer"},
        "tax_class_id": {"type": "integer"},
        "required_options": {"type": "integer"},
-       "has_options": {"type": "integer"}       
+       "has_options": {"type": "integer"} ,
+       "Size_options": {"type": "keyword"},
+       "Color_options": {"type": "keyword"}
     }
 }

package.json

@@ -54,7 +54,7 @@
     "ajv": "^6.4.0",
     "body-parser": "^1.18.2",
     "bodybuilder": "2.2.13",
-    "commander": "^2.18.0",
+    "commander": "^2.19.0",
     "compression": "^1.7.2",
     "config": "^1.30.0",
     "cors": "^2.8.4",

scripts/kue.js

@@ -1,49 +1,40 @@
-import CommandRouter from 'command-router'
-
+const program = require('commander')
 const config = require('config').redis
 const kue = require('kue')
 
-const cli = CommandRouter()
-
-cli.option({
-  name: 'port',
-  alias: 'p',
-  default: 3000,
-  type: Number
-})
-
-cli.option({
-  name: 'prefix',
-  alias: 'q',
-  default: 'q',
-  type: String
-})
-
-cli.command('dashboard', () => {
-
-  kue.createQueue({
-    redis: {
-      host: config.host,
-      port: config.port,
-      db: config.db
-    },
-    prefix: cli.options.prefix
-  })
-
-  kue.app.listen(cli.options.port)
-})
-
-cli.on('notfound', (action) => {
-  console.error(`I don't know how to: ${action}`)
-  process.exit(1)
-})
+program
+  .command('dashboard')
+  .option('-p|--port <port>', 'port on which to run kue dashboard', 3000)
+  .option('-q|--prefix <prefix>', 'prefix', 'q')
+  .action((cmd) => {
+    kue.createQueue({
+      redis: {
+        host: config.host,
+        port: config.port,
+        db: config.db
+      },
+      prefix: cmd.prefix
+    })
+  
+    kue.app.listen(cmd.port)
+  });
+
+program
+  .on('command:*', () => {
+    console.error('Invalid command: %s\nSee --help for a list of available commands.', program.args.join(' '));
+    process.exit(1);
+  });
+
+program
+  .parse(process.argv)
 
 process.on('unhandledRejection', (reason, p) => {
-  console.log(`Unhandled Rejection at: Promise ${p}, reason: ${reason}`)
-})
-
-process.on('uncaughtException', function(exception) {
-  console.log(exception)
+  console.error(`Unhandled Rejection at: Promise ${p}, reason: ${reason}`)
+  // application specific logging, throwing an error, or other logic here
 })
 
-cli.parse(process.argv)
+process.on('uncaughtException', function (exception) {
+  console.error(exception) // to see your exception details in the console
+  // if you are on production, maybe you can send the exception details to your
+  // email as well ?
+})

scripts/mage2vs.js

@@ -36,12 +36,69 @@ function exec(cmd, args, opts) {
     }); 
 
     child.on('error', (error) => {
-      console.error(errror)
+      console.error(error)
       reject(error)
     });     
   })
 }
 
+program
+  .command('productsdelta')
+  .option('--store-code <storeCode>', 'storeCode in multistore setup', null)
+  .option('--adapter <adapter>', 'name of the adapter', 'magento')
+  .option('--partitions <partitions>', 'number of partitions', 1)
+  .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('--removeNonExistent <removeNonExistent>', 'remove non existent products', false)
+  .action((cmd) => {
+    const apiConfig = multiStoreConfig(config.magento2.api, cmd.storeCode)
+    let magentoConfig = {
+      TIME_TO_EXIT: 2000,
+      PRODUCTS_SPECIAL_PRICES: true,
+      MAGENTO_CONSUMER_KEY: apiConfig.consumerKey,
+      MAGENTO_CONSUMER_SECRET: apiConfig.consumerSecret,
+      MAGENTO_ACCESS_TOKEN: apiConfig.accessToken,
+      MAGENTO_ACCESS_TOKEN_SECRET: apiConfig.accessTokenSecret,
+      MAGENTO_STORE_ID: 1,
+      INDEX_META_PATH: '.lastIndex.json',
+      MAGENTO_URL: apiConfig.url,
+      REDIS_HOST: config.redis.host,
+      REDIS_PORT: config.redis.port,
+      INDEX_NAME: config.elasticsearch.indices[0]
+
+    }
+    if (cmd.storeCode) {
+      const storeView = config.storeViews[cmd.storeCode]
+      if (!storeView) {
+        console.error('Wrong storeCode provided - no such store in the config.storeViews[storeCode]', cmd.storeCode)
+        process.exit(-1)
+      } else {
+        magentoConfig.INDEX_NAME = storeView.elasticsearch.index
+        magentoConfig.INDEX_META_PATH = '.lastIndex-' + cmd.storeCode + '.json'
+        magentoConfig.MAGENTO_STORE_ID = storeView.storeId
+      }
+    }
+
+    const env = Object.assign({}, magentoConfig, process.env)  // use process env as well
+    console.log('=== Delta indexer is about to start ===')
+
+    exec('node', [
+      '--harmony',
+      'node_modules/mage2vuestorefront/src/cli.js',
+      'productsdelta',
+      '--adapter=' + cmd.adapter,
+      '--partitions=' + cmd.partitions,
+      '--partitionSize=' + cmd.partitionSize,
+      '--initQueue=' + cmd.initQueue,
+      '--skus=' + cmd.skus,
+      '--removeNonExistent=' + cmd.removeNonExistent
+    ], { env: env, shell: true }).then((res) => {
+
+    })
+
+  })
+
 program
   .command('import')
   .option('--store-code <storeCode>', 'storeCode in multistore setup', null)
@@ -55,6 +112,8 @@ program
       MAGENTO_ACCESS_TOKEN: apiConfig.accessToken,
       MAGENTO_ACCESS_TOKEN_SECRET: apiConfig.accessTokenSecret,
       MAGENTO_URL: apiConfig.url,
+      REDIS_HOST: config.redis.host,
+      REDIS_PORT: config.redis.port,
       INDEX_NAME: config.elasticsearch.indices[0]
     }