Merge pull request #384 from magento-ogre/PR_Branch

[Ogre's] Search features, functional test fixes and bug fixes

Author: Kopylova,Olga(okopylova)

app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml

@@ -27,7 +27,19 @@
     </form>
     <script data-template="search-suggest" type="text/x-magento-template">
         <ul class="search-global-menu">
-        <% if (data.items.length) { %>
+        <li class="item">
+            <a href="<?php /* @escapeNotVerified */ echo $block->getURL('catalog/product/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
+        </li>
+        <li class="item">
+            <a href="<?php /* @escapeNotVerified */ echo $block->getURL('sales/order/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
+        </li>
+        <li class="item">
+            <a href="<?php /* @escapeNotVerified */ echo $block->getURL('customer/index/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
+        </li>
+        <li class="item">
+            <a href="<?php /* @escapeNotVerified */ echo $block->getURL('cms/page/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
+        </li>
+            <% if (data.items.length) { %>
             <% _.each(data.items, function(value){ %>
             <li class="item"
                 <%- data.optionData(value) %>

app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php

@@ -6,6 +6,8 @@
 namespace Magento\CatalogSearch\Model\ResourceModel\Advanced;
 
 use Magento\Catalog\Model\Product;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Search\SearchCriteriaBuilder;
 use Magento\Framework\Search\Adapter\Mysql\TemporaryStorage;
 
 /**
@@ -23,19 +25,24 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
     private $filters = [];
 
     /**
-     * @var \Magento\CatalogSearch\Model\Advanced\Request\Builder
+     * @var \Magento\Search\Api\SearchInterface
      */
-    private $requestBuilder;
+    private $search;
 
     /**
-     * @var \Magento\Search\Model\SearchEngine
+     * @var \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory
      */
-    private $searchEngine;
+    private $temporaryStorageFactory;
 
     /**
-     * @var \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory
+     * @var SearchCriteriaBuilder
      */
-    private $temporaryStorageFactory;
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var FilterBuilder
+     */
+    private $filterBuilder;
 
     /**
      * Collection constructor.
@@ -59,10 +66,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitation $productLimitation
-     * @param \Magento\CatalogSearch\Model\Advanced\Request\Builder $requestBuilder
-     * @param \Magento\Search\Model\SearchEngine $searchEngine
+     * @param \Magento\Search\Api\SearchInterface $search
      * @param \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory $temporaryStorageFactory
-     * @param \Zend_Db_Adapter_Abstract $connection
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param FilterBuilder $filterBuilder
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -86,14 +94,16 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime $dateTime,
         \Magento\Customer\Api\GroupManagementInterface $groupManagement,
         \Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitation $productLimitation,
-        \Magento\CatalogSearch\Model\Advanced\Request\Builder $requestBuilder,
-        \Magento\Search\Model\SearchEngine $searchEngine,
+        \Magento\Search\Api\SearchInterface $search,
         \Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory $temporaryStorageFactory,
-        $connection = null
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        FilterBuilder $filterBuilder,
+        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null
     ) {
-        $this->requestBuilder = $requestBuilder;
-        $this->searchEngine = $searchEngine;
+        $this->search = $search;
         $this->temporaryStorageFactory = $temporaryStorageFactory;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->filterBuilder = $filterBuilder;
         parent::__construct(
             $entityFactory,
             $logger,
@@ -140,19 +150,18 @@ public function addFieldsToFilter($fields)
     protected function _renderFiltersBefore()
     {
         if ($this->filters) {
-            $this->requestBuilder->bindDimension('scope', $this->getStoreId());
-            $this->requestBuilder->setRequestName('advanced_search_container');
             foreach ($this->filters as $attributes) {
                 foreach ($attributes as $attributeCode => $attributeValue) {
                     $attributeCode = $this->getAttributeCode($attributeCode);
-                    $this->requestBuilder->bindRequestValue($attributeCode, $attributeValue);
+                    $this->addAttributeToSearch($attributeCode, $attributeValue);
                 }
             }
-            $queryRequest = $this->requestBuilder->create();
-            $queryResponse = $this->searchEngine->search($queryRequest);
+            $searchCriteria = $this->searchCriteriaBuilder->create();
+            $searchCriteria->setRequestName('advanced_search_container');
+            $searchResult = $this->search->search($searchCriteria);
 
             $temporaryStorage = $this->temporaryStorageFactory->create();
-            $table = $temporaryStorage->storeDocuments($queryResponse->getIterator());
+            $table = $temporaryStorage->storeApiDocuments($searchResult->getItems());
 
             $this->getSelect()->joinInner(
                 [
@@ -162,7 +171,7 @@ protected function _renderFiltersBefore()
                 []
             );
         }
-        return parent::_renderFiltersBefore();
+        parent::_renderFiltersBefore();
     }
 
     /**
@@ -178,4 +187,49 @@ private function getAttributeCode($attributeCode)
 
         return $attributeCode;
     }
+
+    /**
+     * Create a filter and add it to the SearchCriteriaBuilder.
+     *
+     * @param string $attributeCode
+     * @param array|string $attributeValue
+     * @return void
+     */
+    private function addAttributeToSearch($attributeCode, $attributeValue)
+    {
+        if (isset($attributeValue['from']) || isset($attributeValue['to'])) {
+            $this->addRangeAttributeToSearch($attributeCode, $attributeValue);
+        } elseif (!is_array($attributeValue)) {
+            $this->filterBuilder->setField($attributeCode)->setValue($attributeValue);
+            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+        } elseif (isset($attributeValue['like'])) {
+            $this->filterBuilder->setField($attributeCode)->setValue($attributeValue['like']);
+            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+        } elseif (isset($attributeValue['in'])) {
+            $this->filterBuilder->setField($attributeCode)->setValue($attributeValue['in']);
+            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+        } elseif (isset($attributeValue['in_set'])) {
+            $this->filterBuilder->setField($attributeCode)->setValue($attributeValue['in_set']);
+            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+        }
+    }
+
+    /**
+     * Add attributes that have a range (from,to) to the SearchCriteriaBuilder.
+     *
+     * @param string $attributeCode
+     * @param array|string $attributeValue
+     * @return void
+     */
+    private function addRangeAttributeToSearch($attributeCode, $attributeValue)
+    {
+        if (isset($attributeValue['from']) && '' !== $attributeValue['from']) {
+            $this->filterBuilder->setField("{$attributeCode}.from")->setValue($attributeValue['from']);
+            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+        }
+        if (isset($attributeValue['to']) && '' !== $attributeValue['to']) {
+            $this->filterBuilder->setField("{$attributeCode}.to")->setValue($attributeValue['to']);
+            $this->searchCriteriaBuilder->addFilter($this->filterBuilder->create());
+        }
+    }
 }