[WIP] Remove “cart_address_id” from “ShippingMethodInput”

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

@@ -50,7 +50,6 @@ public function execute(QuoteAddress $address): array
         }
 
         $addressData = array_merge($addressData, [
-            'address_id' => $address->getId(),
             'address_type' => $addressType,
             'country' => [
                 'code' => $address->getCountryId(),

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

@@ -16,25 +16,17 @@
  */
 class SetShippingMethodsOnCart implements SetShippingMethodsOnCartInterface
 {
-    /**
-     * @var GetQuoteAddress
-     */
-    private $getQuoteAddress;
-
     /**
      * @var AssignShippingMethodToCart
      */
     private $assignShippingMethodToCart;
 
     /**
-     * @param GetQuoteAddress $getQuoteAddress
      * @param AssignShippingMethodToCart $assignShippingMethodToCart
      */
     public function __construct(
-        GetQuoteAddress $getQuoteAddress,
         AssignShippingMethodToCart $assignShippingMethodToCart
     ) {
-        $this->getQuoteAddress = $getQuoteAddress;
         $this->assignShippingMethodToCart = $assignShippingMethodToCart;
     }
 
@@ -50,11 +42,6 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
         }
         $shippingMethodInput = current($shippingMethodsInput);
 
-        if (!isset($shippingMethodInput['cart_address_id']) || empty($shippingMethodInput['cart_address_id'])) {
-            throw new GraphQlInputException(__('Required parameter "cart_address_id" is missing.'));
-        }
-        $cartAddressId = $shippingMethodInput['cart_address_id'];
-
         if (!isset($shippingMethodInput['carrier_code']) || empty($shippingMethodInput['carrier_code'])) {
             throw new GraphQlInputException(__('Required parameter "carrier_code" is missing.'));
         }
@@ -65,7 +52,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
         }
         $methodCode = $shippingMethodInput['method_code'];
 
-        $quoteAddress = $this->getQuoteAddress->execute($cart, $cartAddressId, $context->getUserId());
-        $this->assignShippingMethodToCart->execute($cart, $quoteAddress, $carrierCode, $methodCode);
+        $shippingAddress = $cart->getShippingAddress();
+        $this->assignShippingMethodToCart->execute($cart, $shippingAddress, $carrierCode, $methodCode);
     }
 }

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

@@ -115,7 +115,6 @@ input SetShippingMethodsOnCartInput {
 }
 
 input ShippingMethodInput {
-    cart_address_id: Int!
     carrier_code: String!
     method_code: String!
 }
@@ -188,7 +187,6 @@ type Cart {
 }
 
 type CartAddress {
-    address_id: Int
     firstname: String
     lastname: String
     company: String

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php

@@ -92,10 +92,9 @@ public function testCheckoutWorkflow()
         $this->addProductToCart($cartId, $qty, $sku);
 
         $this->setBillingAddress($cartId);
-        $shippingAddress = $this->setShippingAddress($cartId);
+        $shippingMethod = $this->setShippingAddress($cartId);
 
-        $shippingMethod = current($shippingAddress['available_shipping_methods']);
-        $paymentMethod = $this->setShippingMethod($cartId, $shippingAddress['address_id'], $shippingMethod);
+        $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
         $this->setPaymentMethod($cartId, $paymentMethod);
 
         $orderId = $this->placeOrder($cartId);
@@ -307,7 +306,6 @@ private function setShippingAddress(string $cartId): array
   ) {
     cart {
       shipping_addresses {
-        address_id
         available_shipping_methods {
           carrier_code
           method_code
@@ -325,8 +323,6 @@ private function setShippingAddress(string $cartId): array
         self::assertCount(1, $response['setShippingAddressesOnCart']['cart']['shipping_addresses']);
 
         $shippingAddress = current($response['setShippingAddressesOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('address_id', $shippingAddress);
-        self::assertNotEmpty($shippingAddress['address_id']);
         self::assertArrayHasKey('available_shipping_methods', $shippingAddress);
         self::assertCount(1, $shippingAddress['available_shipping_methods']);
 
@@ -340,24 +336,22 @@ private function setShippingAddress(string $cartId): array
         self::assertArrayHasKey('amount', $availableShippingMethod);
         self::assertNotEmpty($availableShippingMethod['amount']);
 
-        return $shippingAddress;
+        return $availableShippingMethod;
     }
 
     /**
      * @param string $cartId
-     * @param int $addressId
      * @param array $method
      * @return array
      */
-    private function setShippingMethod(string $cartId, int $addressId, array $method): array
+    private function setShippingMethod(string $cartId, array $method): array
     {
         $query = <<<QUERY
 mutation {
   setShippingMethodsOnCart(input:  {
     cart_id: "{$cartId}", 
     shipping_methods: [
       {
-         cart_address_id: {$addressId}
          carrier_code: "{$method['carrier_code']}"
          method_code: "{$method['method_code']}"
       }

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php

@@ -8,7 +8,6 @@
 namespace Magento\GraphQl\Quote\Customer;
 
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-use Magento\GraphQl\Quote\GetQuoteShippingAddressIdByReservedQuoteId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -23,11 +22,6 @@ class SetOfflineShippingMethodsOnCartTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
-    /**
-     * @var GetQuoteShippingAddressIdByReservedQuoteId
-     */
-    private $getQuoteShippingAddressIdByReservedQuoteId;
-
     /**
      * @var CustomerTokenServiceInterface
      */
@@ -40,9 +34,6 @@ protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-        $this->getQuoteShippingAddressIdByReservedQuoteId = $objectManager->get(
-            GetQuoteShippingAddressIdByReservedQuoteId::class
-        );
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
@@ -64,13 +55,11 @@ protected function setUp()
     public function testSetOfflineShippingMethod(string $carrierCode, string $methodCode, float $amount, string $label)
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
 
         $query = $this->getQuery(
             $maskedQuoteId,
             $methodCode,
-            $carrierCode,
-            $quoteAddressId
+            $carrierCode
         );
         $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
@@ -111,22 +100,19 @@ public function offlineShippingMethodDataProvider(): array
      * @param string $maskedQuoteId
      * @param string $shippingMethodCode
      * @param string $shippingCarrierCode
-     * @param int $shippingAddressId
      * @return string
      */
     private function getQuery(
         string $maskedQuoteId,
         string $shippingMethodCode,
-        string $shippingCarrierCode,
-        int $shippingAddressId
+        string $shippingCarrierCode
     ): string {
         return <<<QUERY
 mutation {
   setShippingMethodsOnCart(input: 
     {
       cart_id: "$maskedQuoteId", 
       shipping_methods: [{
-        cart_address_id: $shippingAddressId
         carrier_code: "$shippingCarrierCode"
         method_code: "$shippingMethodCode"
       }]