Merge remote-tracking branch 'origin/MAGETWO-39542' into S70pr

# Conflicts:
#	lib/internal/Magento/Framework/Search/Response/Aggregation/Value.php
#	lib/internal/Magento/Framework/Search/Response/Bucket.php

Author: Andrii Kasian

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

@@ -72,4 +72,10 @@ 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

@@ -76,12 +76,12 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
     protected $linkInitializer;
 
     /*
-     * @param \Magento\Catalog\Model\Product\LinkTypeProvider
+     * @var \Magento\Catalog\Model\Product\LinkTypeProvider
      */
     protected $linkTypeProvider;
 
     /*
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -140,6 +140,25 @@ 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
@@ -162,6 +181,10 @@ 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(
@@ -185,7 +208,11 @@ public function __construct(
         MimeTypeExtensionMap $mimeTypeExtensionMap,
         \Magento\Eav\Model\Config $eavConfig,
         ImageProcessorInterface $imageProcessor,
-        \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
+        \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
     ) {
         $this->productFactory = $productFactory;
         $this->collectionFactory = $collectionFactory;
@@ -208,6 +235,10 @@ public function __construct(
         $this->eavConfig = $eavConfig;
         $this->imageProcessor = $imageProcessor;
         $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
+        $this->requestBuilder = $requestBuilder;
+        $this->searchEngine = $searchEngine;
+        $this->searchResponseBuilder = $searchResponseBuilder;
+        $this->scopeConfig = $scopeConfig;
     }
 
     /**
@@ -690,6 +721,45 @@ 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.
      *
@@ -710,4 +780,26 @@ 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/Model/SearchResponseBuilder.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Model;
+
+use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\Framework\Api\Search\DocumentFactory;
+use Magento\Framework\Api\Search\SearchResultFactory;
+use Magento\Framework\Search\ResponseInterface;
+
+class SearchResponseBuilder
+{
+    /**
+     * @var DocumentFactory
+     */
+    private $documentFactory;
+
+    /**
+     * @var SearchResultFactory
+     */
+    private $searchResultFactory;
+
+    /**
+     * @param SearchResultFactory $searchResultFactory
+     * @param DocumentFactory $documentFactory
+     */
+    public function __construct(
+        SearchResultFactory $searchResultFactory,
+        DocumentFactory $documentFactory
+    ) {
+        $this->documentFactory = $documentFactory;
+        $this->searchResultFactory = $searchResultFactory;
+    }
+
+    /**
+     * @param ResponseInterface $response
+     * @return SearchResultInterface
+     */
+    public function build(ResponseInterface $response)
+    {
+        /** @var \Magento\Framework\Api\Search\SearchResult $searchResult */
+        $searchResult = $this->searchResultFactory->create();
+
+        /** @var \Magento\Framework\Api\Search\DocumentInterface[] $documents */
+        $documents = [];
+
+        /** @var \Magento\Framework\Search\Document $responseDocument */
+        foreach ($response as $responseDocument) {
+            $document = $this->documentFactory->create();
+
+            /** @var \Magento\Framework\Search\DocumentField $field */
+            foreach ($responseDocument as $field) {
+                $document->setCustomAttribute($field->getName(), $field->getValue());
+            }
+
+            $document->setId($responseDocument->getId());
+
+            $documents[] = $document;
+        }
+        $searchResult->setItems($documents);
+        $searchResult->setAggregations($response->getAggregations());
+        $searchResult->setTotalCount(count($documents));
+
+        return $searchResult;
+    }
+}