Merge remote-tracking branch 'magento-l3/ACP2E-249' into L3_PR_21-10-19

Author: veloraven

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

@@ -39,7 +39,9 @@ class Elasticsearch
      */
     private const MAPPING_TOTAL_FIELDS_BUFFER_LIMIT = 1000;
 
-    /**#@-*/
+    /**
+     * @var ConnectionManager
+     */
     protected $connectionManager;
 
     /**
@@ -491,7 +493,10 @@ protected function prepareIndex($storeId, $indexName, $mappedIndexerId)
                 'entityType' => $mappedIndexerId,
                 // Use store id instead of website id from context for save existing fields mapping.
                 // In future websiteId will be eliminated due to index stored per store
-                'websiteId' => $storeId
+                'websiteId' => $storeId,
+                // this parameter is introduced to replace 'websiteId' which name does not reflect
+                // the value assigned to it
+                'storeId' => $storeId
             ]
         );
         $settings['index']['mapping']['total_fields']['limit'] = $this->getMappingTotalFieldsLimit($allAttributeTypes);

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

@@ -18,6 +18,8 @@
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Provide dynamic fields for product.
@@ -65,6 +67,11 @@ class DynamicField implements FieldProviderInterface
      */
     private $fieldNameResolver;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param FieldTypeConverterInterface $fieldTypeConverter
      * @param IndexTypeConverterInterface $indexTypeConverter
@@ -73,6 +80,7 @@ class DynamicField implements FieldProviderInterface
      * @param FieldNameResolver $fieldNameResolver
      * @param AttributeProvider $attributeAdapterProvider
      * @param Collection $categoryCollection
+     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         FieldTypeConverterInterface $fieldTypeConverter,
@@ -81,7 +89,8 @@ public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         FieldNameResolver $fieldNameResolver,
         AttributeProvider $attributeAdapterProvider,
-        Collection $categoryCollection
+        Collection $categoryCollection,
+        ?StoreManagerInterface $storeManager = null
     ) {
         $this->groupRepository = $groupRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
@@ -90,6 +99,7 @@ public function __construct(
         $this->fieldNameResolver = $fieldNameResolver;
         $this->attributeAdapterProvider = $attributeAdapterProvider;
         $this->categoryCollection = $categoryCollection;
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -123,7 +133,17 @@ public function getFields(array $context = []): array
         $searchCriteria = $this->searchCriteriaBuilder->create();
         $groups = $this->groupRepository->getList($searchCriteria)->getItems();
         $priceAttribute = $this->attributeAdapterProvider->getByAttributeCode('price');
-        $ctx = isset($context['websiteId']) ? ['websiteId' => $context['websiteId']] : [];
+        /**
+         * For backword compatibility, we use 'websiteId' if the 'storeId' parameter is missing,
+         * although the 'websiteId' may contain the store ID instead of website ID
+         * @see \Magento\Elasticsearch\Model\Adapter\Elasticsearch:494
+         */
+        $ctx = [];
+        if (isset($context['storeId'])) {
+            $ctx['websiteId'] = $this->storeManager->getStore($context['storeId'])->getWebsiteId();
+        } elseif (isset($context['websiteId'])) {
+            $ctx['websiteId'] = $context['websiteId'];
+        }
         foreach ($groups as $group) {
             $ctx['customerGroupId'] = $group->getId();
             $groupPriceKey = $this->fieldNameResolver->getFieldName(

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php

@@ -34,6 +34,9 @@
  * Test for Elasticsearch client
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
  */
 class ElasticsearchTest extends TestCase
 {
@@ -159,6 +162,13 @@ protected function setUp(): void
             ->willReturn($this->client);
         $this->fieldMapper->expects($this->any())
             ->method('getAllAttributesTypes')
+            ->with(
+                [
+                    'entityType' => 'product',
+                    'websiteId' => 1,
+                    'storeId' => 1,
+                ]
+            )
             ->willReturn(
                 [
                     'name' => [