MC-41810: Cannot add bundle product with more than 1 checkbox option to the cart via Graphql

Author: tsviklinskyi

app/code/Magento/Bundle/Model/Product/Type.php

@@ -1231,7 +1231,8 @@ public function getIdentities(\Magento\Catalog\Model\Product $product)
     protected function getQty($selection, $qtys, $selectionOptionId)
     {
         if ($selection->getSelectionCanChangeQty() && isset($qtys[$selectionOptionId])) {
-            $qty = (float)$qtys[$selectionOptionId] > 0 ? $qtys[$selectionOptionId] : 1;
+            $selectionQty = $qtys[$selectionOptionId][$selection->getSelectionId()];
+            $qty = (float)$selectionQty > 0 ? $selectionQty : 1;
         } else {
             $qty = (float)$selection->getSelectionQty() ? $selection->getSelectionQty() : 1;
         }

app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php

@@ -38,8 +38,8 @@ public function execute(CartItem $cartItem): array
 
             [$optionType, $optionId, $optionValueId, $optionQuantity] = $optionData;
             if ($optionType == self::OPTION_TYPE) {
-                $bundleOptionsData['bundle_option'][$optionId] = $optionValueId;
-                $bundleOptionsData['bundle_option_qty'][$optionId] = $optionQuantity;
+                $bundleOptionsData['bundle_option'][$optionId][$optionValueId] = $optionValueId;
+                $bundleOptionsData['bundle_option_qty'][$optionId][$optionValueId] = $optionQuantity;
             }
         }
         //for bundle options with custom quantity
@@ -55,8 +55,8 @@ public function execute(CartItem $cartItem): array
             [$optionType, $optionId, $optionValueId] = $optionData;
             if ($optionType == self::OPTION_TYPE) {
                 $optionQuantity = $option->getValue();
-                $bundleOptionsData['bundle_option'][$optionId] = $optionValueId;
-                $bundleOptionsData['bundle_option_qty'][$optionId] = $optionQuantity;
+                $bundleOptionsData['bundle_option'][$optionId][$optionValueId] = $optionValueId;
+                $bundleOptionsData['bundle_option_qty'][$optionId][$optionValueId] = $optionQuantity;
             }
         }
 

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

@@ -232,10 +232,16 @@ public function testAddBundleToCartWithWrongBundleOptions()
     /**
      * @magentoApiDataFixture Magento/Bundle/_files/product_with_multiple_options_and_custom_quantity.php
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @dataProvider bundleItemOptionsDataProvider
+     * @return void
      */
-    public function testAddBundleItemWithCustomOptionQuantity()
+    public function testAddBundleItemWithCustomOptionQuantity(
+        string $optionQty0,
+        string $optionQty1,
+        string $expectedOptionQty0,
+        string $expectedOptionQty1
+    ): void
     {
-
         $this->quoteResource->load(
             $this->quote,
             'test_order_1',
@@ -250,11 +256,34 @@ public function testAddBundleItemWithCustomOptionQuantity()
         $uId0 = $bundleOptions[0]['options'][0]['uid'];
         $uId1 = $bundleOptions[1]['options'][0]['uid'];
         $response = $this->graphQlMutation(
-            $this->getMutationsQuery($maskedQuoteId, $uId0, $uId1, $sku)
+            $this->getMutationsQuery($maskedQuoteId, $uId0, $uId1, $sku, $optionQty0, $optionQty1)
         );
         $bundleOptions = $response['addProductsToCart']['cart']['items'][0]['bundle_options'];
-        $this->assertEquals(5, $bundleOptions[0]['values'][0]['quantity']);
-        $this->assertEquals(1, $bundleOptions[1]['values'][0]['quantity']);
+        $this->assertEquals($expectedOptionQty0, $bundleOptions[0]['values'][0]['quantity']);
+        $this->assertEquals($expectedOptionQty1, $bundleOptions[1]['values'][0]['quantity']);
+    }
+
+    /**
+     * Data provider for testAddBundleItemWithCustomOptionQuantity
+     *
+     * @return array
+     */
+    public function bundleItemOptionsDataProvider(): array
+    {
+        return [
+            [
+                'optionQty0' => '10',
+                'optionQty1' => '1',
+                'expectedOptionQty0' => '10',
+                'expectedOptionQty1' => '1',
+            ],
+            [
+                'optionQty0' => '5',
+                'optionQty1' => '5',
+                'expectedOptionQty0' => '5',
+                'expectedOptionQty1' => '1',
+            ],
+        ];
     }
 
     /**
@@ -298,11 +327,22 @@ private function getProductQuery(string $sku): string
 QUERY;
     }
 
+    /**
+     * @param string $maskedQuoteId
+     * @param string $optionUid0
+     * @param string $optionUid1
+     * @param string $sku
+     * @param string $optionQty0
+     * @param string $optionQty1
+     * @return string
+     */
     private function getMutationsQuery(
         string $maskedQuoteId,
         string $optionUid0,
         string $optionUid1,
-        string $sku
+        string $sku,
+        string $optionQty0,
+        string $optionQty1
     ): string {
         return <<<QUERY
 mutation {
@@ -313,15 +353,15 @@ private function getMutationsQuery(
                     sku: "{$sku}"
                     quantity: 2
                     selected_options: [
-                        "{$optionUid1}", "{$optionUid0}"
+                        "{$optionUid0}", "{$optionUid1}"
                     ],
                     entered_options: [{
                         uid: "{$optionUid0}"
-                        value: "5"
+                        value: "{$optionQty0}"
                      },
                      {
                         uid: "{$optionUid1}"
-                        value: "5"
+                        value: "{$optionQty1}"
                      }]
                 }
             ]