MC-23743: [2.3.1] Updating Youtube video via API causes data to be lost.

Author: nikita-shcherbatykh

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

@@ -224,7 +224,15 @@ private function processEntries(ProductInterface $product, array $newEntries, ar
             $this->processNewMediaGalleryEntry($product, $newEntry);
 
             $finalGallery = $product->getData('media_gallery');
-            $newEntryId = key(array_diff_key($product->getData('media_gallery')['images'], $entriesById));
+
+            $entryIds = array_keys(
+                array_diff_key(
+                    $product->getData('media_gallery')['images'],
+                    $entriesById
+                )
+            );
+            $newEntryId = array_pop($entryIds);
+
             $newEntry = array_replace_recursive($newEntry, $finalGallery['images'][$newEntryId]);
             $entriesById[$newEntryId] = $newEntry;
             $finalGallery['images'][$newEntryId] = $newEntry;

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php

@@ -381,6 +381,97 @@ public function testCreate($product)
         $this->deleteProduct($product[ProductInterface::SKU]);
     }
 
+    /**
+     * Media gallery entries with external videos
+     *
+     * @return array
+     */
+    public function externalVideoDataProvider(): array
+    {
+        return [
+            [
+                [
+                    [
+                        'media_type' => 'external-video',
+                        'disabled' => false,
+                        'label' => 'Test Video Created',
+                        'types' => [],
+                        'position' => 1,
+                        'content' => [
+                            'type' => 'image/png',
+                            'name' => 'thumbnail.png',
+                            'base64_encoded_data' => 'iVBORw0KGgoAAAANSUhEUgAAAP8AAADGCAMAAAAqo6adAAAAA1BMVEUAAP79f'
+                                . '+LBAAAASElEQVR4nO3BMQEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+                                . 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAA+BsYAAAF7hZJ0AAAAAElFTkSuQmCC',
+                        ],
+                        'extension_attributes' => [
+                            'video_content' => [
+                                'media_type' => 'external-video',
+                                'video_provider' => 'youtube',
+                                'video_url' => 'https://www.youtube.com/',
+                                'video_title' => 'Video title',
+                                'video_description' => 'Video description',
+                                'video_metadata' => 'Video meta',
+                            ],
+                        ],
+                    ]
+                ]
+            ],
+            [
+                [
+                    [
+                        'media_type' => 'external-video',
+                        'disabled' => false,
+                        'label' => 'Test Video Updated',
+                        'types' => [],
+                        'position' => 1,
+                        'content' => [
+                            'type' => 'image/png',
+                            'name' => 'thumbnail.png',
+                            'base64_encoded_data' => 'iVBORw0KGgoAAAANSUhEUgAAAP8AAADGCAMAAAAqo6adAAAAA1BMVEUAAP79f'
+                                . '+LBAAAASElEQVR4nO3BMQEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+                                . 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAA+BsYAAAF7hZJ0AAAAAElFTkSuQmCC',
+                        ],
+                        'extension_attributes' => [
+                            'video_content' => [
+                                'media_type' => 'external-video',
+                                'video_provider' => 'vimeo',
+                                'video_url' => 'https://www.vimeo.com/',
+                                'video_title' => 'Video title',
+                                'video_description' => 'Video description',
+                                'video_metadata' => 'Video meta',
+                            ],
+                        ],
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Test create/ update product with external video media gallery entry
+     *
+     * @dataProvider externalVideoDataProvider
+     * @param array $mediaGalleryData
+     */
+    public function testCreateWithExternalVideo(array $mediaGalleryData)
+    {
+        $simpleProductBaseData = $this->getSimpleProductData(
+            [
+                ProductInterface::NAME => 'Product With Ext. Video',
+                ProductInterface::SKU => 'prod-with-ext-video'
+            ]
+        );
+
+        $simpleProductBaseData['media_gallery_entries'] = $mediaGalleryData;
+
+        $response = $this->saveProduct($simpleProductBaseData);
+        $this->assertEquals(
+            $simpleProductBaseData['media_gallery_entries'][0]['extension_attributes'],
+            $response["media_gallery_entries"][0]["extension_attributes"]
+        );
+    }
+
     /**
      * @param array $fixtureProduct
      *