From 7928d0a5200ac94466f28d739c38759861b7d6f0 Mon Sep 17 00:00:00 2001 From: Landofcoder Date: Tue, 31 Aug 2021 14:34:55 +0700 Subject: [PATCH 1/4] Update composer.json --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index d542347..aa72539 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,6 @@ } ], "require": { - "landofcoder/module-all" : "1.*" }, "autoload": { "psr-4": { From 9250ce628f862f6a952361a5b9aaca661fe60ddd Mon Sep 17 00:00:00 2001 From: Misha Date: Mon, 1 May 2023 17:48:35 +0700 Subject: [PATCH 2/4] fix categores list --- Model/Resolver/Categories.php | 7 +++++-- Model/Resolver/CategoryImageResolver.php | 10 ++-------- Model/Resolver/CategoryQuestionResolver.php | 8 +------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/Model/Resolver/Categories.php b/Model/Resolver/Categories.php index fd85e99..d369ac8 100644 --- a/Model/Resolver/Categories.php +++ b/Model/Resolver/Categories.php @@ -79,10 +79,13 @@ public function resolve( } $searchResult = $this->categoryInterface->getList($searchCriteria, $search); $totalPages = $args['pageSize'] ? ((int)ceil($searchResult->getTotalCount() / $args['pageSize'])) : 0; - + $items = []; + foreach ($searchResult->getItems() as $_item) { + $items[] = $_item->toArray(); + } return [ 'total_count' => $searchResult->getTotalCount(), - 'items' => $searchResult->getItems(), + 'items' => $items, 'page_info' => [ 'page_size' => $args['pageSize'], 'current_page' => $args['currentPage'], diff --git a/Model/Resolver/CategoryImageResolver.php b/Model/Resolver/CategoryImageResolver.php index be3ced4..9846e92 100644 --- a/Model/Resolver/CategoryImageResolver.php +++ b/Model/Resolver/CategoryImageResolver.php @@ -59,17 +59,11 @@ public function __construct( } /** - * @param Field $field - * @param ContextInterface $context - * @param ResolveInfo $info - * @param array|null $value - * @param array|null $args - * @return array|Value|mixed - * @throws LocalizedException + * @inheritDoc */ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) { - if (isset($value['image']) && $value['image']) { + if (is_array($value) && isset($value['image']) && $value['image']) { return $this->_storeManager->getStore()->getBaseUrl( \Magento\Framework\UrlInterface::URL_TYPE_MEDIA ) . $value['image']; diff --git a/Model/Resolver/CategoryQuestionResolver.php b/Model/Resolver/CategoryQuestionResolver.php index bc21c82..5fbd346 100644 --- a/Model/Resolver/CategoryQuestionResolver.php +++ b/Model/Resolver/CategoryQuestionResolver.php @@ -50,13 +50,7 @@ public function __construct( } /** - * @param Field $field - * @param ContextInterface $context - * @param ResolveInfo $info - * @param array|null $value - * @param array|null $args - * @return array|Value|mixed - * @throws \Magento\Framework\Exception\LocalizedException + * @inheritDoc */ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) { From 61c9ce8fbe305dcd17bcdbe95a576a2144d94ac9 Mon Sep 17 00:00:00 2001 From: Misha Date: Mon, 1 May 2023 18:10:14 +0700 Subject: [PATCH 3/4] fix issue graphql --- Model/Resolver/QuestionTagResolver.php | 6 +++++- Model/Resolver/Questions.php | 7 ++++++- Model/Resolver/Tags.php | 6 +++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Model/Resolver/QuestionTagResolver.php b/Model/Resolver/QuestionTagResolver.php index ac11505..46725d0 100644 --- a/Model/Resolver/QuestionTagResolver.php +++ b/Model/Resolver/QuestionTagResolver.php @@ -61,9 +61,13 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value { if (isset($value['question_id']) && $value['question_id']) { $collection = $this->tagCollection->create()->addFieldToFilter('question_id', $value['question_id']); + $items = []; + foreach($collection->getItems() as $_item) { + $items[] = $_item->getData(); + } return [ 'total_count' => $collection->getSize(), - 'items' => $collection->getItems() + 'items' => $items ]; } else { return []; diff --git a/Model/Resolver/Questions.php b/Model/Resolver/Questions.php index ff83154..02e15fa 100644 --- a/Model/Resolver/Questions.php +++ b/Model/Resolver/Questions.php @@ -95,9 +95,14 @@ public function resolve( $searchResult = $this->questionRepository->getList($searchCriteria, $search, $tag, $identifier, $sku); $totalPages = $args['pageSize'] ? ((int)ceil($searchResult->getTotalCount() / $args['pageSize'])) : 0; + $items = []; + foreach ($searchResult->getItems() as $_item) { + $items[] = is_array($_item) ? $_item : $_item->toArray(); + } + return [ 'total_count' => $searchResult->getTotalCount(), - 'items' => $searchResult->getItems(), + 'items' => $items, 'page_info' => [ 'page_size' => $args['pageSize'], 'current_page' => $args['currentPage'], diff --git a/Model/Resolver/Tags.php b/Model/Resolver/Tags.php index bd4326e..6062093 100644 --- a/Model/Resolver/Tags.php +++ b/Model/Resolver/Tags.php @@ -67,9 +67,13 @@ public function resolve( $collection->setCurPage($args['currentPage']); $collection->setPageSize($args['pageSize']); + $items = []; + foreach ($collection as $_item) { + $items[] = $_item->getdata(); + } return [ 'total_count' => $collection->getSize(), - 'items' => $collection->getData(), + 'items' => $items, 'page_info' => [ 'page_size' => $collection->getPageSize(), 'current_page' => $collection->getCurPage(), From 0ff95abed009157acdc277fb85c183494ea69cef Mon Sep 17 00:00:00 2001 From: Misha Date: Mon, 1 May 2023 18:10:51 +0700 Subject: [PATCH 4/4] version 1.0.1 --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index aa72539..a2378e7 100644 --- a/composer.json +++ b/composer.json @@ -2,6 +2,7 @@ "name": "l/module-faq-graph-ql", "description": "Magento 2 Faq Graph Ql extension is free module support graph ql for magento 2.3.x the module require commerce Lof Faq extension", "type": "magento2-module", + "version": "1.0.1", "keywords": [ "landofcoder", "landofcoder faq",