add var catalog, update db7 create schema, update product schema

Author: tkostuch

config/elastic.schema.product.json

@@ -76,6 +76,25 @@
        "tax_class_id": {"type": "integer"},
        "gender": {"type": "integer"},
        "material": {"type": "integer"},
-       "category_gear": {"type": "integer"}
+       "category_gear": {"type": "integer"},
+       "attributes_metadata": {
+            "properties": {
+                "id": {"type": "integer"},
+                "attribute_id": {"type": "integer"},
+                "default_frontend_label": {"type": "text"},
+                "is_visible_on_front": {"type": "boolean"},
+                "is_visible" : {"type": "boolean"},
+                "frontend_input": {"type": "text"},
+                "is_user_defined": {"type": "boolean"},
+                "is_comparable": {"type": "boolean"},
+                "attribute_code": {"type": "text"},
+                "options": {
+                    "properties": {
+                        "value": {"type": "text"},
+                        "label": {"type": "text"}
+                    }
+                }
+            }
+        }
     }
 }

scripts/db7.js

@@ -51,10 +51,20 @@ program
     }, 1000)
   })
 
+const asyncCreateIndex = (es, common, indexName, collectionName) => new Promise((resolve, reject) => {
+  es.createIndex(common.db, indexName + '_' + collectionName, collectionName, (err) => {
+    if (err) {
+      reject(err)
+    } else {
+      resolve()
+    }
+  })
+})
+
 program
   .command('new')
   .option('-i|--indexName <indexName>', 'name of the Elasticsearch index', config.elasticsearch.indices[0])
-  .action((cmd) => { // TODO: add parallel processing
+  .action(async (cmd) => { // TODO: add parallel processing
     if (!cmd.indexName) {
       console.error('error: indexName must be specified');
       process.exit(1);
@@ -63,19 +73,14 @@ program
     console.log('** Hello! I am going to create NEW ES index')
     const indexName = cmd.indexName
 
-    let waitingCounter = 0
-    for (var indexTypeIterator in config.elasticsearch.indexTypes) {
-      var collectionName = config.elasticsearch.indexTypes[indexTypeIterator]
-      es.createIndex(common.db, indexName + '_' + collectionName, collectionName, (err) => {
-        if (err) {
-          console.log(err)
-        }
-        waitingCounter++
-      })
+    for (let collectionName of config.elasticsearch.indexTypes) {
+      try {
+        await asyncCreateIndex(es, common, indexName, collectionName)
+      } catch (err) {
+        console.log(JSON.stringify(err, null, 2))
+      }
     }
-    setInterval(() => {
-      if (waitingCounter === config.elasticsearch.indexTypes.length) process.exit(0)
-    }, 1000)
+    process.exit(0)
   })
 
 program

src/lib/elastic.js

@@ -202,11 +202,19 @@ function loadSchema (entityType, apiVersion = '7.1') {
     return null
   }
   let schemaContent = jsonFile.readFileSync(rootSchemaPath)
-  let elasticSchema = parseInt(apiVersion) < 6 ? schemaContent : Object.assign({}, { mappings: schemaContent });
+  let elasticSchema = parseInt(apiVersion) < 6 ? schemaContent : Object.assign({}, {
+    mappings: {
+      [entityType]: 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: schemaContent });
+    let elasticSchemaExtensions = parseInt(apiVersion) < 6 ? schemaContent : Object.assign({}, {
+      mappings: {
+        [entityType]: schemaContent
+      }
+    });
     elasticSchema = _.merge(elasticSchema, elasticSchemaExtensions) // user extensions
   }
   return elasticSchema