Merge branch 'master' into bump_1_11_3

Author: damcou

Adapter/Algolia.php

@@ -6,6 +6,7 @@
 use AlgoliaSearch\AlgoliaConnectionException;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Ddl\Table;
+use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder as AggregationBuilder;
 use Magento\Framework\Search\Adapter\Mysql\DocumentFactory;
 use Magento\Framework\Search\Adapter\Mysql\Mapper;
@@ -40,6 +41,11 @@ class Algolia implements AdapterInterface
     /** @var DocumentFactory */
     private $documentFactory;
 
+    private $countSqlSkipParts = [
+        Select::LIMIT_COUNT => true,
+        Select::LIMIT_OFFSET => true,
+    ];
+
     /**
      * @param Mapper $mapper
      * @param ResponseFactory $responseFactory
@@ -85,12 +91,13 @@ public function query(RequestInterface $request)
 
         $temporaryStorage = $this->temporaryStorageFactory->create();
         $documents = [];
+        $totalHits = 0;
         $table = null;
 
         try {
             // If instant search is on, do not make a search query unless SEO request is set to 'Yes'
             if (!$this->adapterHelper->isInstantEnabled() || $this->adapterHelper->makeSeoRequest()) {
-                $documents = $this->adapterHelper->getDocumentsFromAlgolia();
+                list($documents, $totalHits) = $this->adapterHelper->getDocumentsFromAlgolia();
             }
 
             $apiDocuments = array_map([$this, 'getApiDocument'], $documents);
@@ -103,6 +110,7 @@ public function query(RequestInterface $request)
         $response = [
             'documents' => $documents,
             'aggregations' => $aggregations,
+            'total' => $totalHits,
         ];
 
         return $this->responseFactory->create($response);
@@ -120,6 +128,7 @@ private function nativeQuery(RequestInterface $request)
         $response = [
             'documents' => $documents,
             'aggregations' => $aggregations,
+            'total' => $this->getSize($query),
         ];
 
         return $this->responseFactory->create($response);
@@ -153,4 +162,39 @@ private function getConnection()
     {
         return $this->resource->getConnection();
     }
+
+    /**
+     * Get rows size
+     *
+     * @param Select $query
+     * @return int
+     */
+    private function getSize(Select $query)
+    {
+        $sql = $this->getSelectCountSql($query);
+        $parentSelect = $this->getConnection()->select();
+        $parentSelect->from(['core_select' => $sql]);
+        $parentSelect->reset(Select::COLUMNS);
+        $parentSelect->columns('COUNT(*)');
+        $totalRecords = $this->getConnection()->fetchOne($parentSelect);
+
+        return (int) $totalRecords;
+    }
+
+    /**
+     * Reset limit and offset
+     *
+     * @param Select $query
+     * @return Select
+     */
+    private function getSelectCountSql(Select $query)
+    {
+        foreach ($this->countSqlSkipParts as $part => $toSkip) {
+            if ($toSkip) {
+                $query->reset($part);
+            }
+        }
+
+        return $query;
+    }
 }

Helper/AdapterHelper.php

@@ -50,19 +50,20 @@ public function getDocumentsFromAlgolia()
         $algoliaQuery = $query !== '__empty__' ? $query : '';
         $searchParams = [];
         $targetedIndex = null;
-        if ($this->isReplaceCategory($storeId) || $this->isSearch() || $this->isLandingPage()) {
+
+        if ($this->isReplaceCategory() || $this->isSearch() || $this->isLandingPage()) {
             $searchParams = $this->getSearchParams($storeId);
 
             // This is the first load of a landing page, so we have to get the parameters from the entity
-            if ($this->isLandingPage() && is_null($this->filtersHelper->getRawQueryParameter())) {
+            if ($this->isLandingPage() && $this->filtersHelper->getRawQueryParameter() === null) {
                 $searchParams = array_merge(
                     $searchParams,
                     $this->filtersHelper->getLandingPageFilters($storeId)
                 );
                 $algoliaQuery = $this->filtersHelper->getLandingPageQuery();
             }
 
-            if (!is_null($this->filtersHelper->getRequest()->getParam('sortBy'))) {
+            if ($this->filtersHelper->getRequest()->getParam('sortBy') !== null) {
                 $targetedIndex = $this->filtersHelper->getRequest()->getParam('sortBy');
             }
         }

Helper/Data.php

@@ -86,9 +86,17 @@ public function deleteObjects($storeId, $ids, $indexName)
         $this->algoliaHelper->deleteObjects($ids, $indexName);
     }
 
+    /**
+     * @param string $query
+     * @param int $storeId
+     * @param array|null $searchParams
+     * @param string|null $targetedIndex
+     *
+     * @return array
+     */
     public function getSearchResult($query, $storeId, $searchParams = null, $targetedIndex = null)
     {
-        $indexName = !is_null($targetedIndex) ?
+        $indexName = $targetedIndex !== null ?
             $targetedIndex :
             $this->getIndexName($this->productHelper->getIndexNameSuffix(), $storeId);
 
@@ -126,7 +134,7 @@ public function getSearchResult($query, $storeId, $searchParams = null, $targete
             }
         }
 
-        return $data;
+        return [$data, $answer['nbHits']];
     }
 
     public function rebuildStoreAdditionalSectionsIndex($storeId)

Model/Indexer/Category.php

@@ -101,18 +101,23 @@ public function executeRow($id)
      */
     private function rebuildAffectedProducts($storeId)
     {
-        $affectedProductsCount = count(self::$affectedProductIds);
+        $affectedProducts = self::$affectedProductIds;
+        $affectedProductsCount = count($affectedProducts);
+
         if ($affectedProductsCount > 0 && $this->configHelper->indexProductOnCategoryProductsUpdate($storeId)) {
-            /** @uses Data::rebuildStoreProductIndex() */
-            $this->queue->addToQueue(
-                Data::class,
-                'rebuildStoreProductIndex',
-                [
-                    'store_id' => $storeId,
-                    'product_ids' => self::$affectedProductIds,
-                ],
-                $affectedProductsCount
-            );
+            $productsPerPage = $this->configHelper->getNumberOfElementByPage();
+            foreach (array_chunk($affectedProducts, $productsPerPage) as $chunk) {
+                /** @uses Data::rebuildStoreProductIndex() */
+                $this->queue->addToQueue(
+                    Data::class,
+                    'rebuildStoreProductIndex',
+                    [
+                        'store_id' => $storeId,
+                        'product_ids' => $chunk,
+                    ],
+                    count($chunk)
+                );
+            }
         }
     }
 

Test/Integration/SearchTest.php

@@ -17,7 +17,7 @@ public function testSearch()
 
         /** @var Data $helper */
         $helper = $this->getObjectManager()->create('Algolia\AlgoliaSearch\Helper\Data');
-        $results = $helper->getSearchResult('', 1);
+        list($results, $totalHits) = $helper->getSearchResult('', 1);
 
         $this->assertNotEmpty($results);
     }