ACP2E-3521: [CLOUD] Issue with Products are Not Visible in Frontend After Saving in Magento Admin

Author: dhorytskyi

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Elasticsearch\Model\Adapter\BatchDataMapper;
@@ -22,6 +22,8 @@
  */
 class ProductDataMapper implements BatchDataMapperInterface
 {
+    private const MAX_STRING_LENGTH = 32766;
+
     /**
      * @var AttributeOptionInterface[]
      */
@@ -315,7 +317,9 @@ function (string $valueId) {
             && in_array($attribute->getAttributeCode(), $this->sortableAttributesValuesToImplode)
             && count($attributeValues) > 1
         ) {
-            $attributeValues = [$productId => implode("\n", $attributeValues)];
+            $attributeValues = [
+                $productId => trim(substr(implode("\n", $attributeValues), 0, self::MAX_STRING_LENGTH)),
+            ];
         }
 
         if (in_array($attribute->getAttributeCode(), $this->sortableCaseSensitiveAttributes)) {

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Elasticsearch\Model\Adapter;
@@ -309,7 +309,14 @@ public function addDocs(array $documents, $storeId, $mappedIndexerId)
                 $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex);
                 $bulkIndexDocuments = $this->getDocsArrayInBulkIndexFormat($documents, $indexName);
                 if ($this->isStackQueries === false) {
-                    $this->client->bulkQuery($bulkIndexDocuments);
+                    $result = $this->client->bulkQuery($bulkIndexDocuments);
+                    if ($result['errors']) {
+                        $errors = array_filter(
+                            array_column($result['items'], 'index'),
+                            fn ($item) => isset($item['error'])
+                        );
+                        $this->logger->critical('Errors happened during catalog search reindex', $errors);
+                    }
                 } else {
                     $this->stackQueries($bulkIndexDocuments);
                 }

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -496,6 +496,32 @@ public static function mapProvider(): array
                 15,
                 [],
             ],
+            'sortable multiple values' => [
+                10,
+                [
+                    'attribute_code' => 'name',
+                    'backend_type' => 'text',
+                    'frontend_input' => 'text',
+                    'is_searchable' => true,
+                    'used_for_sort_by' => true,
+                    'options' => [],
+                ],
+                [10 => 'one', 11 => 'two', 12 => 'three'],
+                ['name' => implode("\n", ['one', 'two', 'three'])],
+            ],
+            'sortable too many multiple values' => [
+                10,
+                [
+                    'attribute_code' => 'name',
+                    'backend_type' => 'text',
+                    'frontend_input' => 'text',
+                    'is_searchable' => true,
+                    'used_for_sort_by' => true,
+                    'options' => [],
+                ],
+                array_fill(0, 4682, '123456'),
+                ['name' => implode("\n", array_fill(0, 4681, '123456'))],
+            ],
         ];
     }
 }

app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -168,11 +168,11 @@ private function buildESConfig(array $options = []): array
      * Performs bulk query over Elasticsearch 7  index
      *
      * @param array $query
-     * @return void
+     * @return array
      */
     public function bulkQuery(array $query)
     {
-        $this->getElasticsearchClient()->bulk($query);
+        return $this->getElasticsearchClient()->bulk($query);
     }
 
     /**

app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php

@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Elasticsearch7\Test\Unit\Model\Client;
@@ -265,10 +264,15 @@ public function testTestConnectionPing()
      */
     public function testBulkQuery()
     {
+        $result = [
+            'errors' => false,
+            'items' => [],
+        ];
         $this->elasticsearchClientMock->expects($this->once())
             ->method('bulk')
-            ->with([]);
-        $this->model->bulkQuery([]);
+            ->with([])
+            ->willReturn($result);
+        self::assertEquals($result, $this->model->bulkQuery([]));
     }
 
     /**

app/code/Magento/OpenSearch/Model/SearchClient.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -165,11 +165,11 @@ private function buildOSConfig(array $options = []): array
      * Performs bulk query over OpenSearch  index
      *
      * @param array $query
-     * @return void
+     * @return array
      */
     public function bulkQuery(array $query)
     {
-        $this->getOpenSearchClient()->bulk($query);
+        return $this->getOpenSearchClient()->bulk($query);
     }
 
     /**