fix(pr): extract decorate backend url function

Author: iams18i

src/api/catalog.ts

@@ -9,7 +9,6 @@ import bodybuilder from 'bodybuilder'
 import loadCustomFilters from '../helpers/loadCustomFilters'
 import { elasticsearch, SearchQuery } from 'storefront-query-builder'
 import { apiError } from '../lib/util'
-import querystring from 'querystring'
 
 async function _cacheStorageHandler (config, result, hash, tags) {
   if (config.server.useOutputCache && cache) {
@@ -111,36 +110,6 @@ export default ({config, db}) => async function (req, res, body) {
   const s = Date.now()
   const reqHash = sha3_224(`${JSON.stringify(requestBody)}${req.url}`)
   const dynamicRequestHandler = () => {
-    // filter request parameters
-    if (config.elasticsearch.useRequestFilter && typeof config.entities[entityType] === 'object') {
-      const urlParts = elasticBackendUrl.split('?')
-      const { includeFields, excludeFields } = config.entities[entityType]
-
-      const filteredParams = Object.keys(req.query)
-        .filter(key => !config.elasticsearch.requestParamsBlacklist.includes(key))
-        .reduce((object, key) => {
-          object[key] = req.query[key]
-          return object
-        }, {})
-
-      let _source_include = includeFields || []
-      let _source_exclude = excludeFields || []
-
-      if (!config.elasticsearch.overwriteRequestSourceParams) {
-        const requestSourceInclude = req.query._source_include || []
-        const requestSourceExclude = req.query._source_exclude || []
-        _source_include = [...includeFields, ...requestSourceInclude]
-        _source_exclude = [...excludeFields, ...requestSourceExclude]
-      }
-
-      const urlParams = {
-        ...filteredParams,
-        _source_include,
-        _source_exclude
-      }
-      elasticBackendUrl = `${urlParts[0]}?${querystring.stringify(urlParams)}`
-    }
-
     request({ // do the elasticsearch request
       uri: elasticBackendUrl,
       method: req.method,

src/lib/elastic.js

@@ -3,6 +3,7 @@ const _ = require('lodash')
 const fs = require('fs');
 const jsonFile = require('jsonfile')
 const es = require('@elastic/elasticsearch')
+const querystring = require('querystring')
 
 function _updateQueryStringParameter (uri, key, value) {
   var re = new RegExp('([?&])' + key + '=.*?(&|#|$)', 'i');
@@ -31,6 +32,39 @@ function adjustIndexName (indexName, entityType, config) {
   }
 }
 
+function decorateBackendUrl (entityType, url, req, config) {
+  if (config.elasticsearch.useRequestFilter && typeof config.entities[entityType] === 'object') {
+    const urlParts = url.split('?')
+    const { includeFields, excludeFields } = config.entities[entityType]
+
+    const filteredParams = Object.keys(req.query)
+      .filter(key => !config.elasticsearch.requestParamsBlacklist.includes(key))
+      .reduce((object, key) => {
+        object[key] = req.query[key]
+        return object
+      }, {})
+
+    let _source_include = includeFields || []
+    let _source_exclude = excludeFields || []
+
+    if (!config.elasticsearch.overwriteRequestSourceParams) {
+      const requestSourceInclude = req.query._source_include || []
+      const requestSourceExclude = req.query._source_exclude || []
+      _source_include = [...includeFields, ...requestSourceInclude]
+      _source_exclude = [...excludeFields, ...requestSourceExclude]
+    }
+
+    const urlParams = {
+      ...filteredParams,
+      _source_include,
+      _source_exclude
+    }
+    url = `${urlParts[0]}?${querystring.stringify(urlParams)}`
+  }
+
+  return url
+}
+
 function adjustBackendProxyUrl (req, indexName, entityType, config) {
   let url
   const queryString = require('query-string');
@@ -58,7 +92,8 @@ function adjustBackendProxyUrl (req, indexName, entityType, config) {
   if (!url.startsWith('http')) {
     url = config.elasticsearch.protocol + '://' + url
   }
-  return url
+
+  return decorateBackendUrl(entityType, url, req, config)
 }
 
 function adjustQuery (esQuery, entityType, config) {