MCP-811: Performance Optimization for Catalog GraphQL

- Update unit test;

Author: adifucan

app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php

@@ -59,7 +59,7 @@ private function getEntityStorage(array $queryResult)
     {
         $ids = [];
         foreach ($queryResult['hits']['hits'] as $document) {
-            if (!array_key_exists('_id', $document) && array_key_exists('_id', $document['fields'])) {
+            if (!array_key_exists('_id', $document) && isset($document['fields']['_id'][0])) {
                 $document['_id'] = $document['fields']['_id'][0];
                 unset($document['fields']);
             }

app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php

@@ -64,7 +64,7 @@ public function create($response)
     {
         $documents = [];
         foreach ($response['documents'] as $rawDocument) {
-            if (!array_key_exists('_id', $rawDocument) && array_key_exists('_id', $rawDocument['fields'])) {
+            if (!array_key_exists('_id', $rawDocument) && isset($rawDocument['fields']['_id'][0])) {
                 $rawDocument['_id'] = $rawDocument['fields']['_id'][0];
                 unset($rawDocument['fields']);
             }

app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php

@@ -72,8 +72,32 @@ protected function setUp(): void
     public function testCreate(): void
     {
         $documents = [
-            ['title' => 'oneTitle', 'description' => 'oneDescription'],
-            ['title' => 'twoTitle', 'description' => 'twoDescription']
+            [
+                'title' => 'oneTitle',
+                'description' => 'oneDescription',
+                'fields' => [
+                    '_id' => ['1']
+                ]
+            ],
+            [
+                'title' => 'twoTitle',
+                'description' => 'twoDescription',
+                'fields' => [
+                    '_id' => ['2']
+                ]
+            ]
+        ];
+        $modifiedDocuments = [
+            [
+                'title' => 'oneTitle',
+                'description' => 'oneDescription',
+                '_id' => '1'
+            ],
+            [
+                'title' => 'twoTitle',
+                'description' => 'twoDescription',
+                '_id' => '2'
+            ]
         ];
         $aggregations = [
             'aggregation1' => [
@@ -113,7 +137,7 @@ public function testCreate(): void
 
         $this->documentFactory
             ->method('create')
-            ->withConsecutive([$documents[0]], [$documents[1]])
+            ->withConsecutive([$modifiedDocuments[0]], [$modifiedDocuments[1]])
             ->willReturnOnConsecutiveCalls('document1', 'document2');
 
         $this->aggregationFactory