Merge branch 'comm_78764_34992' of github.com:magento-gl/magento2ce into comm_78764_25677

Author: ishakhsuvarov

app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php

@@ -112,13 +112,15 @@ private function fetch() : array
 
         $productTable = $optionsCollection->getTable('catalog_product_entity');
         $linkField = $optionsCollection->getConnection()->getAutoIncrementField($productTable);
+        $entityIds = array_column($this->skuMap, 'entity_id');
+
         $optionsCollection->getSelect()->join(
             ['cpe' => $productTable],
             'cpe.' . $linkField . ' = main_table.parent_id',
             []
         )->where(
             "cpe.entity_id IN (?)",
-            $this->skuMap
+            $entityIds
         );
         $optionsCollection->setPositionOrder();
 

dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductViewTest.php

@@ -8,13 +8,19 @@
 namespace Magento\GraphQl\Bundle;
 
 use Magento\Bundle\Model\Product\OptionList;
+use Magento\Bundle\Test\Fixture\Option as BundleOptionFixture;
+use Magento\Bundle\Test\Fixture\Product as BundleProductFixture;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 
 /**
  * Test querying Bundle products
@@ -502,4 +508,69 @@ public function testBundleProductWithDisabledProductOption()
         $response = $this->graphQlQuery($query);
         $this->assertEmpty($response['products']['items']);
     }
+
+    #[
+        DataFixture(ProductFixture::class, ['price' => 10], 'p1'),
+        DataFixture(ProductFixture::class, ['price' => 20], 'p2'),
+        DataFixture(BundleOptionFixture::class, ['product_links' => ['$p1$']], 'opt1'),
+        DataFixture(BundleOptionFixture::class, ['product_links' => ['$p2$']], 'opt2'),
+        DataFixture(
+            BundleProductFixture::class,
+            ['id' => 3, 'sku' => '4bundle-product','_options' => ['$opt1$', '$opt2$']],
+            '4bundle-product'
+        ),
+        DataFixture(
+            BundleProductFixture::class,
+            ['id' => 4, 'sku' => '5bundle-product','_options' => ['$opt1$', '$opt2$']],
+            '5bundle-product'
+        ),
+    ]
+    public function testBundleProductHavingSKUAsNextBundleProductId()
+    {
+
+        $productSku = '4bundle-product';
+        $query
+            = <<<QUERY
+{
+   products(filter: {sku: {eq: "{$productSku}"}})
+   {
+       items{
+            id
+           type_id
+           name
+           sku
+           ... on BundleProduct {
+            items {
+              option_id
+              title
+              required
+              type
+              position
+              sku
+              options {
+                id
+                quantity
+                position
+                is_default
+                price
+                price_type
+                can_change_quantity
+                label
+                product {
+                  id
+                  name
+                  sku
+                  type_id
+                   }
+                }
+            }
+           }
+       }
+   }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertNotEmpty($response['products']['items']);
+    }
 }