fixes

Author: andrzejewsky

scripts/db.js

@@ -24,6 +24,10 @@ program
 
       console.log(`** Putting the mappings on top of ${tempIndex}`)
       es.putMappings(common.db, tempIndex, (err) => {
+        if (err) {
+          console.error(err.meta ? err.meta : err)
+        }
+
         console.log(`** We will reindex ${originalIndex} with the current schema`)
         es.reIndex(common.db, originalIndex, tempIndex, (err) => {
           if (err) {

src/lib/elastic.js

@@ -138,7 +138,6 @@ function reIndex (db, fromIndexName, toIndexName, next) {
   }).then(res => {
     next()
   }).catch(err => {
-    console.error(err)
     next(err)
   })
 }
@@ -215,58 +214,40 @@ function putMappings (db, indexName, next) {
   let pageSchema = loadSchema('cms_page', '5.6');
   let blockSchema = loadSchema('cms_block', '5.6');
 
-  db.indices.putMapping({
-    index: indexName,
-    type: 'product',
-    body: productSchema
-  }).then(res1 => {
-    console.dir(res1, { depth: null, colors: true })
-
+  Promise.all([
+    db.indices.putMapping({
+      index: indexName,
+      type: 'product',
+      body: productSchema
+    }),
     db.indices.putMapping({
       index: indexName,
       type: 'taxrule',
       body: taxruleSchema
-    }).then(res2 => {
-      console.dir(res2, { depth: null, colors: true })
-
-      db.indices.putMapping({
-        index: indexName,
-        type: 'attribute',
-        body: attributeSchema
-      }).then(res3 => {
-        console.dir(res3, { depth: null, colors: true })
-        db.indices.putMapping({
-          index: indexName,
-          type: 'cms_page',
-          body: pageSchema
-        }).then(res4 => {
-          console.dir(res4, { depth: null, colors: true })
-          db.indices.putMapping({
-            index: indexName,
-            type: 'cms_block',
-            body: blockSchema
-          }).then(res5 => {
-            console.dir(res5, { depth: null, colors: true })
-            db.indices.putMapping({
-              index: indexName,
-              type: 'category',
-              body: categorySchema
-            }).then(res6 => {
-              console.dir(res6, { depth: null, colors: true })
-              next()
-            })
-          })
-        })
-      }).catch(err3 => {
-        throw new Error(err3)
-      })
-    }).catch(err2 => {
-      throw new Error(err2)
+    }),
+    db.indices.putMapping({
+      index: indexName,
+      type: 'attribute',
+      body: attributeSchema
+    }),
+    db.indices.putMapping({
+      index: indexName,
+      type: 'cms_page',
+      body: pageSchema
+    }),
+    db.indices.putMapping({
+      index: indexName,
+      type: 'cms_block',
+      body: blockSchema
+    }),
+    db.indices.putMapping({
+      index: indexName,
+      type: 'category',
+      body: categorySchema
     })
-  }).catch(err1 => {
-    console.error(err1)
-    next(err1)
-  })
+  ]).then(values => values.forEach(res => console.dir(res.body, { depth: null, colors: true })))
+    .then(next)
+    .catch(next)
 }
 
 module.exports = {