3948 add transformAggsToAttributeListParam, and support graphql

Author: tkostuch

src/api/attribute/service.ts

@@ -9,6 +9,33 @@ export interface AttributeListParam {
   [key: string]: number[]
 }
 
+/**
+ * Transforms ES aggregates into valid format for AttributeService - {[attribute_code]: [bucketId1, bucketId2]}
+ * @param body - products response body
+ * @param config - global config
+ * @param indexName - current indexName
+ */
+function transformAggsToAttributeListParam (aggregations): AttributeListParam {
+  const attributeListParam: AttributeListParam = Object.keys(aggregations)
+    .filter(key => aggregations[key].buckets.length) // leave only buckets with values
+    .reduce((acc, key) => {
+      const attributeCode = key.replace(/^(agg_terms_|agg_range_)|(_options)$/g, '')
+      const bucketsIds = aggregations[key].buckets.map(bucket => bucket.key)
+
+      if (!acc[attributeCode]) {
+        acc[attributeCode] = []
+      }
+
+      // there can be more then one attributes for example 'agg_terms_color' and 'agg_terms_color_options'
+      // we need to get buckets from both
+      acc[attributeCode] = [...new Set([...acc[attributeCode], ...bucketsIds])]
+
+      return acc
+    }, {})
+
+  return attributeListParam
+}
+
 /**
  * Returns attributes from cache
  */
@@ -149,5 +176,6 @@ function transformToMetadata ({
 
 export default {
   list,
-  transformToMetadata
+  transformToMetadata,
+  transformAggsToAttributeListParam
 }

src/api/catalog.ts

@@ -4,7 +4,7 @@ import ProcessorFactory from '../processor/factory';
 import { adjustBackendProxyUrl } from '../lib/elastic'
 import cache from '../lib/cache-instance'
 import { sha3_224 } from 'js-sha3'
-import AttributeService, { AttributeListParam } from './attribute/service'
+import AttributeService from './attribute/service'
 import bodybuilder from 'bodybuilder'
 import { elasticsearch, SearchQuery } from 'storefront-query-builder'
 
@@ -20,36 +20,6 @@ function _cacheStorageHandler (config, result, hash, tags) {
   }
 }
 
-/**
- * Transforms ES aggregates into valid format for AttributeService - {[attribute_code]: [bucketId1, bucketId2]}
- * @param body - products response body
- * @param config - global config
- * @param indexName - current indexName
- */
-async function getProductsAttributesMetadata (body, config, indexName: string): Promise<any> {
-  const attributeListParam: AttributeListParam = Object.keys(body.aggregations)
-    .filter(key => body.aggregations[key].buckets.length) // leave only buckets with values
-    .reduce((acc, key) => {
-      const attributeCode = key.replace(/^(agg_terms_|agg_range_)|(_options)$/g, '')
-      const bucketsIds = body.aggregations[key].buckets.map(bucket => bucket.key)
-
-      if (!acc[attributeCode]) {
-        acc[attributeCode] = []
-      }
-
-      // there can be more then one attributes for example 'agg_terms_color' and 'agg_terms_color_options'
-      // we need to get buckets from both
-      acc[attributeCode] = [...new Set([...acc[attributeCode], ...bucketsIds])]
-
-      return acc
-    }, {})
-
-  // find attribute list
-  const attributeList: any[] = await AttributeService.list(attributeListParam, config, indexName)
-
-  return attributeList
-}
-
 function _outputFormatter (responseBody, format = 'standard') {
   if (format === 'compact') { // simple formatter
     delete responseBody.took
@@ -161,8 +131,10 @@ export default ({config, db}) => async function (req, res, body) {
             _resBody.hits.hits = result
             _cacheStorageHandler(config, _resBody, reqHash, tagsArray)
             if (_resBody.aggregations) {
-              const attributesMetadata = await getProductsAttributesMetadata(_resBody, config, indexName)
-              _resBody.attribute_metadata = attributesMetadata.map(AttributeService.transformToMetadata)
+              const attributeListParam = AttributeService.transformAggsToAttributeListParam(_resBody.aggregations)
+              // find attribute list
+              const attributeList = await AttributeService.list(attributeListParam, config, indexName)
+              _resBody.attribute_metadata = attributeList.map(AttributeService.transformToMetadata)
             }
             res.json(_outputFormatter(_resBody, responseFormat));
           }).catch((err) => {

src/graphql/elasticsearch/catalog/resolver.js

@@ -4,6 +4,7 @@ import { buildQuery } from '../queryBuilder';
 import esResultsProcessor from './processor'
 import { getIndexName } from '../mapping'
 import { adjustQuery } from './../../../lib/elastic'
+import AttributeService from './../../../api/attribute/service'
 
 const resolver = {
   Query: {
@@ -67,6 +68,13 @@ async function list (filter, sort, currentPage, pageSize, search, context, rootV
   }
 
   response.aggregations = esResponse.aggregations
+
+  if (response.aggregations) {
+    const attributeListParam = AttributeService.transformAggsToAttributeListParam(response.aggregations)
+    const attributeList = await AttributeService.list(attributeListParam, config, esIndex)
+    response.attribute_metadata = attributeList.map(AttributeService.transformToMetadata)
+  }
+
   response.sort_fields = {}
   if (sortOptions.length > 0) {
     response.sort_fields.options = sortOptions

src/graphql/elasticsearch/catalog/schema.graphqls

@@ -7,13 +7,15 @@ type Products @doc(description: "The Products object is the top-level object ret
     total_count: Int @doc(description: "The number of products returned")
     # filters: [LayerFilter] @doc(description: "Layered navigation filters array") // @TODO: add filters to response instead of aggregations
     aggregations: JSON @doc(description: "Layered navigation filters array as aggregations")
+    attribute_metadata: JSON @doc(description: "Transformed aggregations into attributes")
     sort_fields: SortFields @doc(description: "An object that includes the default sort field and all available sort fields")
 }
 
 type ESResponse {
   hits: JSON
   suggest: JSON
   aggregations: JSON
+  attribute_metadata: JSON
 }
 
 type Query {