Merge pull request #445 from magento-dragons/092016-pr-2.2

Fixed issues: - MAGETWO-57868: Search fails with an error when used user-defined price attribute as searchable - for mainline - MAGETWO-57924: Unable to add "Customer Group Price" - MAGETWO-55341: Request to ESI doesn't return any data - MAGETWO-57892: L4 Plan fails on mainline branch - MAGETWO-56150: Order comments history shows time of comment twice - MAGETWO-57933: Product quantity is not updated on 'cart/configure' page second time - MAGETWO-53041: 'Yes/No' attribute shown in Advanced Search result even it not used in filtration - MAGETWO-52926: Impossible to find product on Store Front with name like lowerCamelCaseNumber
magento · Sep 29, 2016 · f39ad29 · f39ad29
2 parents 0cb8b17 + 79bacd3
commit f39ad29
Show file tree

Hide file tree

Showing 24 changed files with 611 additions and 133 deletions.
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
@@ -493,7 +493,6 @@ private function getTierPriceStructure($tierPricePath)
                                 'data' => [
                                     'config' => [
                                         'componentType' => Field::NAME,
-                                        'component' => 'Magento_Catalog/js/form/element/price-input',
                                         'formElement' => Input::NAME,
                                         'dataType' => Price::NAME,
                                         'label' => __('Price'),

diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/price-input.js b/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/price-input.js
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/price-input.html b/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/price-input.html
diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Result.php b/app/code/Magento/CatalogSearch/Block/Advanced/Result.php
@@ -64,6 +64,7 @@ public function __construct(
      */
     protected function _prepareLayout()
     {
+        $this->pageConfig->getTitle()->set($this->getPageTitle());
         $breadcrumbs = $this->getLayout()->getBlock('breadcrumbs');
         if ($breadcrumbs) {
             $breadcrumbs->addCrumb(
@@ -84,6 +85,16 @@ protected function _prepareLayout()
         return parent::_prepareLayout();
     }
 
+    /**
+     * Get page title
+     *
+     * @return \Magento\Framework\Phrase
+     */
+    private function getPageTitle()
+    {
+        return __('Advanced Search Results');
+    }
+
     /**
      * Set order options
      *

diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -368,9 +368,11 @@ protected function getPreparedSearchCriteria($attribute, $value)
                 $value = $value['label'];
             }
         } elseif ($attribute->getFrontendInput() == 'boolean') {
-            $value = $value == 1
-                ? __('Yes')
-                : __('No');
+            if (is_numeric($value)) {
+                $value = $value == 1 ? __('Yes') : __('No');
+            } else {
+                $value = false;
+            }
         }
 
         return $value;

diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
@@ -8,7 +8,8 @@
 use Magento\Catalog\Api\Data\EavAttributeInterface;
 use Magento\Catalog\Model\Entity\Attribute;
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
-use Magento\Framework\Search\Request\BucketInterface;
+use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorResolver;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Search\Request\FilterInterface;
 use Magento\Framework\Search\Request\QueryInterface;
 
@@ -25,12 +26,22 @@ class RequestGenerator
      */
     private $productAttributeCollectionFactory;
 
+    /**
+     * @var GeneratorResolver
+     */
+    private $generatorResolver;
+
     /**
      * @param CollectionFactory $productAttributeCollectionFactory
+     * @param GeneratorResolver $generatorResolver
      */
-    public function __construct(CollectionFactory $productAttributeCollectionFactory)
-    {
+    public function __construct(
+        CollectionFactory $productAttributeCollectionFactory,
+        GeneratorResolver $generatorResolver = null
+    ) {
         $this->productAttributeCollectionFactory = $productAttributeCollectionFactory;
+        $this->generatorResolver = $generatorResolver
+            ?: ObjectManager::getInstance()->get(GeneratorResolver::class);
     }
 
     /**
@@ -62,7 +73,7 @@ private function generateRequest($attributeType, $container, $useFulltext)
         $request = [];
         foreach ($this->getSearchableAttributes() as $attribute) {
             if ($attribute->getData($attributeType)) {
-                if (!in_array($attribute->getAttributeCode(), ['price', 'category_ids'])) {
+                if (!in_array($attribute->getAttributeCode(), ['price', 'category_ids'], true)) {
                     $queryName = $attribute->getAttributeCode() . '_query';
 
                     $request['queries'][$container]['queryReference'][] = [
@@ -76,58 +87,33 @@ private function generateRequest($attributeType, $container, $useFulltext)
                         'filterReference' => [['ref' => $filterName]],
                     ];
                     $bucketName = $attribute->getAttributeCode() . self::BUCKET_SUFFIX;
-                    if ($attribute->getBackendType() == 'decimal') {
-                        $request['filters'][$filterName] = [
-                            'type' => FilterInterface::TYPE_RANGE,
-                            'name' => $filterName,
-                            'field' => $attribute->getAttributeCode(),
-                            'from' => '$' . $attribute->getAttributeCode() . '.from$',
-                            'to' => '$' . $attribute->getAttributeCode() . '.to$',
-                        ];
-                        $request['aggregations'][$bucketName] = [
-                            'type' => BucketInterface::TYPE_DYNAMIC,
-                            'name' => $bucketName,
-                            'field' => $attribute->getAttributeCode(),
-                            'method' => 'manual',
-                            'metric' => [["type" => "count"]],
-                        ];
-                    } else {
-                        $request['filters'][$filterName] = [
-                            'type' => FilterInterface::TYPE_TERM,
-                            'name' => $filterName,
-                            'field' => $attribute->getAttributeCode(),
-                            'value' => '$' . $attribute->getAttributeCode() . '$',
-                        ];
-                        $request['aggregations'][$bucketName] = [
-                            'type' => BucketInterface::TYPE_TERM,
-                            'name' => $bucketName,
-                            'field' => $attribute->getAttributeCode(),
-                            'metric' => [["type" => "count"]],
-                        ];
-                    }
+                    $generator = $this->generatorResolver->getGeneratorForType($attribute->getBackendType());
+                    $request['filters'][$filterName] = $generator->getFilterData($attribute, $filterName);
+                    $request['aggregations'][$bucketName] = $generator->getAggregationData($attribute, $bucketName);
                 }
             }
             /** @var $attribute Attribute */
-            if (in_array($attribute->getAttributeCode(), ['price', 'sku'])
-                || !$attribute->getIsSearchable()
-            ) {
-                //same fields have special semantics
+            if (!$attribute->getIsSearchable() || in_array($attribute->getAttributeCode(), ['price', 'sku'], true)) {
+                // Some fields have their own specific handlers
                 continue;
             }
-            if ($useFulltext) {
+
+            // Match search by custom price attribute isn't supported
+            if ($useFulltext && $attribute->getFrontendInput() !== 'price') {
                 $request['queries']['search']['match'][] = [
                     'field' => $attribute->getAttributeCode(),
                     'boost' => $attribute->getSearchWeight() ?: 1,
                 ];
             }
         }
+
         return $request;
     }
 
     /**
      * Retrieve searchable attributes
      *
-     * @return \Magento\Catalog\Model\Entity\Attribute[]
+     * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
      */
     protected function getSearchableAttributes()
     {
@@ -231,6 +217,7 @@ private function generateAdvancedSearchRequest()
                     ];
             }
         }
+
         return $request;
     }
 }
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\Search\RequestGenerator;
+
+
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Framework\Search\Request\BucketInterface;
+use Magento\Framework\Search\Request\FilterInterface;
+
+class Decimal implements GeneratorInterface
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterData(Attribute $attribute, $filterName)
+    {
+        return [
+            'type' => FilterInterface::TYPE_RANGE,
+            'name' => $filterName,
+            'field' => $attribute->getAttributeCode(),
+            'from' => '$' . $attribute->getAttributeCode() . '.from$',
+            'to' => '$' . $attribute->getAttributeCode() . '.to$',
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAggregationData(Attribute $attribute, $bucketName)
+    {
+        return [
+            'type' => BucketInterface::TYPE_DYNAMIC,
+            'name' => $bucketName,
+            'field' => $attribute->getAttributeCode(),
+            'method' => 'manual',
+            'metric' => [['type' => 'count']],
+        ];
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\Search\RequestGenerator;
+
+
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Framework\Search\Request\BucketInterface;
+use Magento\Framework\Search\Request\FilterInterface;
+
+class General implements GeneratorInterface
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFilterData(Attribute $attribute, $filterName)
+    {
+        return [
+            'type' => FilterInterface::TYPE_TERM,
+            'name' => $filterName,
+            'field' => $attribute->getAttributeCode(),
+            'value' => '$' . $attribute->getAttributeCode() . '$',
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAggregationData(Attribute $attribute, $bucketName)
+    {
+        return [
+            'type' => BucketInterface::TYPE_TERM,
+            'name' => $bucketName,
+            'field' => $attribute->getAttributeCode(),
+            'metric' => [['type' => 'count']],
+        ];
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\Search\RequestGenerator;
+
+
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+
+interface GeneratorInterface
+{
+    /**
+     * Get filter data for specific attribute
+     * @param Attribute $attribute
+     * @param string $filterName
+     * @return array
+     */
+    public function getFilterData(Attribute $attribute, $filterName);
+
+    /**
+     * Get aggregation data for specific attribute
+     * @param Attribute $attribute
+     * @param string $bucketName
+     * @return array
+     */
+    public function getAggregationData(Attribute $attribute, $bucketName);
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSearch\Model\Search\RequestGenerator;
+
+class GeneratorResolver
+{
+    /**
+     * @var GeneratorInterface[]
+     */
+    private $generators;
+
+    /**
+     * @var GeneratorInterface
+     */
+    private $defaultGenerator;
+
+    /**
+     * @param GeneratorInterface $defaultGenerator
+     * @param GeneratorInterface[] $generators
+     */
+    public function __construct(GeneratorInterface $defaultGenerator, array $generators)
+    {
+        $this->defaultGenerator = $defaultGenerator;
+        $this->generators = $generators;
+    }
+
+    /**
+     * @param string $type
+     * @return GeneratorInterface
+     * @throws \InvalidArgumentException
+     */
+    public function getGeneratorForType($type)
+    {
+        $generator = isset($this->generators[$type]) ? $this->generators[$type] : $this->defaultGenerator;
+        if (!($generator instanceof GeneratorInterface)) {
+            throw new \InvalidArgumentException(
+                'Generator must implement ' . GeneratorInterface::class
+            );
+        }
+        return $generator;
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/AdvancedTest.php
@@ -170,7 +170,7 @@ public function addFiltersDataProvider()
                             'static'
                         )
                     ],
-                    'values' => ['is_active' => false],
+                    'values' => ['is_active' => 0],
                     'currentCurrencyCode' => 'GBP',
                     'baseCurrencyCode' => 'USD'
                 ],