Merge remote-tracking branch 'upstream/develop' into bugfix/build-path-with-src

Author: cewald

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add url module - @gibkigonzo (#3942)
 - The `response_format` query parameter to the `/api/catalog` endpoint. Currently there is just one additional format supported: `response_format=compact`. When used, the response format got optimized by: a) remapping the results, removing the `_source` from the `hits.hits`; b) compressing the JSON fields names according to the `config.products.fieldsToCompact`; c) removing the JSON fields from the `product.configurable_children` when their values === parent product values; overall response size reduced over -70% - @pkarw
 - The support for `SearchQuery` instead of the ElasticSearch DSL as for the input to `/api/catalog` - using `storefront-query-builder` package - @pkarw - https://github.com/DivanteLtd/vue-storefront/issues/2167
+- Add ElasticSearch client support for HTTP authentication - @cewald (#397)
 
 ### Fixed
 - add es7 support for map url module and fixed default index for es config - @gibkigonzo
@@ -22,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fixed some smaller issues with graphql so that it is now working again with the fronted - #350
 - Replaced the old `crop` function call which has been removed from Sharp image processor - @grimasod (#381)
+- Add product processor to new URL mapper endpoint #401 - @cewald (#401, #403)
 - Add fallback for `sourcePriceInclTax` and `finalPriceInclTax` in `magento1` platform - @cewald (#398)
 
 

config/default.json

@@ -22,6 +22,7 @@
     "index": "vue_storefront_catalog",
     "port": 9200,
     "protocol": "http",
+    "requestTimeout": 5000,
     "min_score": 0.01,
     "indices": [
       "vue_storefront_catalog",

src/api/url/map.ts

@@ -1,7 +1,8 @@
-import { Router } from 'express';
-import { apiStatus, getCurrentStoreView, getCurrentStoreCode } from '../../lib/util';
+import { Router } from 'express'
+import { apiStatus, getCurrentStoreView, getCurrentStoreCode } from '../../lib/util'
 import { getClient as getElasticClient } from '../../lib/elastic'
-import get from 'lodash/get';
+import ProcessorFactory from '../../processor/factory'
+import get from 'lodash/get'
 
 const adjustQueryForOldES = ({ config }) => {
   const searchedEntities = get(config, 'urlModule.map.searchedEntities', [])
@@ -73,7 +74,7 @@ const map = ({ config }) => {
   router.post('/', async (req, res) => {
     const { url, excludeFields, includeFields } = req.body
     if (!url) {
-      return apiStatus(res, 'Missing url', 500);
+      return apiStatus(res, 'Missing url', 500)
     }
 
     const indexName = getCurrentStoreView(getCurrentStoreCode(req)).elasticsearch.index
@@ -86,16 +87,35 @@ const map = ({ config }) => {
 
     try {
       const esResponse = await getElasticClient(config).search(esQuery)
-      const result = get(esResponse, 'body.hits.hits[0]', null)
+      let result = get(esResponse, 'body.hits.hits[0]', null)
 
       if (result && checkFieldValueEquality({ config, result, value: req.body.url })) {
-        return res.json(adjustResultType({ result, config, indexName }))
-      }
+        result = adjustResultType({ result, config, indexName })
+        if (result._type === 'product') {
+          const factory = new ProcessorFactory(config)
+          let resultProcessor = factory.getAdapter('product', indexName, req, res)
+          if (!resultProcessor) {
+            resultProcessor = factory.getAdapter('default', indexName, req, res)
+          }
 
-      res.json(null)
+          resultProcessor
+            .process(esResponse.body.hits.hits, null)
+            .then(pResult => {
+              pResult = pResult.map(h => Object.assign(h, { _score: h._score }))
+              return res.json(pResult[0])
+            }).catch((err) => {
+              console.error(err)
+              return res.json()
+            })
+        } else {
+          return res.json(result)
+        }
+      } else {
+        return res.json(null)
+      }
     } catch (err) {
       console.error(err)
-      return apiStatus(res, new Error('ES search error'), 500);
+      return apiStatus(res, new Error('ES search error'), 500)
     }
   })
 

src/lib/elastic.js

@@ -74,15 +74,16 @@ function getHits (result) {
 }
 
 function getClient (config) {
-  const esConfig = { // as we're runing tax calculation and other data, we need a ES indexer
-    node: `${config.elasticsearch.protocol}://${config.elasticsearch.host}:${config.elasticsearch.port}`,
-    apiVersion: config.elasticsearch.apiVersion,
-    requestTimeout: 5000
-  }
+  let { host, port, protocol, apiVersion, requestTimeout } = config.elasticsearch
+  const node = `${protocol}://${host}:${port}`
+
+  let auth
   if (config.elasticsearch.user) {
-    esConfig.auth = config.elasticsearch.user + ':' + config.elasticsearch.password
+    const { user, password } = config.elasticsearch
+    auth = { username: user, password }
   }
-  return new es.Client(esConfig)
+
+  return new es.Client({ node, auth, apiVersion, requestTimeout })
 }
 
 function putAlias (db, originalName, aliasName, next) {

src/models/order.schema.js

@@ -140,6 +140,9 @@ exports.default = {
             },
             sameAsBilling: {
               type: 'number'
+            },
+            save_address: {
+              type: 'number'              
             }
           }
         },
@@ -203,6 +206,9 @@ exports.default = {
               },
               sameAsBilling: {
                 type: 'number'
+              },
+              save_address: {
+                type: 'number'              
               }
             }
           }

src/platform/magento2/o2m.js

@@ -158,7 +158,8 @@ function processSingleOrder (orderData, config, job, done, logger = console) {
               'regionCode': mappedBillingRegion.regionCode,
               'regionId': mappedBillingRegion.regionId,
               'company': billingAddr.company,
-              'vatId': billingAddr.vat_id
+              'vatId': billingAddr.vat_id,
+              'save_in_address_book': billingAddr.save_address
             }
           }
 
@@ -177,7 +178,8 @@ function processSingleOrder (orderData, config, job, done, logger = console) {
                 'regionCode': mappedBillingRegion.regionCode,
                 'region': billingAddr.region,
                 'company': billingAddr.company,
-                'vatId': billingAddr.vat_id
+                'vatId': billingAddr.vat_id,
+                'save_in_address_book': billingAddr.save_address
               },
               'shippingMethodCode': orderData.addressInformation.shipping_method_code,
               'shippingCarrierCode': orderData.addressInformation.shipping_carrier_code,
@@ -198,7 +200,8 @@ function processSingleOrder (orderData, config, job, done, logger = console) {
               'regionId': mappedShippingRegion.regionId,
               'regionCode': mappedShippingRegion.regionCode,
               'region': shippingAddr.region,
-              'company': shippingAddr.company
+              'company': shippingAddr.company,
+              'save_in_address_book': shippingAddr.save_address
             }
           } else {
             shippingAddressInfo['addressInformation']['shippingAddress'] = shippingAddressInfo['addressInformation']['billingAddress']