MAGETWO-87003: Graphql Bundle product implementation

- refactoring

Author: cpartica

app/code/Magento/BundleGraphQl/Model/Resolver/Products/DataProvider/Product/Formatter/BundleOptions.php

@@ -9,12 +9,28 @@
 use Magento\Catalog\Model\Product;
 use Magento\Bundle\Model\Product\Type as Bundle;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\FormatterInterface;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\GraphQl\Query\EnumLookup;
 
 /**
- * Post formatting data to set option for bundle product
+ * Post formatting data to set main fields and options for bundle product
  */
 class BundleOptions implements FormatterInterface
 {
+    /**
+     * @var EnumLookup
+     */
+    private $enumLookup;
+
+    /**
+     * BundleOptions constructor.
+     * @param EnumLookup $enumLookup
+     */
+    public function __construct(EnumLookup $enumLookup)
+    {
+        $this->enumLookup = $enumLookup;
+    }
+
     /**
      * Add bundle options and options to configurable types
      *
@@ -23,10 +39,40 @@ class BundleOptions implements FormatterInterface
     public function format(Product $product, array $productData = [])
     {
         if ($product->getTypeId() === Bundle::TYPE_CODE) {
+            $productData = $this->formatBundleAttributes($productData);
             $extensionAttributes = $product->getExtensionAttributes();
             $productData['bundle_product_options'] = $extensionAttributes->getBundleProductOptions();
         }
 
         return $productData;
     }
+
+    /**
+     * Format bundle specific top level attributes from product
+     *
+     * @param array $product
+     * @return array
+     * @throws RuntimeException
+     */
+    private function formatBundleAttributes(array $product)
+    {
+        if (isset($product['price_view'])) {
+            $product['price_view']
+                = $this->enumLookup->getEnumValueFromField('PriceViewEnum', $product['price_view']);
+        }
+        if (isset($product['shipment_type'])) {
+            $product['ship_bundle_items']
+                = $this->enumLookup->getEnumValueFromField('ShipBundleItemsEnum', $product['shipment_type']);
+        }
+        if (isset($product['price_view'])) {
+            $product['dynamic_price'] = !(bool)$product['price_type'];
+        }
+        if (isset($product['sku_type'])) {
+            $product['dynamic_sku'] = !(bool)$product['sku_type'];
+        }
+        if (isset($product['weight_type'])) {
+            $product['dynamic_weight'] = !(bool)$product['weight_type'];
+        }
+        return $product;
+    }
 }

app/code/Magento/BundleGraphQl/Model/Resolver/Products/Query/BundleProductPostProcessor.php

@@ -11,15 +11,14 @@
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\FormatterInterface;
-use Magento\Bundle\Model\Link;
+use Magento\Bundle\Api\Data\LinkInterface;
 use Magento\Bundle\Model\Option;
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
-use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\EnumLookup;
 
 /**
- * Retrieves simple product data for child products, and formats configurable data
+ * Retrieves simple product data for child products, and formats children data
  */
 class BundleProductPostProcessor implements \Magento\Framework\GraphQl\Query\PostFetchProcessorInterface
 {
@@ -74,24 +73,23 @@ public function __construct(
      *
      * @param array $resultData
      * @return array
-     * @throws RuntimeException
      */
     public function process(array $resultData)
     {
         $childrenSkus = [];
         $bundleMap = [];
         foreach ($resultData as $productKey => $product) {
             if (isset($product['type_id']) && $product['type_id'] === Bundle::TYPE_CODE) {
-                $resultData[$productKey] = $this->formatBundleAttributes($product);
                 if (isset($product['bundle_product_options'])) {
                     $bundleMap[$product['sku']] = [];
+                    /** @var Option $option */
                     foreach ($product['bundle_product_options'] as $optionKey => $option) {
                         $resultData[$productKey]['items'][$optionKey]
                             = $option->getData();
-                        /** @var Link $link */
+                        /** @var LinkInterface $link */
                         foreach ($option['product_links'] as $link) {
-                            $bundleMap[$product['sku']][] = $link['sku'];
-                            $childrenSkus[] = $link['sku'];
+                            $bundleMap[$product['sku']][] = $link->getSku();
+                            $childrenSkus[] = $link->getSku();
                             $formattedLink = [
                                 'product' => new GraphQlNoSuchEntityException(
                                     __('Bundled product not found')
@@ -157,33 +155,4 @@ private function addChildData(array $childrenProducts, array $resultData, array
 
         return $resultData;
     }
-
-    /**
-     * Format bundle specific top level attributes from product
-     *
-     * @param array $product
-     * @return array
-     * @throws RuntimeException
-     */
-    private function formatBundleAttributes(array $product)
-    {
-        if (isset($product['price_view'])) {
-            $product['price_view']
-                = $this->enumLookup->getEnumValueFromField('PriceViewEnum', $product['price_view']);
-        }
-        if (isset($product['shipment_type'])) {
-            $product['ship_bundle_items']
-                = $this->enumLookup->getEnumValueFromField('ShipBundleItemsEnum', $product['shipment_type']);
-        }
-        if (isset($product['price_view'])) {
-            $product['dynamic_price'] = !(bool)$product['price_type'];
-        }
-        if (isset($product['sku_type'])) {
-            $product['dynamic_sku'] = !(bool)$product['sku_type'];
-        }
-        if (isset($product['weight_type'])) {
-            $product['dynamic_weight'] = !(bool)$product['weight_type'];
-        }
-        return $product;
-    }
 }