From dd3c6efd1a719f0814dc3d50c48d8bc7487080f1 Mon Sep 17 00:00:00 2001 From: PhoenixDev - YB Date: Tue, 16 Apr 2019 14:51:30 +0300 Subject: [PATCH 1/2] IKR-3834 Fix productProcessor emtpy request Requere PR --- src/graphql/elasticsearch/catalog/processor.js | 6 +++--- src/graphql/elasticsearch/catalog/resolver.js | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/graphql/elasticsearch/catalog/processor.js b/src/graphql/elasticsearch/catalog/processor.js index 9c480386..87ca695a 100755 --- a/src/graphql/elasticsearch/catalog/processor.js +++ b/src/graphql/elasticsearch/catalog/processor.js @@ -1,13 +1,13 @@ import config from 'config' import ProcessorFactory from '../../../processor/factory' -export default function esResultsProcessor(response, entityType, indexName) { +export default function esResultsProcessor(response, esRequest, entityType, indexName) { return new Promise((resolve, reject) => { const factory = new ProcessorFactory(config) - let resultProcessor = factory.getAdapter(entityType, indexName) + let resultProcessor = factory.getAdapter(entityType, indexName, esRequest, response) if (!resultProcessor) { - resultProcessor = factory.getAdapter('default', indexName) // get the default processor + resultProcessor = factory.getAdapter('default', indexName, esRequest, response) // get the default processor } resultProcessor.process(response.hits.hits) diff --git a/src/graphql/elasticsearch/catalog/resolver.js b/src/graphql/elasticsearch/catalog/resolver.js index 2cdabb54..c72876cb 100644 --- a/src/graphql/elasticsearch/catalog/resolver.js +++ b/src/graphql/elasticsearch/catalog/resolver.js @@ -33,7 +33,15 @@ async function list(filter, sort, currentPage, pageSize, search, context, rootVa if (esResponse && esResponse.hits && esResponse.hits.hits) { // process response result (caluclate taxes etc...) - esResponse.hits.hits = await esResultsProcessor(esResponse, config.elasticsearch.indexTypes[0], esIndex); + + let _req = { + query: { + _source_exclude: _sourceExclude, + _source_include: _sourceInclude, + } + } + + esResponse.hits.hits = await esResultsProcessor(esResponse, _req, config.elasticsearch.indexTypes[0], esIndex); } let response = {} From 2a9f82983e59967872c75e9e33bf03db615cec9b Mon Sep 17 00:00:00 2001 From: PhoenixDev - YB Date: Tue, 6 Aug 2019 13:17:20 +0300 Subject: [PATCH 2/2] Fix empty space --- src/graphql/elasticsearch/catalog/processor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/graphql/elasticsearch/catalog/processor.js b/src/graphql/elasticsearch/catalog/processor.js index 1f502ef2..28266e90 100755 --- a/src/graphql/elasticsearch/catalog/processor.js +++ b/src/graphql/elasticsearch/catalog/processor.js @@ -1,7 +1,7 @@ import config from 'config' import ProcessorFactory from '../../../processor/factory' -export default function esResultsProcessor(response, esRequest, entityType, indexName) { +export default function esResultsProcessor (response, esRequest, entityType, indexName) { return new Promise((resolve, reject) => { const factory = new ProcessorFactory(config) let resultProcessor = factory.getAdapter(entityType, indexName, esRequest, response)