update resolvers

Author: andrzejewsky

src/graphql/elasticsearch/attribute/resolver.js

@@ -2,26 +2,27 @@ import config from 'config';
 import client from '../client';
 import { buildQuery } from '../queryBuilder';
 import { getIndexName } from '../mapping'
+import { adjustQuery } from './../../../lib/elastic'
 
-async function listAttributes (attributes, context, rootValue, _sourceInclude) {
+async function listAttributes (attributes, context, rootValue, _sourceIncludes) {
   let query = buildQuery({ filter: attributes, pageSize: 150, type: 'attribute' });
 
-  if (_sourceInclude === undefined) {
-    _sourceInclude = config.entities.attribute.includeFields
+  if (_sourceIncludes === undefined) {
+    _sourceIncludes = config.entities.attribute.includeFields
   }
 
   const esQuery = {
     index: getIndexName(context.req.url),
     body: query,
-    _sourceInclude
+    _sourceIncludes
   };
   if (parseInt(config.elasticsearch.apiVersion) < 6) {
     esQuery.type = config.elasticsearch.indexTypes[3]
   }
 
-  const response = await client.search(esQuery);
+  const response = await client.search(adjustQuery(esQuery, 'attribute', config));
 
-  return response;
+  return response.body;
 }
 
 const resolver = {

src/graphql/elasticsearch/catalog/processor.js

@@ -10,7 +10,7 @@ export default function esResultsProcessor (response, esRequest, entityType, ind
       resultProcessor = factory.getAdapter('default', indexName, esRequest, response) // get the default processor
     }
 
-    resultProcessor.process(response.hits.hits)
+    resultProcessor.process(response.body.hits.hits)
       .then((result) => {
         resolve(result)
       })

src/graphql/elasticsearch/catalog/resolver.js

@@ -3,6 +3,7 @@ import client from '../client';
 import { buildQuery } from '../queryBuilder';
 import esResultsProcessor from './processor'
 import { getIndexName } from '../mapping'
+import { adjustQuery } from './../../../lib/elastic'
 
 const resolver = {
   Query: {
@@ -30,30 +31,29 @@ async function list (filter, sort, currentPage, pageSize, search, context, rootV
 
   let esIndex = getIndexName(context.req.url)
 
-  let esResponse = await client.search({
+  let esResponse = await client.search(adjustQuery({
     index: esIndex,
-    type: config.elasticsearch.indexTypes[0],
     body: query,
     _sourceInclude,
     _sourceExclude
-  });
+  }, 'product', config));
 
-  if (esResponse && esResponse.hits && esResponse.hits.hits) {
+  if (esResponse && esResponse.body.hits && esResponse.body.hits.hits) {
     // process response result (caluclate taxes etc...)
-    esResponse.hits.hits = await esResultsProcessor(esResponse, _req, config.elasticsearch.indexTypes[0], esIndex);
+    esResponse.body.hits.hits = await esResultsProcessor(esResponse, _req, config.elasticsearch.indexTypes[0], esIndex);
   }
 
   let response = {}
 
   // Process hits
   response.items = []
-  esResponse.hits.hits.forEach(hit => {
+  esResponse.body.hits.hits.forEach(hit => {
     let item = hit._source
     item._score = hit._score
     response.items.push(item)
   });
 
-  response.total_count = esResponse.hits.total
+  response.total_count = esResponse.body.hits.total
 
   // Process sort
   let sortOptions = []

src/graphql/elasticsearch/category/resolver.js

@@ -1,23 +1,23 @@
 import config from 'config';
 import client from '../client';
-import { buildQuery } from '../queryBuilder';
+import { buildQuery } from '../queryBuilder'
 import { getIndexName } from '../mapping'
+import { adjustQuery } from './../../../lib/elastic'
 
-async function list (search, filter, currentPage, pageSize = 200, sort, context, rootValue, _sourceInclude) {
+async function list (search, filter, currentPage, pageSize = 200, sort, context, rootValue, _sourceIncludes) {
   let query = buildQuery({ search, filter, currentPage, pageSize, sort, type: 'category' });
 
-  if (_sourceInclude === undefined) {
-    _sourceInclude = config.entities.category.includeFields
+  if (_sourceIncludes === undefined) {
+    _sourceIncludes = config.entities.category.includeFields
   }
 
-  const response = await client.search({
+  const response = await client.search(adjustQuery({
     index: getIndexName(context.req.url),
-    type: config.elasticsearch.indexTypes[1],
     body: query,
-    _sourceInclude
-  });
+    _sourceIncludes
+  }, 'category', config));
 
-  return response;
+  return response.body;
 }
 
 const resolver = {

src/graphql/elasticsearch/cms/resolver.js

@@ -1,19 +1,19 @@
 import config from 'config';
 import client from '../client';
 import { buildQuery } from '../queryBuilder';
+import { getIndexName } from '../mapping'
+import { adjustQuery } from './../../../lib/elastic'
 
-async function list (filter, currentPage, pageSize = 200, _sourceInclude, type) {
+async function list (filter, currentPage, pageSize = 200, _sourceInclude, type, context) {
   let query = buildQuery({ filter, currentPage, pageSize, _sourceInclude, type });
 
-  const response = await client.search({
-    index: config.elasticsearch.indices[0],
+  const response = await client.search(adjustQuery({
+    index: getIndexName(context.req.url),
     body: query,
-    type,
     _sourceInclude
-  });
-  const items = buildItems(response)
+  }, 'cms', config));
 
-  return items;
+  return buildItems(response.body)
 }
 
 function buildItems (response) {
@@ -29,12 +29,12 @@ function buildItems (response) {
 
 const resolver = {
   Query: {
-    cmsPages: (_, { filter, currentPage, pageSize, _sourceInclude, type = 'cms_page' }) =>
-      list(filter, currentPage, pageSize, _sourceInclude, type),
-    cmsBlocks: (_, { filter, currentPage, pageSize, _sourceInclude, type = 'cms_block' }) =>
-      list(filter, currentPage, pageSize, _sourceInclude, type),
-    cmsHierarchies: (_, { filter, currentPage, pageSize, _sourceInclude, type = 'cms_hierarchy' }) =>
-      list(filter, currentPage, pageSize, _sourceInclude, type)
+    cmsPages: (_, { filter, currentPage, pageSize, _sourceInclude, type = 'cms_page' }, context) =>
+      list(filter, currentPage, pageSize, _sourceInclude, type, context),
+    cmsBlocks: (_, { filter, currentPage, pageSize, _sourceInclude, type = 'cms_block' }, context) =>
+      list(filter, currentPage, pageSize, _sourceInclude, type, context),
+    cmsHierarchies: (_, { filter, currentPage, pageSize, _sourceInclude, type = 'cms_hierarchy' }, context) =>
+      list(filter, currentPage, pageSize, _sourceInclude, type, context)
   }
 };
 

src/graphql/elasticsearch/review/resolver.js

@@ -2,18 +2,18 @@ import config from 'config';
 import client from '../client';
 import { buildQuery } from '../queryBuilder';
 import { getIndexName } from '../mapping'
+import { adjustQuery } from './../../../lib/elastic'
 
 async function list (search, filter, currentPage, pageSize = 200, sort, context, rootValue, _sourceInclude) {
   let query = buildQuery({ search, filter, currentPage, pageSize, sort, type: 'review' });
 
-  const response = await client.search({
+  const response = await client.search(adjustQuery({
     index: getIndexName(context.req.url),
-    type: config.elasticsearch.indexTypes[5],
     body: query,
     _sourceInclude
-  });
+  }, 'review', config));
 
-  return response;
+  return response.body;
 }
 
 const resolver = {

src/graphql/elasticsearch/taxrule/resolver.js

@@ -2,17 +2,17 @@ import config from 'config';
 import client from '../client';
 import { buildQuery } from '../queryBuilder';
 import { getIndexName } from '../mapping'
+import { adjustQuery } from './../../../lib/elastic'
 
 async function taxrule (filter, context, rootValue) {
   let query = buildQuery({ filter, pageSize: 150, type: 'taxrule' });
 
-  const response = await client.search({
+  const response = await client.search(adjustQuery({
     index: getIndexName(context.req.url),
-    type: config.elasticsearch.indexTypes[4],
     body: query
-  });
+  }, 'taxrule', config));
 
-  return response;
+  return response.body;
 }
 
 const resolver = {