MC-16650: Product Attribute Type Price Not Displaying

- use price filter for all attributes with catalog input type = 'price'

Author: krissyhiserote

app/code/Magento/Catalog/Model/Layer/FilterList.php

@@ -3,9 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Model\Layer;
 
+use Magento\Catalog\Model\Product\Attribute\Backend\Price;
+
+/**
+ * Layer navigation filters
+ */
 class FilterList
 {
     const CATEGORY_FILTER   = 'category';
@@ -106,9 +112,9 @@ protected function getAttributeFilterClass(\Magento\Catalog\Model\ResourceModel\
     {
         $filterClassName = $this->filterTypes[self::ATTRIBUTE_FILTER];
 
-        if ($attribute->getAttributeCode() == 'price') {
+        if ($attribute->getBackendModel() === Price::class) {
             $filterClassName = $this->filterTypes[self::PRICE_FILTER];
-        } elseif ($attribute->getBackendType() == 'decimal') {
+        } elseif ($attribute->getBackendType() === 'decimal') {
             $filterClassName = $this->filterTypes[self::DECIMAL_FILTER];
         }
 

app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php

@@ -3,10 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Test\Unit\Model\Layer;
 
 use \Magento\Catalog\Model\Layer\FilterList;
+use Magento\Catalog\Model\Product\Attribute\Backend\Price;
 
 class FilterListTest extends \PHPUnit\Framework\TestCase
 {
@@ -95,8 +97,8 @@ public function getFiltersDataProvider()
     {
         return [
             [
-                'method' => 'getAttributeCode',
-                'value' => FilterList::PRICE_FILTER,
+                'method' => 'getBackendModel',
+                'value' => Price::class,
                 'expectedClass' => 'PriceFilterClass',
             ],
             [
@@ -105,7 +107,7 @@ public function getFiltersDataProvider()
                 'expectedClass' => 'DecimalFilterClass',
             ],
             [
-                'method' => 'getAttributeCode',
+                'method' => 'getBackendModel',
                 'value' => null,
                 'expectedClass' => 'AttributeFilterClass',
             ]

app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogSearch\Model\Layer\Filter;
 
 use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
@@ -11,6 +13,7 @@
  * Layer price filter based on Search API
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Price extends AbstractFilter
 {
@@ -138,7 +141,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
         list($from, $to) = $filter;
 
         $this->getLayer()->getProductCollection()->addFieldToFilter(
-            'price',
+            $this->getAttributeModel()->getAttributeCode(),
             ['from' => $from, 'to' =>  empty($to) || $from == $to ? $to : $to - self::PRICE_DELTA]
         );
 

app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php

@@ -10,29 +10,12 @@
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Framework\Search\Request\BucketInterface;
 use Magento\Framework\Search\Request\FilterInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory;
-use Magento\Store\Model\ScopeInterface;
 
 /**
  * Catalog search range request generator.
  */
 class Decimal implements GeneratorInterface
 {
-    /**
-     * @var \Magento\Store\Model\ScopeInterface
-     */
-    private $scopeConfig;
-
-    /**
-     * @param \Magento\Store\Model\ScopeInterface|null $scopeConfig
-     */
-    public function __construct(ScopeConfigInterface $scopeConfig = null)
-    {
-        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
-    }
-
     /**
      * @inheritdoc
      */
@@ -56,21 +39,8 @@ public function getAggregationData(Attribute $attribute, $bucketName)
             'type' => BucketInterface::TYPE_DYNAMIC,
             'name' => $bucketName,
             'field' => $attribute->getAttributeCode(),
-            'method' => $this->getRangeCalculation(),
+            'method' => 'manual',
             'metric' => [['type' => 'count']],
         ];
     }
-
-    /**
-     * Get range calculation by what was set in the configuration
-     *
-     * @return string
-     */
-    private function getRangeCalculation(): string
-    {
-        return $this->scopeConfig->getValue(
-            AlgorithmFactory::XML_PATH_RANGE_CALCULATION,
-            ScopeInterface::SCOPE_STORE
-        );
-    }
 }

app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Layer\Filter;
 
@@ -208,6 +209,12 @@ public function testApply()
         $priceId = '15-50';
         $requestVar = 'test_request_var';
 
+        $this->target->setAttributeModel($this->attribute);
+        $attributeCode = 'price';
+        $this->attribute->expects($this->any())
+            ->method('getAttributeCode')
+            ->will($this->returnValue($attributeCode));
+
         $this->target->setRequestVar($requestVar);
         $this->request->expects($this->exactly(1))
             ->method('getParam')

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/PriceTest.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogSearch\Model\Layer\Filter;
 
 use Magento\TestFramework\Helper\Bootstrap;
@@ -35,10 +37,16 @@ protected function setUp()
         $category->load(4);
         $layer = $this->objectManager->get(\Magento\Catalog\Model\Layer\Category::class);
         $layer->setCurrentCategory($category);
+        /** @var $attribute \Magento\Catalog\Model\Entity\Attribute */
+        $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Model\Entity\Attribute::class
+        );
+        $attribute->loadByCode('catalog_product', 'price');
         $this->_model = $this->objectManager->create(
             \Magento\CatalogSearch\Model\Layer\Filter\Price::class,
             ['layer' => $layer]
         );
+        $this->_model->setAttributeModel($attribute);
     }
 
     public function testApplyNothing()