MC-42903: GraphQL returns empty address if optional telephone is set as empty string

Author: victor-v-rad

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

@@ -1922,6 +1922,7 @@ public function testSetBillingAddressAndPlaceOrderWithGuestCheckoutDisabled()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/attribute_telephone_not_required_address.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -1947,7 +1948,7 @@ public function testSetNewBillingAddressWithoutTelephone()
           country_code: "US"
           telephone: ""
          }
-         same_as_shipping: true
+         use_for_shipping: true
       }
     }
   ) {

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

@@ -1963,4 +1963,85 @@ public function testSetNewShippingAddressAndPlaceOrderWithGuestCheckoutDisabled(
     {
         $this->testSetNewShippingAddressAndPlaceOrder();
     }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/attribute_telephone_not_required_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetNewShippingAddressWithoutTelephone()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: {
+         address: {
+          firstname: "test firstname"
+          lastname: "test lastname"
+          company: "test company"
+          street: ["test street 1", "test street 2"]
+          city: "test city"
+          region: "AZ"
+          postcode: "887766"
+          country_code: "US"
+          telephone: ""
+         }
+      }
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+        __typename
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
+        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
+        $this->assertNewAddressWithoutTelephone($shippingAddressResponse);
+    }
+
+    /**
+     * Verify the all the whitelisted fields for a New Address Object without telephone
+     *
+     * @param array $addressResponse
+     */
+    private function assertNewAddressWithoutTelephone(
+        array $addressResponse
+    ): void {
+        $assertionMap = [
+            ['response_field' => 'firstname', 'expected_value' => 'test firstname'],
+            ['response_field' => 'lastname', 'expected_value' => 'test lastname'],
+            ['response_field' => 'company', 'expected_value' => 'test company'],
+            ['response_field' => 'street', 'expected_value' => [0 => 'test street 1', 1 => 'test street 2']],
+            ['response_field' => 'city', 'expected_value' => 'test city'],
+            ['response_field' => 'postcode', 'expected_value' => '887766'],
+            ['response_field' => 'telephone', 'expected_value' => ''],
+            ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
+            ['response_field' => '__typename', 'expected_value' => 'ShippingCartAddress']
+        ];
+
+        $this->assertResponseFields($addressResponse, $assertionMap);
+    }
 }

dev/tests/integration/testsuite/Magento/Customer/_files/attribute_telephone_not_required_address.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Model\Attribute;
+use Magento\Eav\Model\AttributeRepository;
+
+/** @var Attribute $model */
+$attribute = Bootstrap::getObjectManager()->create(Attribute::class);
+/** @var AttributeRepository $attributeRepository */
+$attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepository::class);
+$attribute->loadByCode('customer_address', 'telephone');
+$attribute->setIsRequired(false);
+$attributeRepository->save($attribute);