Merge pull request #153 from Nosto/hotfix/4.0.1

Hotfix/4.0.1 - Fix CM GraphQl pagination issue

Author: olsi-qose

CHANGELOG.md

@@ -1,5 +1,8 @@
 All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.
 
+### 4.0.1
+* Fix empty results issues on Magento's GraphQl pagination
+
 ### 4.0.0
 * Remove support for MySQL as search engine
 * Move CategoryMerchandising util to php-sdk

Plugin/CatalogGraphQl/Products/DataProvider/ProductSearch.php

@@ -37,7 +37,9 @@
 namespace Nosto\Cmp\Plugin\CatalogGraphQl\Products\DataProvider;
 
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\ProductSearch as MagentoProductSearch;
+use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchResultsInterface;
+use Nosto\Cmp\Helper\CategorySorting;
 use Nosto\Cmp\Model\Service\Merchandise\LastResult;
 
 /**
@@ -57,6 +59,21 @@ public function __construct(
         $this->lastResult = $lastResult;
     }
 
+    /**
+     * @param MagentoProductSearch $productSearch
+     * @param SearchCriteriaInterface $searchCriteria
+     */
+    // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter
+    public function beforeGetList(MagentoProductSearch $productSearch, SearchCriteriaInterface $searchCriteria)
+    {
+        //Set currentPage to 1, this will make sure that OFFSET is not applied to the MySQL query
+        foreach ($searchCriteria->getSortOrders() as $sortOrder) {
+            if ($sortOrder->getField() === CategorySorting::NOSTO_PERSONALIZED_KEY) {
+                $searchCriteria->setCurrentPage(1);
+            }
+        }
+    }
+
     /**
      * @param MagentoProductSearch $productSearch
      * @param SearchResultsInterface $result

Plugin/CatalogGraphQl/Products/Query/Search.php

@@ -115,7 +115,7 @@ public function afterGetResult(
         if (isset($args[self::SORT_KEY]) && isset($args[self::SORT_KEY][CategorySorting::NOSTO_PERSONALIZED_KEY])
             && $this->getTotalPages() != 0) {
             return $this->searchResultFactory->create([
-                'totalCount' => $searchResult->getTotalCount(),
+                'totalCount' => $this->getTotalCount(),
                 'productsSearchResult' => $searchResult->getProductsSearchResult(),
                 'searchAggregation' => $searchResult->getSearchAggregation(),
                 'pageSize' => $searchResult->getPageSize(),
@@ -138,4 +138,16 @@ private function getTotalPages()
         }
         return (int) ceil($batchModel->getTotalCount() / $batchModel->getLastUsedLimit());
     }
+
+    /**
+     * @return int
+     */
+    private function getTotalCount()
+    {
+        $batchModel = $this->sessionService->getBatchModel();
+        if ($batchModel === null) {
+            return 0;
+        }
+        return $batchModel->getTotalCount();
+    }
 }

composer.json

@@ -2,7 +2,7 @@
   "name": "nosto/module-nostocmp",
   "description": "Nosto Category Merchandising extension for Magento 2",
   "type": "magento2-module",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "require-dev": {
     "magento-ecg/coding-standard": "3.*",
     "magento/module-store": "101.1.2",

etc/module.xml

@@ -37,7 +37,7 @@
 <!--suppress XmlUnboundNsPrefix -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Nosto_Cmp" setup_version="4.0.0">
+    <module name="Nosto_Cmp" setup_version="4.0.1">
         <sequence>
             <module name="Nosto_Tagging"/>
         </sequence>