GraphQL-418: [Shipping methods] Set Shipping Methods on Cart

Author: naydav

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

@@ -11,9 +11,9 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Api\BillingAddressManagementInterface;
-use Magento\Quote\Model\Quote\Address as QuoteAddress;
 
 /**
  * Set billing address for a specified shopping cart
@@ -38,14 +38,14 @@ public function __construct(
      * Assign billing address to cart
      *
      * @param CartInterface $cart
-     * @param QuoteAddress $billingAddress
+     * @param AddressInterface $billingAddress
      * @param bool $useForShipping
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
      */
     public function execute(
         CartInterface $cart,
-        QuoteAddress $billingAddress,
+        AddressInterface $billingAddress,
         bool $useForShipping
     ): void {
         try {

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

@@ -11,8 +11,8 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Api\Data\CartInterface;
-use Magento\Quote\Model\Quote\Address as QuoteAddress;
 use Magento\Quote\Model\ShippingAddressManagementInterface;
 
 /**
@@ -38,13 +38,13 @@ public function __construct(
      * Assign shipping address to cart
      *
      * @param CartInterface $cart
-     * @param QuoteAddress $shippingAddress
+     * @param AddressInterface $shippingAddress
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
      */
     public function execute(
         CartInterface $cart,
-        QuoteAddress $shippingAddress
+        AddressInterface $shippingAddress
     ): void {
         try {
             $this->shippingAddressManagement->assign($cart->getId(), $shippingAddress);

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

@@ -14,8 +14,8 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Api\Data\CartInterface;
-use Magento\Quote\Model\Quote\Address as QuoteAddress;
 
 /**
  * Assign shipping method to cart
@@ -48,15 +48,15 @@ public function __construct(
      * Assign shipping method to cart
      *
      * @param CartInterface $cart
-     * @param QuoteAddress $quoteAddress
+     * @param AddressInterface $quoteAddress
      * @param string $carrierCode
      * @param string $methodCode
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
      */
     public function execute(
         CartInterface $cart,
-        QuoteAddress $quoteAddress,
+        AddressInterface $quoteAddress,
         string $carrierCode,
         string $methodCode
     ): void {

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

@@ -7,44 +7,38 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\Data\AddressInterface;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\Quote\Model\Quote\Address as QuoteAddress;
-use Magento\Quote\Model\Quote\AddressFactory as QuoteAddressFactory;
-use Magento\Quote\Model\ResourceModel\Quote\Address as QuoteAddressResource;
-
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Model\ResourceModel\Quote\Address as AddressResource;
 
 /**
  * Get quote address
  */
 class GetQuoteAddress
 {
     /**
-     * @var QuoteAddressFactory
+     * @var AddressInterfaceFactory
      */
     private $quoteAddressFactory;
 
     /**
-     * @var QuoteAddressResource
+     * @var AddressResource
      */
     private $quoteAddressResource;
 
     /**
-     * @var AddressRepositoryInterface
+     * @param AddressInterfaceFactory $quoteAddressFactory
+     * @param AddressResource $quoteAddressResource
      */
-    private $addressRepository;
-
-    /**
-     * @param AddressRepositoryInterface $addressRepository
-     */
-    public function __construct(AddressRepositoryInterface $addressRepository)
-    {
-        $this->addressRepository = $addressRepository;
+    public function __construct(
+        AddressInterfaceFactory $quoteAddressFactory,
+        AddressResource $quoteAddressResource
+    ) {
+        $this->quoteAddressFactory = $quoteAddressFactory;
+        $this->quoteAddressResource = $quoteAddressResource;
     }
 
     /**
@@ -57,7 +51,7 @@ public function __construct(AddressRepositoryInterface $addressRepository)
      * @throws GraphQlNoSuchEntityException
      * @throws GraphQlAuthorizationException
      */
-    public function execute(int $quoteAddressId, ?int $customerId): QuoteAddress
+    public function execute(int $quoteAddressId, ?int $customerId): AddressInterface
     {
         $quoteAddress = $this->quoteAddressFactory->create();
 

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

@@ -97,13 +97,13 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
         }
 
         if (null === $customerAddressId) {
-            $billingAddressInput = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
+            $billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
         } else {
             $this->checkCustomerAccount->execute($context->getUserId(), $context->getUserType());
             $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$context->getUserId());
-            $billingAddressInput = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
+            $billingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
         }
 
-        $this->assignBillingAddressToCart->execute($cart, $billingAddressInput, $useForShipping);
+        $this->assignBillingAddressToCart->execute($cart, $billingAddress, $useForShipping);
     }
 }

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

@@ -69,7 +69,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
         }
         $methodCode = $shippingMethodInput['method_code'];
 
-        $quoteAddress = $this->getQuoteAddress->execute($cartAddressId);
+        $quoteAddress = $this->getQuoteAddress->execute($cartAddressId, $context->getUserId());
 
         $this->assignShippingMethodToCart->execute($cart, $quoteAddress, $carrierCode, $methodCode);
     }