MAGETWO-40097: Refactor Search Web Api

Author: aohorodnyk

app/code/Magento/Catalog/Api/ProductRepositoryInterface.php

@@ -72,10 +72,4 @@ public function deleteById($sku);
      * @return \Magento\Catalog\Api\Data\ProductSearchResultsInterface
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
-
-    /**
-     * @param \Magento\Framework\Api\Search\SearchCriteriaInterface $searchCriteria
-     * @return \Magento\Framework\Api\Search\SearchResultInterface
-     */
-    public function search(\Magento\Framework\Api\Search\SearchCriteriaInterface $searchCriteria);
 }

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -135,25 +135,6 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      */
     protected $extensionAttributesJoinProcessor;
 
-    /**
-     * @var \Magento\Framework\Search\Request\Builder
-     */
-    private $requestBuilder;
-
-    /**
-     * @var \Magento\Framework\Search\SearchEngineInterface
-     */
-    private $searchEngine;
-
-    /**
-     * @var SearchResponseBuilder
-     */
-    private $searchResponseBuilder;
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    private $scopeConfig;
-
     /**
      * @param ProductFactory $productFactory
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper $initializationHelper
@@ -176,10 +157,6 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param ImageProcessorInterface $imageProcessor
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
-     * @param \Magento\Framework\Search\Request\Builder $requestBuilder
-     * @param \Magento\Framework\Search\SearchEngineInterface $searchEngine
-     * @param SearchResponseBuilder $searchResponseBuilder
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -202,11 +179,7 @@ public function __construct(
         ImageContentInterfaceFactory $contentFactory,
         MimeTypeExtensionMap $mimeTypeExtensionMap,
         ImageProcessorInterface $imageProcessor,
-        \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor,
-        \Magento\Framework\Search\Request\Builder $requestBuilder,
-        \Magento\Framework\Search\SearchEngineInterface $searchEngine,
-        SearchResponseBuilder $searchResponseBuilder,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+        \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
     ) {
         $this->productFactory = $productFactory;
         $this->collectionFactory = $collectionFactory;
@@ -228,10 +201,6 @@ public function __construct(
         $this->mimeTypeExtensionMap = $mimeTypeExtensionMap;
         $this->imageProcessor = $imageProcessor;
         $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
-        $this->requestBuilder = $requestBuilder;
-        $this->searchEngine = $searchEngine;
-        $this->searchResponseBuilder = $searchResponseBuilder;
-        $this->scopeConfig = $scopeConfig;
     }
 
     /**
@@ -703,45 +672,6 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         return $searchResult;
     }
 
-    /**
-     * @param \Magento\Framework\Api\Search\SearchCriteriaInterface $searchCriteria
-     * @return \Magento\Framework\Api\Search\SearchResultInterface
-     */
-    public function search(\Magento\Framework\Api\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);
-
-        foreach ($searchCriteria->getFilterGroups() as $filterGroup) {
-            foreach ($filterGroup->getFilters() as $filter) {
-                $this->addFieldToFilter($filter->getField(), $filter->getValue());
-            }
-        }
-
-        $priceRangeCalculation = $this->scopeConfig->getValue(
-            \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory::XML_PATH_RANGE_CALCULATION,
-            \Magento\Store\Model\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();
-        $searchResponse = $this->searchEngine->search($request);
-
-        return $this->searchResponseBuilder->build($searchResponse)
-            ->setSearchCriteria($searchCriteria);
-    }
-
     /**
      * Helper function that adds a FilterGroup to the collection.
      *
@@ -762,26 +692,4 @@ protected function addFilterGroupToCollection(
             $collection->addFieldToFilter($fields);
         }
     }
-
-    /**
-     * Apply attribute filter to facet collection
-     *
-     * @param string $field
-     * @param null $condition
-     * @return $this
-     */
-    private function addFieldToFilter($field, $condition = null)
-    {
-        if (!is_array($condition) || !in_array(key($condition), ['from', 'to'])) {
-            $this->requestBuilder->bind($field, $condition);
-        } else {
-            if (!empty($condition['from'])) {
-                $this->requestBuilder->bind("{$field}.from", $condition['from']);
-            }
-            if (!empty($condition['to'])) {
-                $this->requestBuilder->bind("{$field}.to", $condition['to']);
-            }
-        }
-        return $this;
-    }
 }

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -130,26 +130,6 @@ class ProductRepositoryTest extends \PHPUnit_Framework_TestCase
      */
     protected $objectManager;
 
