Merge pull request #350 from ResuBaka/fix/graphql-resolvers-and-schemas

Fix/graphql resolvers and schemas

Author: andrzejewsky

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.11.0-rc.2] - unreleased
+
+### Fixed
+
+- Fixed some smaller issues with graphql so that it is now working again with the fronted - #350
+
+
 ## [1.11.0-rc.1] - 2019.10.03
 
 ### Added

package.json

@@ -56,7 +56,7 @@
     "config": "^1.30.0",
     "cors": "^2.8.4",
     "elasticdump": "^3.3.12",
-    "elasticsearch": "^15.2.0",
+    "@elastic/elasticsearch": "5.6.*",
     "email-check": "^1.1.0",
     "express": "^4.16.3",
     "fs-extra": "^8.1.0",

src/graphql/elasticsearch/attribute/resolver.js

@@ -3,21 +3,21 @@ import client from '../client';
 import { buildQuery } from '../queryBuilder';
 import { getIndexName } from '../mapping'
 
-async function listAttributes (attributes, context, rootValue, _sourceInclude) {
+async function listAttributes (attributes, context, rootValue, _source_include) {
   let query = buildQuery({ filter: attributes, pageSize: 150, type: 'attribute' });
 
-  if (_sourceInclude === undefined) {
-    _sourceInclude = config.entities.attribute.includeFields
+  if (!_source_include) {
+    _source_include = config.entities.attribute.includeFields
   }
 
   const response = await client.search({
     index: getIndexName(context.req.url),
     type: config.elasticsearch.indexTypes[3],
     body: query,
-    _sourceInclude
+    _source_include
   });
 
-  return response;
+  return response.body;
 }
 
 const resolver = {

src/graphql/elasticsearch/catalog/resolver.js

@@ -11,11 +11,11 @@ const resolver = {
   }
 };
 
-async function list (filter, sort, currentPage, pageSize, search, context, rootValue, _sourceInclude, _sourceExclude) {
+async function list (filter, sort, currentPage, pageSize, search, context, rootValue, _source_include, _source_exclude) {
   let _req = {
     query: {
-      _source_exclude: _sourceExclude,
-      _source_include: _sourceInclude
+      _source_exclude,
+      _source_include
     }
   }
 
@@ -34,26 +34,28 @@ async function list (filter, sort, currentPage, pageSize, search, context, rootV
     index: esIndex,
     type: config.elasticsearch.indexTypes[0],
     body: query,
-    _sourceInclude,
-    _sourceExclude
+    _source_include,
+    _source_exclude
   });
 
-  if (esResponse && esResponse.hits && esResponse.hits.hits) {
+  const { body } = esResponse
+
+  if (body && body.hits && body.hits.hits) {
     // process response result (caluclate taxes etc...)
-    esResponse.hits.hits = await esResultsProcessor(esResponse, _req, config.elasticsearch.indexTypes[0], esIndex);
+    body.hits.hits = await esResultsProcessor(body, _req, config.elasticsearch.indexTypes[0], esIndex);
   }
 
   let response = {}
 
   // Process hits
   response.items = []
-  esResponse.hits.hits.forEach(hit => {
+  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 = body.hits.total
 
   // Process sort
   let sortOptions = []
@@ -66,7 +68,7 @@ async function list (filter, sort, currentPage, pageSize, search, context, rootV
     )
   }
 
-  response.aggregations = esResponse.aggregations
+  response.aggregations = body.aggregations
   response.sort_fields = {}
   if (sortOptions.length > 0) {
     response.sort_fields.options = sortOptions

src/graphql/elasticsearch/catalog/schema.graphqls

@@ -41,7 +41,7 @@ input FilterTypeInput @doc(description: "FilterTypeInput specifies which action
     gte: String @doc(description: "Greater than or equal to")
     gteq: String @doc(description: "Greater than or equal to")
     in: [JSON] @doc(description: "In. The value can contain a set of comma-separated values")
-    like: String @doc(description: "Like. The specified value can contain % (percent signs) to allow matching of 0 or more characters")
+    like: [String] @doc(description: "Like. The specified value can contain % (percent signs) to allow matching of 0 or more characters")
     lt: String @doc(description: "Less than")
     lte: String @doc(description: "Less than or equal to")
     lteq: String @doc(description: "Less than or equal to")
@@ -151,6 +151,7 @@ input ProductFilterInput @doc(description: "ProductFilterInput defines the filte
     stock: ProductFilterInput @doc(description: "The product stock. Customers use this stock to identify the product.")
     is_in_stock: FilterTypeInput @doc(description: "Is product in stock")
     keyword: FilterTypeInput @doc(description: "keyword filter input")
+    url_path: FilterTypeInput @doc(description: "The url path assigned to the product")
 }
 
 type LayerFilter {
@@ -182,4 +183,4 @@ type SortFields @doc(description: "SortFields contains a default value for sort
 enum SortEnum {
     ASC
     DESC
-}
+}

src/graphql/elasticsearch/category/resolver.js

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

src/graphql/elasticsearch/category/schema.graphqls

@@ -59,4 +59,5 @@ input CategorySortInput {
     display_mode: SortEnum @doc(description: "Category display mode")
     is_anchor: SortEnum @doc(description: "Is filter avalaible in category")
     page_layout: SortEnum @doc(description: "Category page layout")
-}
+    _score: SortEnum @doc(description: "Category page layout")
+}

src/graphql/elasticsearch/client.js

@@ -1,12 +1,8 @@
 import config from 'config';
-import elasticsearch from 'elasticsearch';
+import elasticsearch from '@elastic/elasticsearch';
 
 const client = new elasticsearch.Client({
-  host: {
-    host: config.elasticsearch.host,
-    port: config.elasticsearch.port,
-    protocol: config.elasticsearch.protocol
-  }
+  node: `${config.elasticsearch.protocol}://${config.elasticsearch.host}:${config.elasticsearch.port}`
 });
 
 export default client;

src/graphql/elasticsearch/cms/resolver.js

@@ -2,16 +2,16 @@ import config from 'config';
 import client from '../client';
 import { buildQuery } from '../queryBuilder';
 
-async function list (filter, currentPage, pageSize = 200, _sourceInclude, type) {
-  let query = buildQuery({ filter, currentPage, pageSize, _sourceInclude, type });
+async function list (filter, currentPage, pageSize = 200, _source_include, type) {
+  let query = buildQuery({ filter, currentPage, pageSize, _source_include, type });
 
   const response = await client.search({
     index: config.elasticsearch.indices[0],
     body: query,
     type,
-    _sourceInclude
+    _source_include
   });
-  const items = buildItems(response)
+  const items = buildItems(response.body)
 
   return items;
 }

src/graphql/elasticsearch/cms/schema.graphqls

@@ -17,6 +17,7 @@ input CmsInput @doc(description: "ProductFilterInput defines the filters to be u
     id: FilterTypeInput @doc(description: "Id of the CMS entity")
     identifier: FilterTypeInput @doc(description: "Identifiers of the CMS entity")
     store_id: FilterTypeInput @doc(description: "Store Id of the CMS entity")
+    url_path: FilterTypeInput @doc(description: "The url path assigned to the cms_page")
 }
 
 type CmsPage @doc(description: "CMS pages information") {
@@ -32,6 +33,7 @@ type CmsPages @doc(description: "CMS page defines all CMS page information") {
     meta_description: String @doc(description: "CMS page meta description")
     meta_keywords: String @doc(description: "CMS page meta keywords")
     store_id: Int @doc(description: "Store Id of CMS page")
+    url_path: String @doc(description: "CMS page meta keywords")
 }
 
 type CmsBlocks @doc(description: "CMS blocks information") {
@@ -40,6 +42,7 @@ type CmsBlocks @doc(description: "CMS blocks information") {
 
 type CmsBlock @doc(description: "CMS block defines all CMS block information") {
     identifier: String @doc(description: "CMS block identifier")
+    id: Int @doc(description: "CMS block identifier")
     title: String @doc(description: "CMS block title")
     content: String @doc(description: "CMS block content")
     creation_time: String @doc(description: "Timestamp indicating when the CMS block was created")
@@ -60,4 +63,4 @@ type CmsHierarchy {
     request_url: String @doc(description: "Request URL of CMS hierarchy node")
     xpath: String @doc(description: "XPATH of CMS hierarchy node")
     store_id: Int @doc(description: "Store Id of CMS hierarchy node")
-}
+}