MAGETWO-98369: Improve degradation of CatalogSearch indexation with elasticsearch

Author: vgoncharenko

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

@@ -18,6 +18,8 @@
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
     as FieldNameResolver;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Provide dynamic fields for product.
@@ -27,10 +29,18 @@ class DynamicField implements FieldProviderInterface
     /**
      * Category list.
      *
+     * @deprecated
      * @var CategoryListInterface
      */
     private $categoryList;
 
+    /**
+     * Category collection.
+     *
+     * @var Collection
+     */
+    private $categoryCollection;
+
     /**
      * Customer group repository.
      *
@@ -73,6 +83,7 @@ class DynamicField implements FieldProviderInterface
      * @param CategoryListInterface $categoryList
      * @param FieldNameResolver $fieldNameResolver
      * @param AttributeProvider $attributeAdapterProvider
+     * @param Collection|null $categoryCollection
      */
     public function __construct(
         FieldTypeConverterInterface $fieldTypeConverter,
@@ -81,7 +92,8 @@ public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         CategoryListInterface $categoryList,
         FieldNameResolver $fieldNameResolver,
-        AttributeProvider $attributeAdapterProvider
+        AttributeProvider $attributeAdapterProvider,
+        Collection $categoryCollection = null
     ) {
         $this->groupRepository = $groupRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
@@ -90,6 +102,8 @@ public function __construct(
         $this->categoryList = $categoryList;
         $this->fieldNameResolver = $fieldNameResolver;
         $this->attributeAdapterProvider = $attributeAdapterProvider;
+        $this->categoryCollection = $categoryCollection ?:
+            ObjectManager::getInstance()->get(Collection::class);
     }
 
     /**
@@ -98,18 +112,17 @@ public function __construct(
     public function getFields(array $context = []): array
     {
         $allAttributes = [];
-        $searchCriteria = $this->searchCriteriaBuilder->create();
-        $categories = $this->categoryList->getList($searchCriteria)->getItems();
+        $categoryIds = $this->categoryCollection->getAllIds();
         $positionAttribute = $this->attributeAdapterProvider->getByAttributeCode('position');
         $categoryNameAttribute = $this->attributeAdapterProvider->getByAttributeCode('category_name');
-        foreach ($categories as $category) {
+        foreach ($categoryIds as $categoryId) {
             $categoryPositionKey = $this->fieldNameResolver->getFieldName(
                 $positionAttribute,
-                ['categoryId' => $category->getId()]
+                ['categoryId' => $categoryId]
             );
             $categoryNameKey = $this->fieldNameResolver->getFieldName(
                 $categoryNameAttribute,
-                ['categoryId' => $category->getId()]
+                ['categoryId' => $categoryId]
             );
             $allAttributes[$categoryPositionKey] = [
                 'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING),
@@ -121,6 +134,7 @@ public function getFields(array $context = []): array
             ];
         }
 
+        $searchCriteria = $this->searchCriteriaBuilder->create();
         $groups = $this->groupRepository->getList($searchCriteria)->getItems();
         $priceAttribute = $this->attributeAdapterProvider->getByAttributeCode('price');
         foreach ($groups as $group) {

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

@@ -24,6 +24,7 @@
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
     as FieldNameResolver;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
 
 /**
  * @SuppressWarnings(PHPMD)
@@ -65,6 +66,11 @@ class DynamicFieldTest extends \PHPUnit\Framework\TestCase
      */
     private $categoryList;
 
+    /**
+     * @var Collection
+     */
+    private $categoryCollection;
+
     /**
      * @var FieldNameResolver
      */
@@ -100,6 +106,10 @@ protected function setUp()
         $this->categoryList = $this->getMockBuilder(CategoryListInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->categoryCollection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAllIds'])
+            ->getMock();
 
         $objectManager = new ObjectManagerHelper($this);
 
@@ -113,6 +123,7 @@ protected function setUp()
                 'attributeAdapterProvider' => $this->attributeAdapterProvider,
                 'categoryList' => $this->categoryList,
                 'fieldNameResolver' => $this->fieldNameResolver,
+                'categoryCollection' => $this->categoryCollection,
             ]
         );
     }
@@ -124,7 +135,6 @@ protected function setUp()
      * @param $groupId
      * @param array $expected
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function testGetAllAttributesTypes(
         $complexType,
@@ -138,10 +148,6 @@ public function testGetAllAttributesTypes(
         $this->searchCriteriaBuilder->expects($this->any())
             ->method('create')
             ->willReturn($searchCriteria);
-        $categorySearchResults = $this->getMockBuilder(CategorySearchResultsInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getItems'])
-            ->getMockForAbstractClass();
         $groupSearchResults = $this->getMockBuilder(GroupSearchResultsInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getItems'])
@@ -156,19 +162,10 @@ public function testGetAllAttributesTypes(
         $groupSearchResults->expects($this->any())
             ->method('getItems')
             ->willReturn([$group]);
-        $category = $this->getMockBuilder(CategoryInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getId'])
-            ->getMockForAbstractClass();
-        $category->expects($this->any())
-            ->method('getId')
-            ->willReturn($categoryId);
-        $categorySearchResults->expects($this->any())
-            ->method('getItems')
-            ->willReturn([$category]);
-        $this->categoryList->expects($this->any())
-            ->method('getList')
-            ->willReturn($categorySearchResults);
+
+        $this->categoryCollection->expects($this->any())
+            ->method('getAllIds')
+            ->willReturn([$categoryId]);
 
         $categoryAttributeMock = $this->getMockBuilder(AttributeAdapter::class)
             ->disableOriginalConstructor()