Merge branch 'ACP2E-3126' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-2024-07-11

Author: aplapana

app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php

@@ -64,7 +64,7 @@ public function execute($entity, $arguments = [])
 
         $this->addMediaDataToProduct(
             $entity,
-            $this->sortMediaEntriesByPosition($mediaEntries)
+            $mediaEntries
         );
 
         return $entity;
@@ -80,6 +80,7 @@ public function execute($entity, $arguments = [])
      */
     public function addMediaDataToProduct(Product $product, array $mediaEntries)
     {
+        $mediaEntries = $this->sortMediaEntriesByPosition($mediaEntries);
         $product->setData(
             $this->getAttribute()->getAttributeCode(),
             [
@@ -111,6 +112,7 @@ public function getAttribute()
      * @param string[] $image
      * @return string
      * @deprecated 101.0.1
+     * @see \Magento\Catalog\Model\Product\Gallery\ReadHandler::addMediaDataToProduct
      * @since 101.0.0
      */
     protected function findDefaultValue($key, &$image)

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/MediaGalleryTest.php

@@ -7,6 +7,11 @@
 
 namespace Magento\GraphQl\Catalog;
 
+use Magento\Catalog\Test\Fixture\Category as CategoryFixture;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
@@ -214,6 +219,79 @@ public function testProductMediaGalleryEntries()
         );
     }
 
+    /**
+     *  Tests the sorting of media gallery entries by their position attribute for a given product.
+     *
+     * @return void
+     * @throws LocalizedException
+     */
+    #[
+        DataFixture(CategoryFixture::class, ['name' => 'Category'], 'category'),
+        DataFixture(
+            ProductFixture::class,
+            [
+                'name' => 'Product 1',
+                'sku' => 'product-1',
+                'category_ids' => ['$category.id$'],
+                'price' => 10,
+                'media_gallery_entries' => [
+                    [
+                        'label' => 'image',
+                        'media_type' => 'image',
+                        'position' => 0,
+                        'disabled' => false,
+                        'types' => [
+                            'image',
+                            'small_image',
+                            'thumbnail'
+                        ],
+                        'file' => '/m/product1.jpg',
+                    ],
+                    [
+                        'label' => 'image',
+                        'media_type' => 'image',
+                        'position' => 2,
+                        'disabled' => false,
+                        'file' => '/m/product3.jpg',
+                    ],
+                    [
+                        'label' => 'image',
+                        'media_type' => 'image',
+                        'position' => 1,
+                        'disabled' => false,
+                        'file' => '/m/product2.jpg',
+                    ],
+                ],
+            ],
+            'product1'
+        ),
+    ]
+    public function testProductMediaGalleryEntriesPositionSort()
+    {
+        $product = DataFixtureStorageManager::getStorage()->get('product1');
+        $productSku = $product->getSku();
+        $query = <<<QUERY
+{
+  products(filter: {sku: {eq: "{$productSku}"}}) {
+    items {
+      name
+      sku
+      media_gallery_entries {
+        id
+        position
+        file
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        self::assertCount(3, $response['products']['items'][0]['media_gallery_entries']);
+        foreach ($response['products']['items'][0]['media_gallery_entries'] as $key => $mediaGalleryEntry) {
+            self::assertEquals($key, $mediaGalleryEntry['position']);
+        }
+    }
+
     /**
      * @param string $url
      * @return bool