GraphQL-409: address_type is null after setting billing and shipping addresses on cart

Author: naydav

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

@@ -7,6 +7,7 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
+use Magento\Customer\Model\Address\AbstractAddress;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
@@ -40,9 +41,17 @@ public function execute(QuoteAddress $address): array
         $addressData = $this->dataObjectConverter->toFlatArray($address, [], AddressInterface::class);
         $addressData['model'] = $address;
 
+        if ($address->getAddressType() == AbstractAddress::TYPE_SHIPPING) {
+            $addressType = 'SHIPPING';
+        } elseif ($address->getAddressType() == AbstractAddress::TYPE_BILLING) {
+            $addressType = 'BILLING';
+        } else {
+            $addressType = null;
+        }
+
         $addressData = array_merge($addressData, [
             'address_id' => $address->getId(),
-            'address_type' => $address->getAddressType(),
+            'address_type' => $addressType,
             'country' => [
                 'code' => $address->getCountryId(),
                 'label' => $address->getCountry()

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

@@ -177,7 +177,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
         self::assertArrayHasKey('shipping_addresses', $cartResponse);
         $shippingAddressResponse = current($cartResponse['shipping_addresses']);
         $this->assertNewAddressFields($billingAddressResponse);
-        $this->assertNewAddressFields($shippingAddressResponse, 'shipping');
+        $this->assertNewAddressFields($shippingAddressResponse, 'SHIPPING');
     }
 
     /**
@@ -409,7 +409,7 @@ public function testSetBillingAddressIfCustomerIsNotOwnerOfAddress()
      * @param array $addressResponse
      * @param string $addressType
      */
-    private function assertNewAddressFields(array $addressResponse, string $addressType = 'billing'): void
+    private function assertNewAddressFields(array $addressResponse, string $addressType = 'BILLING'): void
     {
         $assertionMap = [
             ['response_field' => 'firstname', 'expected_value' => 'test firstname'],

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php

@@ -168,7 +168,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
         self::assertArrayHasKey('shipping_addresses', $cartResponse);
         $shippingAddressResponse = current($cartResponse['shipping_addresses']);
         $this->assertNewAddressFields($billingAddressResponse);
-        $this->assertNewAddressFields($shippingAddressResponse, 'shipping');
+        $this->assertNewAddressFields($shippingAddressResponse, 'SHIPPING');
     }
 
     /**
@@ -250,7 +250,7 @@ public function testSetBillingAddressFromAddressBook()
      * @param array $addressResponse
      * @param string $addressType
      */
-    private function assertNewAddressFields(array $addressResponse, string $addressType = 'billing'): void
+    private function assertNewAddressFields(array $addressResponse, string $addressType = 'BILLING'): void
     {
         $assertionMap = [
             ['response_field' => 'firstname', 'expected_value' => 'test firstname'],

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

@@ -474,7 +474,7 @@ private function assertNewShippingAddressFields(array $shippingAddressResponse):
             ['response_field' => 'postcode', 'expected_value' => '887766'],
             ['response_field' => 'telephone', 'expected_value' => '88776655'],
             ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
-            ['response_field' => 'address_type', 'expected_value' => 'shipping']
+            ['response_field' => 'address_type', 'expected_value' => 'SHIPPING']
         ];
 
         $this->assertResponseFields($shippingAddressResponse, $assertionMap);