-    /**
-     * @var \Magento\Framework\Search\Request\Builder|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $requestBuilder;
-
-    /**
-     * @var \Magento\Search\Model\SearchEngine|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $searchEngine;
-
-    /**
-     * @var \Magento\Catalog\Model\SearchResponseBuilder|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $searchResponseBuilder;
-
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $scopeConfig;
-
     /**
      * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -241,22 +221,6 @@ protected function setUp()
             ['getLinkTypes'], [], '', false);
         $this->imageProcessorMock = $this->getMock('Magento\Framework\Api\ImageProcessorInterface', [], [], '', false);
 
-        $this->requestBuilder = $this->getMockBuilder('Magento\Framework\Search\Request\Builder')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->searchEngine = $this->getMockBuilder('Magento\Search\Model\SearchEngine')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->searchResponseBuilder = $this->getMockBuilder('Magento\Catalog\Model\SearchResponseBuilder')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
         $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -280,10 +244,6 @@ protected function setUp()
                 'mimeTypeExtensionMap' => $this->mimeTypeExtensionMapMock,
                 'linkTypeProvider' => $this->linkTypeProviderMock,
                 'imageProcessor' => $this->imageProcessorMock,
-                'requestBuilder' => $this->requestBuilder,
-                'searchEngine' => $this->searchEngine,
-                'searchResponseBuilder' => $this->searchResponseBuilder,
-                'scopeConfig' => $this->scopeConfig,
                 'storeManager' => $this->storeManager,
             ]
         );
@@ -1236,98 +1196,4 @@ public function testSaveExistingWithMediaGalleryEntries()
         $this->model->save($this->productMock);
         $this->assertEquals($expectedResult, $this->initializedProductMock->getMediaGallery('images'));
     }
-
-    public function testSearch()
-    {
-        $requestName = 'requestName';
-        $searchTerm = 'searchTerm';
-        $storeId = 333;
-        $filterField = 'filterField';
-        $filterValue = 'filterValue';
-        $priceRangeCalculation = 'auto';
-
-        $filter = $this->getMockBuilder('Magento\Framework\Api\Filter')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $filter->expects($this->once())
-            ->method('getField')
-            ->willReturn($filterField);
-        $filter->expects($this->once())
-            ->method('getValue')
-            ->willReturn($filterValue);
-
-        $filterGroup = $this->getMockBuilder('Magento\Framework\Api\Search\FilterGroup')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $filterGroup->expects($this->once())
-            ->method('getFilters')
-            ->willReturn([$filter]);
-
-        $searchCriteria = $this->getMockBuilder('Magento\Framework\Api\Search\SearchCriteriaInterface')
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $searchCriteria->expects($this->once())
-            ->method('getRequestName')
-            ->willReturn($requestName);
-        $searchCriteria->expects($this->once())
-            ->method('getSearchTerm')
-            ->willReturn($searchTerm);
-        $searchCriteria->expects($this->once())
-            ->method('getFilterGroups')
-            ->willReturn([$filterGroup]);
-
-        $store = $this->getMockBuilder('Magento\Store\Model\Store')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $store->expects($this->once())
-            ->method('getId')
-            ->willReturn($storeId);
-
-        $searchResult = $this->getMockBuilder('Magento\Framework\Api\Search\SearchResult')
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $request = $this->getMockBuilder('Magento\Framework\Search\RequestInterface')
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $response = $this->getMockBuilder('Magento\Framework\Search\ResponseInterface')
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->requestBuilder->expects($this->once())
-            ->method('setRequestName')
-            ->with($requestName);
-        $this->requestBuilder->expects($this->once())
-            ->method('bindDimension')
-            ->with('scope', $storeId);
-        $this->requestBuilder->expects($this->any())
-            ->method('bind');;
-        $this->requestBuilder->expects($this->once())
-            ->method('create')
-            ->willReturn($request);
-
-        $this->searchEngine->expects($this->once())
-            ->method('search')
-            ->with($request)
-            ->willReturn($response);
-
-        $this->searchResponseBuilder->expects($this->once())
-            ->method('build')
-            ->with($response)
-            ->willReturn($searchResult);
-
-        $this->storeManager->expects($this->once())
-            ->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);
-    }
 }

app/code/Magento/Search/Api/SearchInterface.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: aohorodnyk
+ * Date: 14.07.2015
+ * Time: 9:47
+ */
+namespace Magento\Search\Api;
+
+
+interface SearchInterface
+{
+    /**
+     * @param \Magento\Framework\Api\Search\SearchCriteriaInterface $searchCriteria
+     * @return \Magento\Framework\Api\Search\SearchResultInterface
+     */
+    public function search(\Magento\Framework\Api\Search\SearchCriteriaInterface $searchCriteria);
+}