Merge remote-tracking branch 'l3/MC-40409' into L3-PR-20210324

Author: veloraven

app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php

@@ -7,6 +7,8 @@
 
 use Magento\Elasticsearch\SearchAdapter\QueryAwareInterface;
 use Magento\Elasticsearch\SearchAdapter\QueryContainer;
+use Magento\Framework\App\ObjectManager;
+use Psr\Log\LoggerInterface;
 
 /**
  * Elastic search data provider
@@ -83,6 +85,11 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte
      */
     private $queryContainer;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager
      * @param \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface $fieldMapper
@@ -94,7 +101,7 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte
      * @param string $indexerId
      * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
      * @param QueryContainer|null $queryContainer
-     *
+     * @param LoggerInterface|null $logger
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -107,7 +114,8 @@ public function __construct(
         \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver $searchIndexNameResolver,
         $indexerId,
         \Magento\Framework\App\ScopeResolverInterface $scopeResolver,
-        QueryContainer $queryContainer = null
+        QueryContainer $queryContainer = null,
+        LoggerInterface $logger = null
     ) {
         $this->connectionManager = $connectionManager;
         $this->fieldMapper = $fieldMapper;
@@ -119,6 +127,7 @@ public function __construct(
         $this->indexerId = $indexerId;
         $this->scopeResolver = $scopeResolver;
         $this->queryContainer = $queryContainer;
+        $this->logger = $logger ?? ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -154,16 +163,19 @@ public function getAggregations(\Magento\Framework\Search\Dynamic\EntityStorage
             ],
         ];
 
-        $queryResult = $this->connectionManager->getConnection()
-            ->query($query);
-
-        if (isset($queryResult['aggregations']['prices'])) {
-            $aggregations = [
-                'count' => $queryResult['aggregations']['prices']['count'],
-                'max' => $queryResult['aggregations']['prices']['max'],
-                'min' => $queryResult['aggregations']['prices']['min'],
-                'std' => $queryResult['aggregations']['prices']['std_deviation'],
-            ];
+        try {
+            $queryResult = $this->connectionManager->getConnection()
+                ->query($query);
+            if (isset($queryResult['aggregations']['prices'])) {
+                $aggregations = [
+                    'count' => $queryResult['aggregations']['prices']['count'],
+                    'max' => $queryResult['aggregations']['prices']['max'],
+                    'min' => $queryResult['aggregations']['prices']['min'],
+                    'std' => $queryResult['aggregations']['prices']['std_deviation'],
+                ];
+            }
+        } catch (\Exception $e) {
+            $this->logger->critical($e);
         }
 
         return $aggregations;
@@ -202,8 +214,6 @@ public function getAggregation(
         $range,
         \Magento\Framework\Search\Dynamic\EntityStorage $entityStorage
     ) {
-        $result = [];
-
         $query = $this->getBasicSearchQuery($entityStorage);
 
         $fieldName = $this->fieldMapper->getFieldName($bucket->getField());
@@ -217,11 +227,16 @@ public function getAggregation(
             ],
         ];
 
-        $queryResult = $this->connectionManager->getConnection()
-            ->query($query);
-        foreach ($queryResult['aggregations']['prices']['buckets'] as $bucket) {
-            $key = (int)($bucket['key'] / $range + 1);
-            $result[$key] = $bucket['doc_count'];
+        $result = [];
+        try {
+            $queryResult = $this->connectionManager->getConnection()
+                ->query($query);
+            foreach ($queryResult['aggregations']['prices']['buckets'] as $bucket) {
+                $key = (int)($bucket['key'] / $range + 1);
+                $result[$key] = $bucket['doc_count'];
+            }
+        } catch (\Exception $e) {
+            $this->logger->critical($e);
         }
 
         return $result;

app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php

@@ -281,6 +281,19 @@ public function testGetAggregations()
         );
     }
 
+    public function testGetAggregationsWithException()
+    {
+        $this->queryContainer->expects($this->once())
+            ->method('getQuery')
+            ->willReturn([]);
+        $this->clientMock->expects($this->once())
+            ->method('query')
+            ->willThrowException(new \Exception());
+
+        $result = $this->model->getAggregations($this->entityStorage);
+        $this->assertIsArray($result);
+    }
+
     /**
      * Test getInterval() method
      */
@@ -383,6 +396,22 @@ public function testGetAggregation()
         );
     }
 
+    public function testGetAggregationWithException()
+    {
+        $bucket = $this->createMock(BucketInterface::class);
+        $dimension = $this->createMock(Dimension::class);
+
+        $this->queryContainer->expects($this->once())
+            ->method('getQuery')
+            ->willReturn([]);
+        $this->clientMock->expects($this->once())
+            ->method('query')
+            ->willThrowException(new \Exception());
+
+        $result = $this->model->getAggregation($bucket, [$dimension], 10, $this->entityStorage);
+        $this->assertIsArray($result);
+    }
+
     /**
      * Test prepareData() method
      */