MAGETWO-44333: Move Search API to Framework to Make Grid Component work through them

Author: aohorodnyk

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

@@ -9,8 +9,9 @@
 use Magento\Framework\Api\Search\DocumentFactory;
 use Magento\Framework\Api\Search\SearchResultFactory;
 use Magento\Framework\Search\ResponseInterface;
+use Magento\Framework\Search\SearchResponseBuilderInterface;
 
-class SearchResponseBuilder
+class SearchResponseBuilder implements SearchResponseBuilderInterface
 {
     /**
      * @var DocumentFactory

app/code/Magento/Search/etc/di.xml

@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\Search\Api\SearchInterface" type="Magento\Search\Model\Search"/>
+    <preference for="Magento\Framework\Search\SearchResponseBuilderInterface" type="Magento\Search\Model\SearchResponseBuilder"/>
     <type name="Magento\Framework\Module\Setup\Migration">
         <arguments>
             <argument name="compositeModules" xsi:type="array">

app/code/Magento/Search/etc/webapi.xml

@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Webapi:etc/webapi.xsd">
 
     <route url="/V1/search" method="GET">
-        <service class="Magento\Search\Api\SearchInterface" method="search"/>
+        <service class="Magento\Framework\Api\Search\SearchInterface" method="search"/>
         <resources>
             <resource ref="anonymous" />
         </resources>

app/etc/di.xml

@@ -139,6 +139,7 @@
     <preference for="Magento\Framework\Api\ImageProcessorInterface" type="Magento\Framework\Api\ImageProcessor" />
     <preference for="Magento\Framework\Code\Reader\ClassReaderInterface" type="Magento\Framework\Code\Reader\ClassReader" />
     <preference for="Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface" type="Magento\Framework\Stdlib\DateTime\DateTimeFormatter"/>
+    <preference for="Magento\Framework\Api\Search\SearchInterface" type="Magento\Framework\Search\Search"/>
     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
     <type name="Magento\Framework\Logger\Handler\Base">
         <arguments>

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

@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Search\Api;
+namespace Magento\Framework\Api\Search;
 
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
@@ -15,7 +15,7 @@ class SearchTest extends WebapiAbstract
 
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-     * @covers \Magento\Search\Model\Search::search
+     * @covers \Magento\Framework\Search\Search::search
      */
     public function testCatalogSearch()
     {

app/code/Magento/Search/Api/SearchInterface.php renamed to lib/internal/Magento/Framework/Api/Search/SearchInterface.php

@@ -1,9 +1,9 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Search\Api;
+namespace Magento\Framework\Api\Search;
 
 /**
  * Search API for all requests

app/code/Magento/Search/Model/Search.php renamed to lib/internal/Magento/Framework/Search/Search.php

@@ -1,17 +1,14 @@
 <?php
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Search\Model;
+namespace Magento\Framework\Search;
 
+use Magento\Framework\Api\Search\SearchInterface;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\Search\Request\Builder;
-use Magento\Framework\Search\SearchEngineInterface;
-use Magento\Search\Api\SearchInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\StoreManagerInterface;
 
 class Search implements SearchInterface
 {
@@ -21,34 +18,34 @@ class Search implements SearchInterface
     private $requestBuilder;
 
     /**
-     * @var StoreManagerInterface
+     * @var ScopeResolverInterface
      */
-    private $storeManager;
+    private $scopeResolver;
 
     /**
      * @var SearchEngineInterface
      */
     private $searchEngine;
 
     /**
-     * @var SearchResponseBuilder
+     * @var SearchResponseBuilderInterface
      */
     private $searchResponseBuilder;
 
     /**
      * @param Builder $requestBuilder
-     * @param StoreManagerInterface $storeManager
+     * @param ScopeResolverInterface $scopeResolver
      * @param SearchEngineInterface $searchEngine
-     * @param SearchResponseBuilder $searchResponseBuilder
+     * @param SearchResponseBuilderInterface $searchResponseBuilder
      */
     public function __construct(
         Builder $requestBuilder,
-        StoreManagerInterface $storeManager,
+        ScopeResolverInterface $scopeResolver,
         SearchEngineInterface $searchEngine,
-        SearchResponseBuilder $searchResponseBuilder
+        SearchResponseBuilderInterface $searchResponseBuilder
     ) {
         $this->requestBuilder = $requestBuilder;
-        $this->storeManager = $storeManager;
+        $this->scopeResolver = $scopeResolver;
         $this->searchEngine = $searchEngine;
         $this->searchResponseBuilder = $searchResponseBuilder;
     }
@@ -60,8 +57,8 @@ public function search(SearchCriteriaInterface $searchCriteria)
     {
         $this->requestBuilder->setRequestName($searchCriteria->getRequestName());
 
-        $storeId = $this->storeManager->getStore(true)->getId();
-        $this->requestBuilder->bindDimension('scope', $storeId);
+        $scope = $this->scopeResolver->getScope();
+        $this->requestBuilder->bindDimension('scope', $scope);
 
         foreach ($searchCriteria->getFilterGroups() as $filterGroup) {
             foreach ($filterGroup->getFilters() as $filter) {
@@ -82,7 +79,7 @@ public function search(SearchCriteriaInterface $searchCriteria)
      * Apply attribute filter to facet collection
      *
      * @param string $field
-     * @param null $condition
+     * @param string|array|null $condition
      * @return $this
      */
     private function addFieldToFilter($field, $condition = null)
@@ -97,6 +94,7 @@ private function addFieldToFilter($field, $condition = null)
                 $this->requestBuilder->bind("{$field}.to", $condition['to']);
             }
         }
+
         return $this;
     }
 }

lib/internal/Magento/Framework/Search/SearchResponseBuilderInterface.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Search;
+
+interface SearchResponseBuilderInterface
+{
+    /**
+     * @param \Magento\Framework\Search\ResponseInterface $response
+     * @return \Magento\Framework\Api\Search\SearchResultInterface
+     */
+    public function build(\Magento\Framework\Search\ResponseInterface $response);
+}

app/code/Magento/Search/Test/Unit/Model/SearchTest.php renamed to lib/internal/Magento/Framework/Search/Test/Unit/SearchTest.php

@@ -3,16 +3,14 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Search\Test\Unit\Model;
+namespace Magento\Framework\Search\Test\Unit;
 
-use Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Store\Model\ScopeInterface;
 
 class SearchTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Search\Model\Search
+     * @var \Magento\Framework\Search\Search
      */
     protected $model;
 
@@ -22,19 +20,19 @@ class SearchTest extends \PHPUnit_Framework_TestCase
     protected $requestBuilder;
 
     /**
-     * @var \Magento\Search\Model\SearchEngine|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Search\SearchEngineInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $searchEngine;
 
     /**
-     * @var \Magento\Search\Model\SearchResponseBuilder|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Search\SearchResponseBuilderInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $searchResponseBuilder;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $storeManager;
+    protected $scopeResolver;
 
     protected function setUp()
     {
@@ -44,30 +42,30 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->searchEngine = $this->getMockBuilder('Magento\Search\Model\SearchEngine')
+        $this->searchEngine = $this->getMockBuilder('Magento\Framework\Search\SearchEngineInterface')
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->searchResponseBuilder = $this->getMockBuilder('Magento\Search\Model\SearchResponseBuilder')
+        $this->searchResponseBuilder = $this->getMockBuilder('Magento\Framework\Search\SearchResponseBuilderInterface')
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+        $this->scopeResolver = $this->getMockBuilder('Magento\Framework\App\ScopeResolverInterface')
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $this->model = $objectManager->getObject('Magento\Search\Model\Search', [
+        $this->model = $objectManager->getObject('Magento\Framework\Search\Search', [
             'requestBuilder' => $this->requestBuilder,
             'searchEngine' => $this->searchEngine,
             'searchResponseBuilder' => $this->searchResponseBuilder,
-            'storeManager' => $this->storeManager,
+            'scopeResolver' => $this->scopeResolver,
         ]);
     }
 
     public function testSearch()
     {
         $requestName = 'requestName';
-        $storeId = 333;
+        $scope = 333;
         $filterField = 'filterField';
         $filterValue = 'filterValue';
 
@@ -98,13 +96,6 @@ public function testSearch()
             ->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();
@@ -122,7 +113,7 @@ public function testSearch()
             ->with($requestName);
         $this->requestBuilder->expects($this->once())
             ->method('bindDimension')
-            ->with('scope', $storeId);
+            ->with('scope', $scope);
         $this->requestBuilder->expects($this->any())
             ->method('bind');
         $this->requestBuilder->expects($this->once())
@@ -139,9 +130,9 @@ public function testSearch()
             ->with($response)
             ->willReturn($searchResult);
 
-        $this->storeManager->expects($this->once())
-            ->method('getStore')
-            ->willReturn($store);
+        $this->scopeResolver->expects($this->once())
+            ->method('getScope')
+            ->willReturn($scope);
 
         $searchResult = $this->model->search($searchCriteria);