MAGETWO-40097: Refactor Search Web Api

  - Fixed search algorithm

Author: aohorodnyk

app/code/Magento/Search/Model/Search.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Search\Model;
 
-use Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Search\Request\Builder;
@@ -36,30 +35,22 @@ class Search implements SearchInterface
      */
     private $searchResponseBuilder;
 
-    /**
-     * @var ScopeConfigInterface
-     */
-    private $scopeConfig;
-
     /**
      * @param Builder $requestBuilder
      * @param StoreManagerInterface $storeManager
      * @param SearchEngineInterface $searchEngine
      * @param SearchResponseBuilder $searchResponseBuilder
-     * @param ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         Builder $requestBuilder,
         StoreManagerInterface $storeManager,
         SearchEngineInterface $searchEngine,
-        SearchResponseBuilder $searchResponseBuilder,
-        ScopeConfigInterface $scopeConfig
+        SearchResponseBuilder $searchResponseBuilder
     ) {
         $this->requestBuilder = $requestBuilder;
         $this->storeManager = $storeManager;
         $this->searchEngine = $searchEngine;
         $this->searchResponseBuilder = $searchResponseBuilder;
-        $this->scopeConfig = $scopeConfig;
     }
 
     /**
@@ -69,11 +60,6 @@ public function search(SearchCriteriaInterface $searchCriteria)
     {
         $this->requestBuilder->setRequestName($searchCriteria->getRequestName());
 
-        $searchTerm = $searchCriteria->getSearchTerm();
-        if (!empty($searchTerm)) {
-            $this->requestBuilder->bind('search_term', $searchTerm);
-        }
-
         $storeId = $this->storeManager->getStore(true)->getId();
         $this->requestBuilder->bindDimension('scope', $storeId);
 
@@ -83,14 +69,6 @@ public function search(SearchCriteriaInterface $searchCriteria)
             }
         }
 
-        $priceRangeCalculation = $this->scopeConfig->getValue(
-            AlgorithmFactory::XML_PATH_RANGE_CALCULATION,
-            ScopeInterface::SCOPE_STORE
-        );
-        if ($priceRangeCalculation) {
-            $this->requestBuilder->bind('price_dynamic_algorithm', $priceRangeCalculation);
-        }
-
         $this->requestBuilder->setFrom($searchCriteria->getCurrentPage() * $searchCriteria->getPageSize());
         $this->requestBuilder->setSize($searchCriteria->getPageSize());
         $request = $this->requestBuilder->create();

app/code/Magento/Search/Test/Unit/Model/SearchTest.php

@@ -31,11 +31,6 @@ class SearchTest extends \PHPUnit_Framework_TestCase
      */
     protected $searchResponseBuilder;
 
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $scopeConfig;
-
     /**
      * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -57,10 +52,6 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
         $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -69,7 +60,6 @@ protected function setUp()
             'requestBuilder' => $this->requestBuilder,
             'searchEngine' => $this->searchEngine,
             'searchResponseBuilder' => $this->searchResponseBuilder,
-            'scopeConfig' => $this->scopeConfig,
             'storeManager' => $this->storeManager,
         ]);
     }
@@ -106,9 +96,6 @@ public function testSearch()
         $searchCriteria->expects($this->once())
             ->method('getRequestName')
             ->willReturn($requestName);
-        $searchCriteria->expects($this->once())
-            ->method('getSearchTerm')
-            ->willReturn($searchTerm);
         $searchCriteria->expects($this->once())
             ->method('getFilterGroups')
             ->willReturn([$filterGroup]);
@@ -158,11 +145,6 @@ public function testSearch()
             ->method('getStore')
             ->willReturn($store);
 
-        $this->scopeConfig->expects($this->once())
-            ->method('getValue')
-            ->with(AlgorithmFactory::XML_PATH_RANGE_CALCULATION, ScopeInterface::SCOPE_STORE)
-            ->willReturn($priceRangeCalculation);
-
         $searchResult = $this->model->search($searchCriteria);
 
         $this->assertInstanceOf('Magento\Framework\Api\Search\SearchResultInterface', $searchResult);

dev/tests/api-functional/testsuite/Magento/Search/Api/SearchTest.php

@@ -21,9 +21,21 @@ public function testCatalogSearch()
     {
         $searchCriteria = [
             'searchCriteria' => [
-                'search_term' => 'simple',
                 'request_name' => 'quick_search_container',
-                'filter_groups' => [],
+                'filter_groups' => [
+                    [
+                        'filters' => [
+                            [
+                                'field' => 'search_term',
+                                'value' => 'simple',
+                            ],
+                            [
+                                'field' => 'price_dynamic_algorithm',
+                                'value' => 'auto',
+                            ]
+                        ]
+                    ]
+                ],
                 'page_size' => 20000000000000,
                 'current_page' => 1,
             ],

lib/internal/Magento/Framework/Api/Search/SearchCriteria.php

@@ -10,25 +10,8 @@
 
 class SearchCriteria extends BaseSearchCriteria implements SearchCriteriaInterface
 {
-    const SEARCH_TERM = 'search_term';
     const REQUEST_NAME = 'request_name';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getSearchTerm()
-    {
-        return $this->_get(self::SEARCH_TERM);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setSearchTerm($searchTerm)
-    {
-        return $this->setData(self::SEARCH_TERM, $searchTerm);
-    }
-
     /**
      * {@inheritdoc}
      */

lib/internal/Magento/Framework/Api/Search/SearchCriteriaInterface.php

@@ -9,17 +9,6 @@
 
 interface SearchCriteriaInterface extends BaseSearchCriteriaInterface
 {
-    /**
-     * @return string
-     */
-    public function getSearchTerm();
-
-    /**
-     * @param string $searchTerm
-     * @return $this
-     */
-    public function setSearchTerm($searchTerm);
-
     /**
      * @return string
      */