MAGETWO-94482: [2.3] Fixed procedure of creating mapping for dynamic fields in elasticsearch

- fix tests

Author: vgoncharenko

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php

@@ -71,7 +71,6 @@ public function getFields(array $productIds, $storeId)
      * @param int $productId
      * @param array $categoryIndexData
      * @return array
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function getProductCategoryData($productId, array $categoryIndexData)
     {

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php

@@ -390,7 +390,7 @@ protected function getProductPriceData($productId, $storeId, array $priceIndexDa
             foreach ($productPriceIndexData as $customerGroupId => $price) {
                 $fieldName = $this->fieldMapper->getFieldName(
                     'price',
-                    ['customerGroupId' => $customerGroupId]
+                    ['customerGroupId' => $customerGroupId, 'websiteId' => $storeId]
                 );
                 $result[$fieldName] = sprintf('%F', $price);
             }

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php

@@ -6,6 +6,7 @@
 namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
 
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Field type converter from internal index type to elastic service.
@@ -27,10 +28,17 @@ class Converter implements ConverterInterface
     ];
 
     /**
-     * {@inheritdoc}
+     * Get service field index type for elasticsearch 5.
+     *
+     * @param string $internalType
+     * @return string|boolean
+     * @throws LocalizedException
      */
     public function convert(string $internalType)
     {
+        if (!isset($this->mapping[$internalType])) {
+            throw new LocalizedException(__('Unsupported internal field index type: %1', $internalType));
+        }
         return $this->mapping[$internalType];
     }
 }

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php

@@ -15,8 +15,8 @@
     as FieldTypeResolver;
 
 /**
- * Field index resolver that provide index type for attribute in mapping.
- * For example we need to set 'no'/false in case when attribute must be present in index data,
+ * Field index resolver that provides index type for the attribute in mapping.
+ * For example, we need to set ‘no’/false in the case when attribute must be present in index data,
  * but stay as not indexable.
  */
 class IndexResolver implements ResolverInterface

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php

@@ -6,6 +6,7 @@
 namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType;
 
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Field type converter from internal data types to elastic service.
@@ -36,10 +37,17 @@ class Converter implements ConverterInterface
     ];
 
     /**
-     * {@inheritdoc}
+     * Get service field type for elasticsearch 5.
+     *
+     * @param string $internalType
+     * @return string
+     * @throws LocalizedException
      */
     public function convert(string $internalType): string
     {
+        if (!isset($this->mapping[$internalType])) {
+            throw new LocalizedException(__('Unsupported internal field type: %1', $internalType));
+        }
         return $this->mapping[$internalType];
     }
 }

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php

@@ -24,11 +24,16 @@ class CompositeResolver implements ResolverInterface
      */
     public function __construct(array $items)
     {
-        $this->items = $items;
+        $this->items = (function (ResolverInterface ...$items) {
+            return $items;
+        })(...$items);
     }
 
     /**
-     * {@inheritdoc}
+     * Get field type.
+     *
+     * @param AttributeAdapter $attribute
+     * @return string
      */
     public function getFieldType(AttributeAdapter $attribute): ?string
     {

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerType.php

@@ -36,7 +36,10 @@ public function __construct(ConverterInterface $fieldTypeConverter, $integerType
     }
 
     /**
-     * {@inheritdoc}
+     * Get integer field type.
+     *
+     * @param AttributeAdapter $attribute
+     * @return string
      */
     public function getFieldType(AttributeAdapter $attribute): ?string
     {

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordType.php

@@ -29,7 +29,10 @@ public function __construct(ConverterInterface $fieldTypeConverter)
     }
 
     /**
-     * {@inheritdoc}
+     * Get field type.
+     *
+     * @param AttributeAdapter $attribute
+     * @return string
      */
     public function getFieldType(AttributeAdapter $attribute): ?string
     {

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php

@@ -107,7 +107,6 @@ public function __construct(
      * @param string $attributeCode
      * @param array $context
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getFieldName($attributeCode, $context = [])
     {

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

@@ -71,7 +71,6 @@ public function getFields(array $productIds, $storeId)
      * @param int $productId
      * @param array $categoryIndexData
      * @return array
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function getProductCategoryData($productId, array $categoryIndexData)
     {