MCP-811: Performance Optimization for Catalog GraphQL

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('fields', $document)) {
+            if (!array_key_exists('_id', $document) && array_key_exists('_id', $document['fields'])) {
                 $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('fields', $rawDocument)) {
+            if (!array_key_exists('_id', $rawDocument) && array_key_exists('_id', $rawDocument['fields'])) {
                 $rawDocument['_id'] = $rawDocument['fields']['_id'][0];
                 unset($rawDocument['fields']);
             }