ACP2E-2152: Error while making concurrent requests to rest/V1/products/<sku>/media

Author: pradeep1819

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -374,6 +374,44 @@ private function cacheProduct($cacheKey, ProductInterface $product)
         }
     }
 
+    /**
+     * If the request is for adding, keep the initial media_gallery data; if it is for deleting, unset it.
+     *
+     * @param array $productData
+     * @return array
+     */
+    private function resetMediaGalleryData(array $productData): array
+    {
+        $unset = true;
+        if (isset($productData['media_gallery'])) {
+            krsort($productData['media_gallery']['images']);
+            $isNewEntry = false;
+            foreach ($productData['media_gallery']['images'] as $entry) {
+                if (!isset($entry['value_id'])) {
+                    $isNewEntry = true;
+                    break;
+                }
+            }
+            if ($isNewEntry) {
+                $existingMediaGallery = [];
+                foreach ($productData['media_gallery']['images'] as $entry) {
+                    if (isset($entry['value_id'])) {
+                        $existingMediaGallery['media_gallery']['images'][$entry['value_id']] = $entry;
+                    }
+                }
+                if (isset($existingMediaGallery['media_gallery'])) {
+                    $productData['media_gallery'] = $existingMediaGallery['media_gallery'];
+                    $unset = false;
+                }
+            }
+        }
+        if ($unset) {
+            unset($productData['media_gallery']);
+        }
+
+        return $productData;
+    }
+
     /**
      * Merge data from DB and updates from request
      *
@@ -384,7 +422,7 @@ private function cacheProduct($cacheKey, ProductInterface $product)
      */
     protected function initializeProductData(array $productData, $createNew)
     {
-        unset($productData['media_gallery']);
+        $productData = $this->resetMediaGalleryData($productData);
         if ($createNew) {
             $product = $this->productFactory->create();
             $this->assignProductToWebsites($product);
@@ -940,7 +978,7 @@ private function joinPositionField(
             foreach ($filterGroup->getFilters() as $filter) {
                 if ($filter->getField() === 'category_id') {
                     $filterValue = $filter->getValue();
-                    $categoryIds[] = is_array($filterValue) ? $filterValue : explode(',', $filterValue ?? '');
+                    $categoryIds[] = is_array($filterValue) ? $filterValue : explode(',', $filterValue);
                 }
             }
         }

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -1367,23 +1367,53 @@ protected function setupProductMocksForSave(): void
     public function testSaveExistingWithNewMediaGalleryEntries(): void
     {
         $this->storeManager->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
+        $newEntry = [
+            'value_id' => null,
+            'label' => "label_text",
+            'position' => 10,
+            'disabled' => false,
+            'types' => ['image', 'small_image'],
+            'content' => [
+                'data' => [
+                    ImageContentInterface::NAME => 'filename',
+                    ImageContentInterface::TYPE => 'image/jpeg',
+                    ImageContentInterface::BASE64_ENCODED_DATA => 'encoded_content'
+                ]
+            ],
+            'media_type' => 'media_type'
+        ];
         $newEntriesData = [
             'images' => [
                 [
-                    'value_id' => null,
-                    'label' => "label_text",
+                    'value_id' => 5,
+                    "label" => "new_label_text",
+                    'file' => 'filename1',
                     'position' => 10,
                     'disabled' => false,
-                    'types' => ['image', 'small_image'],
-                    'content' => [
-                        'data' => [
-                            ImageContentInterface::NAME => 'filename',
-                            ImageContentInterface::TYPE => 'image/jpeg',
-                            ImageContentInterface::BASE64_ENCODED_DATA => 'encoded_content'
-                        ]
-                    ],
-                    'media_type' => 'media_type'
-                ]
+                    'types' => ['image', 'small_image']
+                ],
+                $newEntry
+            ]
+        ];
+        $initializedEntriesData = [
+            'images' => [
+                [
+                    'value_id' => 5,
+                    "label" => "label_text",
+                    'file' => 'filename1',
+                    'position' => 10,
+                    'disabled' => false,
+                    'types' => ['image', 'small_image']
+                ],
+                [
+                    'value_id' => 6,
+                    "label" => "label_text2",
+                    'file' => 'filename2',
+                    'position' => 10,
+                    'disabled' => false,
+                    'types' => ['image', 'small_image']
+                ],
+                $newEntry
             ]
         ];
 
@@ -1395,7 +1425,7 @@ public function testSaveExistingWithNewMediaGalleryEntries(): void
             ->method('toNestedArray')
             ->willReturn($this->productData);
 
-        $this->initializedProduct->setData('media_gallery', $newEntriesData);
+        $this->initializedProduct->setData('media_gallery', $initializedEntriesData);
         $this->initializedProduct->expects($this->any())
             ->method('getMediaAttributes')
             ->willReturn(["image" => "imageAttribute", "small_image" => "small_image_attribute"]);
@@ -1431,10 +1461,19 @@ public function testSaveExistingWithNewMediaGalleryEntries(): void
             ->method('processImageContent')
             ->willReturn($absolutePath);
 
-        $imageFileUri = "imageFileUri";
-        $this->processor->expects($this->once())->method('addImage')
-            ->with($this->initializedProduct, $mediaTmpPath . $absolutePath, ['image', 'small_image'], true, false)
-            ->willReturn($imageFileUri);
+        $imageFileUri = $mediaTmpPath . $absolutePath;
+
+        $this->processor->expects($this->once())
+            ->method('addImage')
+            ->willReturnCallback(
+                function ($product, $imageFileUri) use ($newEntriesData) {
+                    foreach ($product['media_gallery']['images'] as $entry) {
+                        $this->assertArrayNotHasKey('removed', $entry);
+                    }
+                    $this->initializedProduct->setData('media_gallery', $newEntriesData);
+                    return $imageFileUri;
+                }
+            );
         $this->processor->expects($this->once())->method('updateImage')
             ->with(
                 $this->initializedProduct,