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

vgoncharenko · duhon · commit d484aae7e663 · 2018-10-12T12:59:40.000+03:00
- fix tests
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
@@ -6,7 +6,6 @@
 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.
@@ -32,12 +31,12 @@ class Converter implements ConverterInterface
      *
      * @param string $internalType
      * @return string|boolean
-     * @throws LocalizedException
+     * @throws \DomainException
      */
     public function convert(string $internalType)
     {
         if (!isset($this->mapping[$internalType])) {
-            throw new LocalizedException(__('Unsupported internal field index type: %1', $internalType));
+            throw new \DomainException(sprintf('Unsupported internal field index type: %s', $internalType));
         }
         return $this->mapping[$internalType];
     }
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
@@ -6,7 +6,6 @@
 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.
@@ -41,12 +40,12 @@ class Converter implements ConverterInterface
      *
      * @param string $internalType
      * @return string
-     * @throws LocalizedException
+     * @throws \DomainException
      */
     public function convert(string $internalType): string
     {
         if (!isset($this->mapping[$internalType])) {
-            throw new LocalizedException(__('Unsupported internal field type: %1', $internalType));
+            throw new \DomainException(sprintf('Unsupported internal field type: %s', $internalType));
         }
         return $this->mapping[$internalType];
     }
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php
@@ -24,9 +24,14 @@ class CompositeResolver implements ResolverInterface
      */
     public function __construct(array $items)
     {
-        $this->items = (function (ResolverInterface ...$items) {
-            return $items;
-        })(...$items);
+        foreach ($items as $item) {
+            if (!$item instanceof ResolverInterface) {
+                throw new \InvalidArgumentException(
+                    sprintf('Instance of the field type resolver is expected, got %s instead.', get_class($item))
+               );
+           }
+        }
+        $this->items = $items;
     }
 
     /**
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeProvider.php
@@ -8,7 +8,6 @@
 use Magento\Eav\Model\Config;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter\DummyAttribute;
-use Magento\Framework\Exception\LocalizedException;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -66,23 +65,15 @@ public function __construct(
     }
 
     /**
-     * Create class instance with specified parameters
-     *
-     * @param string $attributeCode
-     * @return AttributeAdapter
+     * {@inheritdoc}
      */
     public function getByAttributeCode(string $attributeCode): AttributeAdapter
     {
         if (!isset($this->cachedPool[$attributeCode])) {
-            $attribute = null;
-            try {
-                $attribute = $this->eavConfig->getAttribute(
-                    ProductAttributeInterface::ENTITY_TYPE_CODE,
-                    $attributeCode
-                );
-            } catch (LocalizedException $exception) {
-                $this->logger->critical($exception);
-            }
+            $attribute = $this->eavConfig->getAttribute(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                $attributeCode
+            );
             if (null === $attribute) {
                 $attribute = $this->objectManager->create(DummyAttribute::class);
             }
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/CompositeFieldProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/CompositeFieldProvider.php
@@ -21,9 +21,14 @@ class CompositeFieldProvider implements FieldProviderInterface
      */
     public function __construct(array $providers)
     {
-        $this->providers = (function (FieldProviderInterface ...$providers) {
-            return $providers;
-        })(...$providers);
+        foreach ($providers as $provider) {
+            if (!$provider instanceof FieldProviderInterface) {
+                throw new \InvalidArgumentException(
+                    sprintf('Instance of the field provider is expected, got %s instead.', get_class($provider))
+                );
+            }
+        }
+        $this->providers = $providers;
     }
 
     /**
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
@@ -16,8 +16,6 @@
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
     as FieldNameResolver;
 use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Framework\Exception\LocalizedException;
-use Psr\Log\LoggerInterface;
 
 /**
  * Provide dynamic fields for product.
@@ -65,11 +63,6 @@ class DynamicField implements FieldProviderInterface
      */
     private $fieldNameResolver;
 
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
     /**
      * @param FieldTypeConverterInterface $fieldTypeConverter
      * @param IndexTypeConverterInterface $indexTypeConverter
@@ -78,7 +71,6 @@ class DynamicField implements FieldProviderInterface
      * @param CategoryListInterface $categoryList
      * @param FieldNameResolver $fieldNameResolver
      * @param AttributeProvider $attributeAdapterProvider
-     * @param LoggerInterface $logger
      */
     public function __construct(
         FieldTypeConverterInterface $fieldTypeConverter,
@@ -87,8 +79,7 @@ public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         CategoryListInterface $categoryList,
         FieldNameResolver $fieldNameResolver,
-        AttributeProvider $attributeAdapterProvider,
-        LoggerInterface $logger
+        AttributeProvider $attributeAdapterProvider
     ) {
         $this->groupRepository = $groupRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
@@ -97,14 +88,10 @@ public function __construct(
         $this->categoryList = $categoryList;
         $this->fieldNameResolver = $fieldNameResolver;
         $this->attributeAdapterProvider = $attributeAdapterProvider;
-        $this->logger = $logger;
     }
 
     /**
-     * Get mapping for dynamic fields.
-     *
-     * @param array $context
-     * @return array
+     * {@inheritdoc}
      */
     public function getFields(array $context = []): array
     {
@@ -132,21 +119,17 @@ public function getFields(array $context = []): array
             ];
         }
 
-        try {
-            $groups = $this->groupRepository->getList($searchCriteria)->getItems();
-            $priceAttribute = $this->attributeAdapterProvider->getByAttributeCode('price');
-            foreach ($groups as $group) {
-                $groupPriceKey = $this->fieldNameResolver->getFieldName(
-                    $priceAttribute,
-                    ['customerGroupId' => $group->getId(), 'websiteId' => $context['websiteId']]
-                );
-                $allAttributes[$groupPriceKey] = [
-                    'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_FLOAT),
-                    'store' => true
-                ];
-            }
-        } catch (LocalizedException $exception) {
-            $this->logger->critical($exception);
+        $groups = $this->groupRepository->getList($searchCriteria)->getItems();
+        $priceAttribute = $this->attributeAdapterProvider->getByAttributeCode('price');
+        foreach ($groups as $group) {
+            $groupPriceKey = $this->fieldNameResolver->getFieldName(
+                $priceAttribute,
+                ['customerGroupId' => $group->getId(), 'websiteId' => $context['websiteId']]
+            );
+            $allAttributes[$groupPriceKey] = [
+                'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_FLOAT),
+                'store' => true
+            ];
         }
 
         return $allAttributes;
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/Converter.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;
 
-use Magento\Framework\Exception\LocalizedException;
-
 /**
  * Field type converter from internal index type to elastic service.
  */
@@ -31,12 +29,12 @@ class Converter implements ConverterInterface
      *
      * @param string $internalType
      * @return string|boolean
-     * @throws LocalizedException
+     * @throws \DomainException
      */
     public function convert(string $internalType)
     {
         if (!isset($this->mapping[$internalType])) {
-            throw new LocalizedException(__('Unsupported internal field index type: %1', $internalType));
+            throw new \DomainException(sprintf('Unsupported internal field index type: %s', $internalType));
         }
         return $this->mapping[$internalType];
     }
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryName.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CategoryName.php
@@ -7,12 +7,10 @@
 namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
 
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
 use Magento\Store\Model\StoreManagerInterface as StoreManager;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
 use Magento\Framework\App\ObjectManager;
-use Psr\Log\LoggerInterface;
 
 /**
  * Resolver field name for Category name attribute.
@@ -30,21 +28,13 @@ class CategoryName implements ResolverInterface
     private $coreRegistry;
 
     /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @param LoggerInterface $logger
      * @param StoreManager $storeManager
      * @param Registry $coreRegistry
      */
     public function __construct(
-        LoggerInterface $logger,
         StoreManager $storeManager = null,
         Registry $coreRegistry = null
     ) {
-        $this->logger = $logger;
         $this->storeManager = $storeManager ?: ObjectManager::getInstance()
             ->get(StoreManager::class);
         $this->coreRegistry = $coreRegistry ?: ObjectManager::getInstance()
@@ -68,24 +58,16 @@ public function getFieldName(AttributeAdapter $attribute, $context = []): ?strin
     }
 
     /**
-     * Resolve category id.
-     *
-     * @param array $context
-     * @return int
+     * {@inheritdoc}
      */
     private function resolveCategoryId($context): int
     {
         if (isset($context['categoryId'])) {
             $id = $context['categoryId'];
         } else {
-            $id = \Magento\Catalog\Model\Category::ROOT_CATEGORY_ID;
-            try {
-                $id = $this->coreRegistry->registry('current_category')
-                    ? $this->coreRegistry->registry('current_category')->getId()
-                    : $this->storeManager->getStore()->getRootCategoryId();
-            } catch (LocalizedException $exception) {
-                $this->logger->critical($exception);
-            }
+            $id = $this->coreRegistry->registry('current_category')
+                ? $this->coreRegistry->registry('current_category')->getId()
+                : $this->storeManager->getStore()->getRootCategoryId();
         }
 
         return $id;
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CompositeResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/CompositeResolver.php
@@ -24,9 +24,14 @@ class CompositeResolver implements ResolverInterface
      */
     public function __construct(array $items)
     {
-        $this->items = (function (ResolverInterface ...$items) {
-            return $items;
-        })(...$items);
+        foreach ($items as $item) {
+            if (!$item instanceof ResolverInterface) {
+                throw new \InvalidArgumentException(
+                    sprintf('Instance of the field name resolver is expected, got %s instead.', get_class($item))
+                );
+            }
+        }
+        $this->items = $items;
     }
 
     /**
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Position.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Position.php
@@ -7,12 +7,10 @@
 namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
 
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
 use Magento\Store\Model\StoreManagerInterface as StoreManager;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
 use Magento\Framework\App\ObjectManager;
-use Psr\Log\LoggerInterface;
 
 /**
  * Resolver field name for position attribute.
@@ -30,21 +28,13 @@ class Position implements ResolverInterface
     private $coreRegistry;
 
     /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @param LoggerInterface $logger
      * @param StoreManager $storeManager
      * @param Registry $coreRegistry
      */
     public function __construct(
-        LoggerInterface $logger,
         StoreManager $storeManager = null,
         Registry $coreRegistry = null
     ) {
-        $this->logger = $logger;
         $this->storeManager = $storeManager ?: ObjectManager::getInstance()
             ->get(StoreManager::class);
         $this->coreRegistry = $coreRegistry ?: ObjectManager::getInstance()
@@ -64,24 +54,16 @@ public function getFieldName(AttributeAdapter $attribute, $context = []): ?strin
     }
 
     /**
-     * Resolve category id.
-     *
-     * @param array $context
-     * @return int
+     * {@inheritdoc}
      */
     private function resolveCategoryId($context)
     {
         if (isset($context['categoryId'])) {
             $id = $context['categoryId'];
         } else {
-            $id = \Magento\Catalog\Model\Category::ROOT_CATEGORY_ID;
-            try {
-                $id = $this->coreRegistry->registry('current_category')
-                    ? $this->coreRegistry->registry('current_category')->getId()
-                    : $this->storeManager->getStore()->getRootCategoryId();
-            } catch (LocalizedException $exception) {
-                $this->logger->critical($exception);
-            }
+            $id = $this->coreRegistry->registry('current_category')
+                ? $this->coreRegistry->registry('current_category')->getId()
+                : $this->storeManager->getStore()->getRootCategoryId();
         }
 
         return $id;
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Price.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/Price.php
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;`
`7`	`7`
`8`	`8`	`use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface;`
`9`		`-use Magento\Framework\Exception\LocalizedException;`
`10`	`9`
`11`	`10`	`/**`
`12`	`11`	`* Field type converter from internal index type to elastic service.`
`@@ -32,12 +31,12 @@ class Converter implements ConverterInterface`
`32`	`31`	`*`
`33`	`32`	`* @param string $internalType`
`34`	`33`	`* @return string\|boolean`
`35`		`- * @throws LocalizedException`
	`34`	`+ * @throws \DomainException`
`36`	`35`	`*/`
`37`	`36`	`public function convert(string $internalType)`
`38`	`37`	`{`
`39`	`38`	`if (!isset($this->mapping[$internalType])) {`
`40`		`- throw new LocalizedException(__('Unsupported internal field index type: %1', $internalType));`
	`39`	`+ throw new \DomainException(sprintf('Unsupported internal field index type: %s', $internalType));`
`41`	`40`	`}`
`42`	`41`	`return $this->mapping[$internalType];`
`43`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`*/`
`6`	`6`	`namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex;`
`7`	`7`
`8`		`-use Magento\Framework\Exception\LocalizedException;`
`9`		`-`
`10`	`8`	`/**`
`11`	`9`	`* Field type converter from internal index type to elastic service.`
`12`	`10`	`*/`
`@@ -31,12 +29,12 @@ class Converter implements ConverterInterface`
`31`	`29`	`*`
`32`	`30`	`* @param string $internalType`
`33`	`31`	`* @return string\|boolean`
`34`		`- * @throws LocalizedException`
	`32`	`+ * @throws \DomainException`
`35`	`33`	`*/`
`36`	`34`	`public function convert(string $internalType)`
`37`	`35`	`{`
`38`	`36`	`if (!isset($this->mapping[$internalType])) {`
`39`		`- throw new LocalizedException(__('Unsupported internal field index type: %1', $internalType));`
	`37`	`+ throw new \DomainException(sprintf('Unsupported internal field index type: %s', $internalType));`
`40`	`38`	`}`
`41`	`39`	`return $this->mapping[$internalType];`
`42`	`40`	`}`