MC-20636: Order Details : Order Details by Order Number

- refactor provider

Author: cpartica

app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php

@@ -131,8 +131,6 @@ private function fetch()
             $itemOptions = $this->optionsProcessor->getItemOptions($orderItem);
             $bundleOptions = $orderItem->getProductType() === 'bundle' ?
                 $this->optionsProcessor->getBundleOptions($orderItem) : [];
-            $bundleOptions1 = $orderItem->getProductType() === 'bundle' ?
-                $this->optionsProcessor->getBundleOptions($orderItem) : [];
 
             $this->orderItemList[$orderItem->getItemId()] = [
                 'id' => base64_encode($orderItem->getItemId()),
@@ -154,8 +152,7 @@ private function fetch()
                 'quantity_invoiced' => $orderItem->getQtyInvoiced(),
                 'quantity_canceled' => $orderItem->getQtyCanceled(),
                 'quantity_returned' => $orderItem->getQtyReturned(),
-                'bundle_options' => $orderItem->getProductType() === 'bundle' ?
-                    $this->optionsProcessor->getBundleOptions($orderItem) : [],
+                'bundle_options' => $bundleOptions,
             ];
 
         }

app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/OptionsProcessor.php

@@ -107,21 +107,23 @@ private function processAttributesInfo(array $attributesInfo): array
     public function getBundleOptions(\Magento\Sales\Api\Data\OrderItemInterface $item): array
     {
         $bundleOptions = [];
-        if ($item instanceof \Magento\Sales\Model\Order\Item) {
-            $options = $item->getProductOptions();
-        } else {
-            $options = $item->getOrderItem()->getProductOptions();
-        }
-        if (isset($options['bundle_options'])) {
-            //$bundleOptions = $this->serializer->unserialize($options['bundle_options']);
-            foreach ($options['bundle_options'] as $bundleOptionKey => $bundleOption) {
-                $bundleOptions[$bundleOptionKey]['values'] = $bundleOption['value'] ?? [];
-                $bundleOptions[$bundleOptionKey]['label'] = $bundleOption['label'];
-                foreach ($bundleOptions[$bundleOptionKey]['values'] as $bundleOptionValueKey => $bundleOptionValue) {
-                    $bundleOptions[$bundleOptionKey]['values'][$bundleOptionValueKey]['product_sku'] = $bundleOptionValue['title'];
-                    $bundleOptions[$bundleOptionKey]['values'][$bundleOptionValueKey]['product_name'] = $bundleOptionValue['title'];
-                    $bundleOptions[$bundleOptionKey]['values'][$bundleOptionValueKey]['quantity_ordered'] = $bundleOptionValue['qty'];
-                    $bundleOptions[$bundleOptionKey]['values'][$bundleOptionValueKey]['id'] = base64_encode((string)$bundleOptionValueKey);
+        if ($item->getProductType() === 'bundle') {
+            if ($item instanceof \Magento\Sales\Model\Order\Item) {
+                $options = $item->getProductOptions();
+            } else {
+                $options = $item->getOrderItem()->getProductOptions();
+            }
+            if (isset($options['bundle_options'])) {
+                //$bundleOptions = $this->serializer->unserialize($options['bundle_options']);
+                foreach ($options['bundle_options'] as $bundleOptionKey => $bundleOption) {
+                    $bundleOptions[$bundleOptionKey]['items'] = $bundleOption['value'] ?? [];
+                    $bundleOptions[$bundleOptionKey]['label'] = $bundleOption['label'];
+                    foreach ($bundleOptions[$bundleOptionKey]['items'] as $bundleOptionValueKey => $bundleOptionValue) {
+                        $bundleOptions[$bundleOptionKey]['items'][$bundleOptionValueKey]['product_sku'] = $bundleOptionValue['title'];
+                        $bundleOptions[$bundleOptionKey]['items'][$bundleOptionValueKey]['product_name'] = $bundleOptionValue['title'];
+                        $bundleOptions[$bundleOptionKey]['items'][$bundleOptionValueKey]['quantity_ordered'] = $bundleOptionValue['qty'];
+                        $bundleOptions[$bundleOptionKey]['items'][$bundleOptionValueKey]['id'] = base64_encode((string)$bundleOptionValueKey);
+                    }
                 }
             }
         }

app/code/Magento/SalesGraphQl/etc/schema.graphqls

@@ -87,7 +87,7 @@ type BundleOrderItem implements OrderItemInterface {
 
 type SelectedBundleOptionItems {
     label: String!
-    values: [OrderItem] @doc(description: "A list of products that represent the values of the parent option")
+    items: [OrderItem] @doc(description: "A list of products that represent the values of the parent option")
 }
 
 type OrderItemOption @doc(description: "Represents order item options like selected or entered") {