ACPT-1194-part2

Switch to CollectionFactory for categories in Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.

Author: JacobBrownAustin

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

@@ -18,6 +18,7 @@
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -29,9 +30,9 @@ class DynamicField implements FieldProviderInterface
     /**
      * Category collection.
      *
-     * @var Collection
+     * @var CollectionFactory
      */
-    private $categoryCollection;
+    private $categoryCollectionFactory;
 
     /**
      * Customer group repository.
@@ -79,8 +80,9 @@ class DynamicField implements FieldProviderInterface
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param FieldNameResolver $fieldNameResolver
      * @param AttributeProvider $attributeAdapterProvider
-     * @param Collection $categoryCollection
+     * @param Collection $categoryCollection @deprecated @see $categoryCollectionFactory
      * @param StoreManagerInterface|null $storeManager
+     * * @param CollectionFactory|null $categoryCollectionFactory
      */
     public function __construct(
         FieldTypeConverterInterface $fieldTypeConverter,
@@ -90,15 +92,16 @@ public function __construct(
         FieldNameResolver $fieldNameResolver,
         AttributeProvider $attributeAdapterProvider,
         Collection $categoryCollection,
-        ?StoreManagerInterface $storeManager = null
+        ?StoreManagerInterface $storeManager = null,
+        ?CollectionFactory $categoryCollectionFactory = null
     ) {
         $this->groupRepository = $groupRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->fieldTypeConverter = $fieldTypeConverter;
         $this->indexTypeConverter = $indexTypeConverter;
         $this->fieldNameResolver = $fieldNameResolver;
         $this->attributeAdapterProvider = $attributeAdapterProvider;
-        $this->categoryCollection = $categoryCollection;
+        $this->categoryCollectionFactory = $categoryCollectionFactory ?: ObjectManager::getInstance()->get(CollectionFactory::class);
         $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
@@ -108,7 +111,7 @@ public function __construct(
     public function getFields(array $context = []): array
     {
         $allAttributes = [];
-        $categoryIds = $this->categoryCollection->getAllIds();
+        $categoryIds = $this->categoryCollectionFactory->create()->getAllIds();
         $positionAttribute = $this->attributeAdapterProvider->getByAttributeCode('position');
         $categoryNameAttribute = $this->attributeAdapterProvider->getByAttributeCode('category_name');
         foreach ($categoryIds as $categoryId) {