Update add to cart with extendible buy request builder

Author: pmclain

app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php

@@ -12,32 +12,33 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Quote\Model\Quote;
+use Magento\QuoteGraphQl\Model\Cart\BuyRequest\BuyRequestBuilder;
 
 /**
  * Add simple product to cart
  */
 class AddSimpleProductToCart
 {
     /**
-     * @var CreateBuyRequest
+     * @var ProductRepositoryInterface
      */
-    private $createBuyRequest;
+    private $productRepository;
 
     /**
-     * @var ProductRepositoryInterface
+     * @var BuyRequestBuilder
      */
-    private $productRepository;
+    private $buyRequestBuilder;
 
     /**
      * @param ProductRepositoryInterface $productRepository
-     * @param CreateBuyRequest $createBuyRequest
+     * @param BuyRequestBuilder $buyRequestBuilder
      */
     public function __construct(
         ProductRepositoryInterface $productRepository,
-        CreateBuyRequest $createBuyRequest
+        BuyRequestBuilder $buyRequestBuilder
     ) {
         $this->productRepository = $productRepository;
-        $this->createBuyRequest = $createBuyRequest;
+        $this->buyRequestBuilder = $buyRequestBuilder;
     }
 
     /**
@@ -53,8 +54,6 @@ public function __construct(
     public function execute(Quote $cart, array $cartItemData): void
     {
         $sku = $this->extractSku($cartItemData);
-        $quantity = $this->extractQuantity($cartItemData);
-        $customizableOptions = $cartItemData['customizable_options'] ?? [];
 
         try {
             $product = $this->productRepository->get($sku);
@@ -63,7 +62,7 @@ public function execute(Quote $cart, array $cartItemData): void
         }
 
         try {
-            $result = $cart->addProduct($product, $this->createBuyRequest->execute($quantity, $customizableOptions));
+            $result = $cart->addProduct($product, $this->buyRequestBuilder->build($cartItemData));
         } catch (\Exception $e) {
             throw new GraphQlInputException(
                 __(
@@ -92,26 +91,4 @@ private function extractSku(array $cartItemData): string
         }
         return (string)$cartItemData['data']['sku'];
     }
-
-    /**
-     * Extract quantity from cart item data
-     *
-     * @param array $cartItemData
-     * @return float
-     * @throws GraphQlInputException
-     */
-    private function extractQuantity(array $cartItemData): float
-    {
-        if (!isset($cartItemData['data']['quantity'])) {
-            throw new GraphQlInputException(__('Missed "qty" in cart item data'));
-        }
-        $quantity = (float)$cartItemData['data']['quantity'];
-
-        if ($quantity <= 0) {
-            throw new GraphQlInputException(
-                __('Please enter a number greater than 0 in this field.')
-            );
-        }
-        return $quantity;
-    }
 }

app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/CustomizableOptionsDataProvider.php

@@ -33,13 +33,33 @@ public function __construct(
      */
     public function execute(array $cartItemData): array
     {
-        $customizableOptions = $this->arrayManager->get('customizable_options', $cartItemData, []);
+        $customizableOptionsData = $this->arrayManager->get('customizable_options', $cartItemData, []);
 
-        $customizableOptionsData = [];
-        foreach ($customizableOptions as $customizableOption) {
-            $customizableOptionsData[$customizableOption['id']] = $customizableOption['value'];
+        $customizableOptions = [];
+        foreach ($customizableOptionsData as $customizableOption) {
+            if (isset($customizableOption['value_string'])) {
+                $customizableOptions[$customizableOption['id']] = $this->convertCustomOptionValue(
+                    $customizableOption['value_string']
+                );
+            }
         }
 
         return ['options' => $customizableOptionsData];
     }
+
+    /**
+     * Convert custom options value
+     *
+     * @param string $value
+     * @return string|array
+     */
+    private function convertCustomOptionValue(string $value)
+    {
+        $value = trim($value);
+        if (substr($value, 0, 1) === "[" &&
+            substr($value, strlen($value) - 1, 1) === "]") {
+            return explode(',', substr($value, 1, -1));
+        }
+        return $value;
+    }
 }

app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/QuantityDataProvider.php

@@ -34,9 +34,9 @@ public function __construct(
      */
     public function execute(array $cartItemData): array
     {
-        $qty = $this->arrayManager->get('data/qty', $cartItemData);
+        $qty = $this->arrayManager->get('data/quantity', $cartItemData);
         if (!isset($qty)) {
-            throw new GraphQlInputException(__('Missing key "qty" in cart item data'));
+            throw new GraphQlInputException(__('Missing key "quantity" in cart item data'));
         }
 
         return ['qty' => (float)$qty];