Merge branch 'develop' of https://github.com/DivanteLtd/vue-storefront-api into task/3948

Author: tkostuch

CHANGELOG.md

@@ -13,12 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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
 - Create attribute service that allows to fetch attributes with specific options - used for products aggregates - @gibkigonzo (https://github.com/DivanteLtd/vue-storefront/pull/4001, https://github.com/DivanteLtd/mage2vuestorefront/pull/99)
 
+### Fixed
+- add es7 support for map url module and fixed default index for es config - @gibkigonzo
+
 ## [1.11.0] - 2019.12.20
 
 ### Fixed
 
 - 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 fallback for `sourcePriceInclTax` and `finalPriceInclTax` in `magento1` platform - @cewald (#398)
 
 
 ## [1.11.0-rc.1] - 2019.10.03
@@ -35,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added support for tax calculation where the values from customer_tax_class_ids is used - @resubaka (#307)
 - The `db` context object - passed to every api endpoint now has two usefull methods: `getElasticClient` and `getRedisClient` for accesing the data stores - @pkarw (#328)
 - The `lib/utils` got two new methods `getStoreCode(req: Express.Request)` and `getStoreView(code: string)` for getting the current multistore context from `vue-storefront` frontend requests - @pkarw
+- Check message property instead of errorMessage in apiError function - @cdshotels-liborpansky (#378)
 
 ### Removed
 - The `scripts/seo.js` tool has been removed, the legacy `migrations` scripts have been removed, the unused legacy extensions (`gls-parcelshop-dk`, `postnord-parcelshop-dk`) - @pkarw (#342)

README.md

@@ -85,6 +85,7 @@ Then, please do change the `config/local.json` to start using the new Elastic AP
 ```json
   "elasticsearch": {
     "host": "localhost",
+    "index": "vue_storefront_catalog",
     "port": 9200,
     "protocol": "http",
     "min_score": 0.01,

config/default.json

@@ -19,6 +19,7 @@
   },
   "elasticsearch": {
     "host": "localhost",
+    "index": "vue_storefront_catalog",
     "port": 9200,
     "protocol": "http",
     "min_score": 0.01,

src/api/extensions/elastic-stock/index.js

@@ -12,7 +12,7 @@ module.exports = ({
   const getStockList = (storeCode, skus) => {
     let storeView = getCurrentStoreView(storeCode)
     const esQuery = adjustQuery({
-      index: storeView.elasticsearch.indexName, // current index name
+      index: storeView.elasticsearch.index, // current index name
       type: 'product',
       _source_includes: ['stock'],
       body: bodybuilder().filter('terms', 'visibility', [2, 3, 4]).andFilter('term', 'status', 1).andFilter('terms', 'sku', skus).build()

src/api/url/map.ts

@@ -1,29 +1,38 @@
 import { Router } from 'express';
-import { apiStatus } from '../../lib/util';
-import { buildMultiEntityUrl } from '../../lib/elastic';
-import request from 'request';
+import { apiStatus, getCurrentStoreView, getCurrentStoreCode } from '../../lib/util';
+import { getClient as getElasticClient } from '../../lib/elastic'
 import get from 'lodash/get';
 
+const adjustQueryForOldES = ({ config }) => {
+  const searchedEntities = get(config, 'urlModule.map.searchedEntities', [])
+    .map((entity) => ({ type: { value: entity } }))
+  if (parseInt(config.elasticsearch.apiVersion) < 6) {
+    return {
+      filter: {
+        bool: {
+          should: searchedEntities
+        }
+      }
+    }
+  } else {
+    return {}
+  }
+}
+
 /**
  * Builds ES query based on config
  */
 const buildQuery = ({ value, config }) => {
   const searchedFields = get(config, 'urlModule.map.searchedFields', [])
     .map((field) => ({ match_phrase: { [field]: { query: value } } }))
-  const searchedEntities = get(config, 'urlModule.map.searchedEntities', [])
-    .map((entity) => ({ type: { value: entity } }))
 
   return {
     query: {
       bool: {
         filter: {
           bool: {
             should: searchedFields,
-            filter: {
-              bool: {
-                should: searchedEntities
-              }
-            }
+            ...adjustQueryForOldES({ config })
           }
         }
       }
@@ -32,58 +41,62 @@ const buildQuery = ({ value, config }) => {
   }
 }
 
+const buildIndex = ({ indexName, config }) => {
+  return parseInt(config.elasticsearch.apiVersion) < 6
+    ? indexName
+    : get(config, 'urlModule.map.searchedEntities', [])
+      .map(entity => `${indexName}_${entity}`)
+}
+
+const adjustResultType = ({ result, config, indexName }) => {
+  if (parseInt(config.elasticsearch.apiVersion) < 6) return result
+
+  // extract type from index for es 7
+  const type = result._index.replace(new RegExp(`^(${indexName}_)|(_[^_]*)$`, 'g'), '')
+  result._type = type
+
+  return result
+}
+
 /**
  * checks result equality because ES can return record even if searched value is not EXACLY what we want (check `match_phrase` in ES docs)
  */
-const checkFieldValueEquality = ({ config, response, value }) => {
+const checkFieldValueEquality = ({ config, result, value }) => {
   const isEqualValue = get(config, 'urlModule.map.searchedFields', [])
-    .find((field) => response._source[field] === value)
+    .find((field) => result._source[field] === value)
 
   return Boolean(isEqualValue)
 }
 
 const map = ({ config }) => {
   const router = Router()
-  router.post('/:index', (req, res) => {
+  router.post('/', async (req, res) => {
     const { url, excludeFields, includeFields } = req.body
     if (!url) {
       return apiStatus(res, 'Missing url', 500);
     }
 
-    const esUrl = buildMultiEntityUrl({
-      config,
-      includeFields: includeFields ? includeFields.concat(get(config, 'urlModule.map.includeFields', [])) : [],
-      excludeFields
-    })
-    const query = buildQuery({ value: url, config })
-
-    // Only pass auth if configured
-    let auth = null;
-    if (config.elasticsearch.user || config.elasticsearch.password) {
-      auth = {
-        user: config.elasticsearch.user,
-        pass: config.elasticsearch.password
-      }
+    const indexName = getCurrentStoreView(getCurrentStoreCode(req)).elasticsearch.index
+    const esQuery = {
+      index: buildIndex({ indexName, config }), // current index name
+      _source_includes: includeFields ? includeFields.concat(get(config, 'urlModule.map.includeFields', [])) : [],
+      _source_excludes: excludeFields,
+      body: buildQuery({ value: url, config })
     }
 
-    // make simple ES search
-    request({
-      uri: esUrl,
-      method: 'POST',
-      body: query,
-      json: true,
-      auth: auth
-    }, (_err, _res, _resBody) => {
-      if (_err) {
-        console.log(_err)
-        return apiStatus(res, new Error('ES search error'), 500);
-      }
-      const responseRecord = _resBody.hits.hits[0]
-      if (responseRecord && checkFieldValueEquality({ config, response: responseRecord, value: req.body.url })) {
-        return res.json(responseRecord)
+    try {
+      const esResponse = await getElasticClient(config).search(esQuery)
+      const result = get(esResponse, 'body.hits.hits[0]', null)
+
+      if (result && checkFieldValueEquality({ config, result, value: req.body.url })) {
+        return res.json(adjustResultType({ result, config, indexName }))
       }
-      res.json()
-    })
+
+      res.json(null)
+    } catch (err) {
+      console.error(err)
+      return apiStatus(res, new Error('ES search error'), 500);
+    }
   })
 
   return router

src/lib/elastic.js

@@ -57,17 +57,6 @@ function adjustBackendProxyUrl (req, indexName, entityType, config) {
   return url
 }
 
-/**
- * similar to `adjustBackendProxyUrl`, builds multi-entity query url
- */
-function buildMultiEntityUrl ({ config, includeFields = [], excludeFields = [] }) {
-  let url = `${config.elasticsearch.host}:${config.elasticsearch.port}/_search?_source_include=${includeFields.join(',')}&_source_exclude=${excludeFields.join(',')}`
-  if (!url.startsWith('http')) {
-    url = config.elasticsearch.protocol + '://' + url
-  }
-  return url
-}
-
 function adjustQuery (esQuery, entityType, config) {
   if (parseInt(config.elasticsearch.apiVersion) < 6) {
     esQuery.type = entityType
@@ -278,6 +267,5 @@ module.exports = {
   getClient,
   getHits,
   adjustIndexName,
-  putMappings,
-  buildMultiEntityUrl
+  putMappings
 }

src/lib/util.js

@@ -84,7 +84,9 @@ export function apiStatus (res, result = 'OK', code = 200, meta = null) {
  *  @param {json} [result='OK']    Text message or result information object
  */
 export function apiError (res, errorObj, code = 500) {
-  return apiStatus(res, errorObj.errorMessage ? errorObj.errorMessage : errorObj, errorObj.code ? errorObj.code : 500)
+  const result = errorObj.message ? errorObj.message : (errorObj.errorMessage ? errorObj.errorMessage : errorObj);
+  const resultCode = errorObj.code ? errorObj.code : code;
+  return apiStatus(res, result, resultCode)
 }
 
 export function encryptToken (textToken, secret) {

src/platform/magento1/tax.js

@@ -23,8 +23,8 @@ class TaxProxy extends AbstractTaxProxy {
             if (store.elasticsearch.index === indexName) {
               taxRegion = store.tax.defaultRegion
               taxCountry = store.tax.defaultCountry
-              sourcePriceInclTax = store.tax.sourcePriceIncludesTax
-              finalPriceInclTax = store.tax.finalPriceIncludesTax
+              sourcePriceInclTax = store.tax.sourcePriceIncludesTax || null
+              finalPriceInclTax = store.tax.finalPriceIncludesTax || null
               this._storeConfigTax = store.tax
               break;
             }