update mage2vs and revert changes in createing es schema

Author: tkostuch

scripts/db.js

@@ -96,18 +96,16 @@ const es5RebuildCommand = (cmd) => { // TODO: add parallel processing
   })
 }
 
-const rebuildCommandFactory = (cmd) => {
-  if (parseInt(config.elasticsearch.apiVersion) < 6) {
-    return es5RebuildCommand(cmd)
-  } else {
-    return es7RebuildCommand(cmd)
-  }
-}
-
 program
   .command('rebuild')
   .option('-i|--indexName <indexName>', 'name of the Elasticsearch index', config.elasticsearch.indices[0])
-  .action(rebuildCommandFactory)
+  .action((cmd) => {
+    if (parseInt(config.elasticsearch.apiVersion) < 6) {
+      return es5RebuildCommand(cmd)
+    } else {
+      return es7RebuildCommand(cmd)
+    }
+  })
 
 /**
  * CREATE INDEX
@@ -159,18 +157,16 @@ const es5NewCommand = (cmd) => { // TODO: add parallel processing
   })
 }
 
-const newCommandFactory = (cmd) => {
-  if (parseInt(config.elasticsearch.apiVersion) < 6) {
-    return es5NewCommand(cmd)
-  } else {
-    return es7NewCommand(cmd)
-  }
-}
-
 program
   .command('new')
   .option('-i|--indexName <indexName>', 'name of the Elasticsearch index', config.elasticsearch.indices[0])
-  .action(newCommandFactory)
+  .action((cmd) => {
+    if (parseInt(config.elasticsearch.apiVersion) < 6) {
+      return es5NewCommand(cmd)
+    } else {
+      return es7NewCommand(cmd)
+    }
+  })
 
 /**
  * OTHERS COMMANDS

scripts/mage2vs.js

@@ -41,7 +41,8 @@ function getMagentoDefaultConfig (storeCode) {
     REDIS_DB: config.redis.db,
     REDIS_AUTH: config.redis.auth,
     INDEX_NAME: config.elasticsearch.indices[0],
-    DATABASE_URL: `${config.elasticsearch.protocol}://${config.elasticsearch.host}:${config.elasticsearch.port}`
+    DATABASE_URL: `${config.elasticsearch.protocol}://${config.elasticsearch.host}:${config.elasticsearch.port}`,
+    ELASTICSEARCH_API_VERSION: config.elasticsearch.apiVersion
   }
 }
 

src/lib/elastic.js

@@ -202,19 +202,11 @@ function loadSchema (entityType, apiVersion = '7.1') {
     return null
   }
   let schemaContent = jsonFile.readFileSync(rootSchemaPath)
-  let elasticSchema = parseInt(apiVersion) < 6 ? schemaContent : Object.assign({}, {
-    mappings: {
-      [entityType]: schemaContent
-    }
-  });
+  let elasticSchema = parseInt(apiVersion) < 6 ? schemaContent : Object.assign({}, { mappings: schemaContent });
   const extensionsPath = path.join(__dirname, '../../config/elastic.schema.' + entityType + '.extension.json');
   if (fs.existsSync(extensionsPath)) {
     schemaContent = jsonFile.readFileSync(extensionsPath)
-    let elasticSchemaExtensions = parseInt(apiVersion) < 6 ? schemaContent : Object.assign({}, {
-      mappings: {
-        [entityType]: schemaContent
-      }
-    });
+    let elasticSchemaExtensions = parseInt(apiVersion) < 6 ? schemaContent : Object.assign({}, { mappings: schemaContent });
     elasticSchema = _.merge(elasticSchema, elasticSchemaExtensions) // user extensions
   }
   return elasticSchema