MC-31304: [ElasticSearch] Exception on catalog search result page

Author: SmVladyslav

app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php

@@ -387,7 +387,6 @@ public function updateIndexMapping(int $storeId, string $mappedIndexerId, string
             return $this;
         }
 
-        /** @var ProductAttributeInterface $attribute */
         $attribute = $this->productAttributeRepository->get($attributeCode);
         $newAttributeMapping = $this->staticFieldProvider->getField($attribute);
         $mappedAttributes = $this->getMappedAttributes($indexName);
@@ -410,7 +409,7 @@ public function updateIndexMapping(int $storeId, string $mappedIndexerId, string
     }
 
     /**
-     * Retrieve index definition from cache.
+     * Retrieve index definition from class.
      *
      * @param int $storeId
      * @param string $mappedIndexerId
@@ -427,7 +426,7 @@ private function getIndexFromAlias(int $storeId, string $mappedIndexerId): strin
     }
 
     /**
-     * Retrieve mapped attributes from cache.
+     * Retrieve mapped attributes from class.
      *
      * @param string $indexName
      * @return array
@@ -444,7 +443,7 @@ private function getMappedAttributes(string $indexName): array
     }
 
     /**
-     * Set mapped attributes to cache.
+     * Set mapped attributes to class.
      *
      * @param string $indexName
      * @param array $mappedAttributes

app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php

@@ -7,8 +7,9 @@
 
 namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider;
 
-use Magento\Eav\Model\Config;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
     as IndexTypeConverterInterface;
@@ -105,7 +106,6 @@ public function __construct(
      */
     public function getFields(array $context = []): array
     {
-        /** @var ProductAttributeInterface[] $attributes */
         $attributes = $this->eavConfig->getEntityAttributes(ProductAttributeInterface::ENTITY_TYPE_CODE);
         $allAttributes = [];
 
@@ -124,10 +124,10 @@ public function getFields(array $context = []): array
     /**
      * Get field mapping for specific attribute.
      *
-     * @param ProductAttributeInterface $attribute
+     * @param AbstractAttribute $attribute
      * @return array
      */
-    public function getField(ProductAttributeInterface $attribute): array
+    public function getField(AbstractAttribute $attribute): array
     {
         $fieldMapping = [];
         if (in_array($attribute->getAttributeCode(), $this->excludedAttributes, true)) {

app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Attribute.php

@@ -102,7 +102,7 @@ public function afterSave(
     }
 
     /**
-     * Check if mapping needs to be updated (attribute is new).
+     * Set class variables before saving attribute.
      *
      * @param AttributeResourceModel $subject
      * @param AbstractModel $attribute

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php

@@ -7,8 +7,8 @@
 
 namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider;
 
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
@@ -184,7 +184,7 @@ function ($attributeMock, $context) use ($fieldName, $compositeFieldName, $sortF
                 }
             );
 
-        $productAttributeMock = $this->getMockBuilder(ProductAttributeInterface::class)
+        $productAttributeMock = $this->getMockBuilder(AbstractAttribute::class)
             ->setMethods(['getAttributeCode'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();

app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php

@@ -88,13 +88,19 @@ protected function setUp(): void
      */
     public function testAfterSave(bool $isNewObject, bool $isElasticsearchEnabled, array $dimensions): void
     {
-        /** @var AttributeModel $attribute */
-        $attribute = (new ObjectManager($this))->getObject(AttributeModel::class);
-        $attribute->isObjectNew($isNewObject);
-        $attribute->setAttributeCode('example_attribute_code');
+        /** @var AttributeModel|MockObject $attributeMock */
+        $attributeMock = $this->createMock(AttributeModel::class);
+        $attributeMock->expects($this->once())
+            ->method('isObjectNew')
+            ->willReturn($isNewObject);
+
+        $attributeMock->expects($this->once())
+            ->method('getAttributeCode')
+            ->willReturn('example_attribute_code');
+
         /** @var AttributeResourceModel|MockObject $subjectMock */
         $subjectMock = $this->createMock(AttributeResourceModel::class);
-        $this->attributePlugin->beforeSave($subjectMock, $attribute);
+        $this->attributePlugin->beforeSave($subjectMock, $attributeMock);
 
         $indexerData = ['indexer_example_data'];
 
@@ -133,7 +139,7 @@ public function testAfterSave(bool $isNewObject, bool $isElasticsearchEnabled, a
             ->method('getIterator')
             ->willReturn(new ArrayIterator($dimensions));
 
-        $this->attributePlugin->afterSave($subjectMock, $subjectMock);
+        $this->assertEquals($subjectMock, $this->attributePlugin->afterSave($subjectMock, $subjectMock));
     }
 
     /**

dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php

@@ -6,11 +6,12 @@
 
 /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
 
-use Magento\Catalog\Model\Category\Attribute;
+use Magento\Catalog\Model\Category\AttributeFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 
-$attribute = Bootstrap::getObjectManager()
-    ->create(Attribute::class);
+/** @var AttributeFactory $attributeFactory */
+$attributeFactory = Bootstrap::getObjectManager()->get(AttributeFactory::class);
+$attribute = $attributeFactory->create();
 $attribute->setAttributeCode('test_attribute_code_666')
     ->setEntityTypeId(3)
     ->setIsGlobal(1)

dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute_rollback.php

@@ -6,18 +6,20 @@
 
 /** @var Registry $registry */
 
-use Magento\Catalog\Model\Category\Attribute;
+use Magento\Catalog\Model\Category\AttributeFactory;
 use Magento\Framework\Registry;
 use Magento\TestFramework\Helper\Bootstrap;
 
-$registry = Bootstrap::getObjectManager()->get(Registry::class);
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var Attribute $attribute */
-$attribute = Bootstrap::getObjectManager()
-    ->create(Attribute::class);
+/** @var AttributeFactory $attributeFactory */
+$attributeFactory = $objectManager->get(AttributeFactory::class);
+$attribute = $attributeFactory->create();
 
 $attribute->loadByCode(3, 'test_attribute_code_666');