ACP2E-1422: No products in categories or search

Author: glo23503

app/code/Magento/Catalog/Model/Product/Attribute/Repository.php

@@ -7,7 +7,7 @@
 namespace Magento\Catalog\Model\Product\Attribute;
 
 use Laminas\Validator\Regex;
-use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Catalog\Api\Data\EavAttributeInterface;
 use Magento\Eav\Model\Entity\Attribute;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -19,6 +19,8 @@
  */
 class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInterface
 {
+    private const FILTERABLE_ALLOWED_INPUT_TYPES = ['date', 'datetime', 'price', 'text', 'textarea', 'texteditor'];
+
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Attribute
      */
@@ -110,6 +112,20 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      */
     public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
     {
+        if (in_array($attribute->getFrontendInput(), self::FILTERABLE_ALLOWED_INPUT_TYPES)) {
+            if ($attribute->getIsFilterable()) {
+                throw InputException::invalidFieldValue(
+                    EavAttributeInterface::IS_FILTERABLE, $attribute->getIsFilterable()
+                );
+            }
+
+            if ($attribute->getIsFilterableInSearch()) {
+                throw InputException::invalidFieldValue(
+                    EavAttributeInterface::IS_FILTERABLE_IN_SEARCH, $attribute->getIsFilterableInSearch()
+                );
+            }
+        }
+
         $attribute->setEntityTypeId(
             $this->eavConfig
                 ->getEntityType(\Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE)
@@ -156,7 +172,7 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
             );
             $attribute->setIsUserDefined(1);
         }
-        if (!empty($attribute->getData(AttributeInterface::OPTIONS))) {
+        if (!empty($attribute->getData(EavAttributeInterface::OPTIONS))) {
             $options = [];
             $sortOrder = 0;
             $default = [];

app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php

@@ -241,6 +241,42 @@ public function testSaveInputExceptionRequiredField()
         $this->model->save($attributeMock);
     }
 
+    /**
+     * @param string $field
+     * @param string $method
+     * @param bool $filterable
+     *
+     * @return void
+     * @dataProvider filterableDataProvider
+     */
+    public function testSaveInputExceptionInvalidIsFilterableFieldValue(
+        string $field,
+        string $method,
+        bool $filterable
+    ) : void {
+        $this->expectException('Magento\Framework\Exception\InputException');
+        $this->expectExceptionMessage('Invalid value of "'.$filterable.'" provided for the '.$field.' field.');
+        $attributeMock = $this->createPartialMock(
+            Attribute::class,
+            ['getFrontendInput', $method]
+        );
+        $attributeMock->expects($this->atLeastOnce())->method('getFrontendInput')->willReturn('text');
+        $attributeMock->expects($this->atLeastOnce())->method($method)->willReturn($filterable);
+
+        $this->model->save($attributeMock);
+    }
+
+    /**
+     * @return array
+     */
+    public function filterableDataProvider(): array
+    {
+        return [
+            [ProductAttributeInterface::IS_FILTERABLE, 'getIsFilterable', true],
+            [ProductAttributeInterface::IS_FILTERABLE_IN_SEARCH, 'getIsFilterableInSearch', true]
+        ];
+    }
+
     public function testSaveInputExceptionInvalidFieldValue()
     {
         $this->expectException('Magento\Framework\Exception\InputException');