MC-31586: Customer address is duplicated after setBillingAddressOnCart GraphQL mutation.

- reverting changes from magento/graphql-ce#873
- Added functional tests

Author: Prabhu Ram

app/code/Magento/QuoteGraphQl/Model/Cart/Address/SaveQuoteAddressToCustomerAddressBook.php

@@ -12,7 +12,6 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Quote\Model\Quote\Address;
-use Magento\QuoteGraphQl\Model\Cart\Address\SaveQuoteAddressToCustomerAddressBook;
 
 /**
  * Get shipping address
@@ -24,21 +23,13 @@ class GetShippingAddress
      */
     private $quoteAddressFactory;
 
-    /**
-     * @var SaveQuoteAddressToCustomerAddressBook
-     */
-    private $saveQuoteAddressToCustomerAddressBook;
-
     /**
      * @param QuoteAddressFactory $quoteAddressFactory
-     * @param SaveQuoteAddressToCustomerAddressBook $saveQuoteAddressToCustomerAddressBook
      */
     public function __construct(
-        QuoteAddressFactory $quoteAddressFactory,
-        SaveQuoteAddressToCustomerAddressBook $saveQuoteAddressToCustomerAddressBook
+        QuoteAddressFactory $quoteAddressFactory
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
-        $this->saveQuoteAddressToCustomerAddressBook = $saveQuoteAddressToCustomerAddressBook;
     }
 
     /**
@@ -96,25 +87,15 @@ private function createShippingAddress(
 
         if (null === $customerAddressId) {
             $shippingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
-
-            // need to save address only for registered user and if save_in_address_book = true
-            if (0 !== $customerId
-                && isset($addressInput['save_in_address_book'])
-                && (bool)$addressInput['save_in_address_book'] === true
-            ) {
-                $this->saveQuoteAddressToCustomerAddressBook->execute($shippingAddress, $customerId);
-            }
         } else {
             if (false === $context->getExtensionAttributes()->getIsCustomer()) {
                 throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
             }
-
             $shippingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress(
                 (int)$customerAddressId,
                 $customerId
             );
         }
-
         return $shippingAddress;
     }
 }

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

@@ -13,7 +13,6 @@
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Quote\Address;
-use Magento\QuoteGraphQl\Model\Cart\Address\SaveQuoteAddressToCustomerAddressBook;
 
 /**
  * Set billing address for a specified shopping cart
@@ -30,24 +29,16 @@ class SetBillingAddressOnCart
      */
     private $assignBillingAddressToCart;
 
-    /**
-     * @var SaveQuoteAddressToCustomerAddressBook
-     */
-    private $saveQuoteAddressToCustomerAddressBook;
-
     /**
      * @param QuoteAddressFactory $quoteAddressFactory
      * @param AssignBillingAddressToCart $assignBillingAddressToCart
-     * @param SaveQuoteAddressToCustomerAddressBook $saveQuoteAddressToCustomerAddressBook
      */
     public function __construct(
         QuoteAddressFactory $quoteAddressFactory,
-        AssignBillingAddressToCart $assignBillingAddressToCart,
-        SaveQuoteAddressToCustomerAddressBook $saveQuoteAddressToCustomerAddressBook
+        AssignBillingAddressToCart $assignBillingAddressToCart
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
         $this->assignBillingAddressToCart = $assignBillingAddressToCart;
-        $this->saveQuoteAddressToCustomerAddressBook = $saveQuoteAddressToCustomerAddressBook;
     }
 
     /**
@@ -90,7 +81,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
             );
         }
 
-        $billingAddress = $this->createBillingAddress($context, $customerAddressId, $addressInput, $sameAsShipping);
+        $billingAddress = $this->createBillingAddress($context, $customerAddressId, $addressInput);
 
         $this->assignBillingAddressToCart->execute($cart, $billingAddress, $sameAsShipping);
     }
@@ -101,7 +92,6 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
      * @param ContextInterface $context
      * @param int|null $customerAddressId
      * @param array $addressInput
-     * @param bool $sameAsShipping
      * @return Address
      * @throws GraphQlAuthorizationException
      * @throws GraphQlInputException
@@ -110,21 +100,10 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
     private function createBillingAddress(
         ContextInterface $context,
         ?int $customerAddressId,
-        ?array $addressInput,
-        $sameAsShipping
+        ?array $addressInput
     ): Address {
         if (null === $customerAddressId) {
             $billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
-
-            $customerId = $context->getUserId();
-            // need to save address only for registered user and if save_in_address_book = true
-            // and address is not same as shipping
-            if (0 !== $customerId
-                && isset($addressInput['save_in_address_book'])
-                && (bool)$addressInput['save_in_address_book'] && !$sameAsShipping
-            ) {
-                $this->saveQuoteAddressToCustomerAddressBook->execute($billingAddress, $customerId);
-            }
         } else {
             if (false === $context->getExtensionAttributes()->getIsCustomer()) {
                 throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
@@ -136,15 +115,13 @@ private function createBillingAddress(
             );
         }
         $errors = $billingAddress->validate();
-
         if (true !== $errors) {
             $e = new GraphQlInputException(__('Billing address errors'));
             foreach ($errors as $error) {
                 $e->addError(new GraphQlInputException($error));
             }
             throw $e;
         }
-
         return $billingAddress;
     }
 }

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

@@ -858,7 +858,7 @@ public function testSetNewBillingAddressWithSaveInAddressBook()
         $searchCriteria = $this->searchCriteriaBuilder->addFilter('parent_id', $customer->getId())->create();
         $addresses = $this->customerAddressRepository->getList($searchCriteria)->getItems();
 
-        self::assertCount(1, $addresses);
+        self::assertCount(0, $addresses);
         self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
 
         $cartResponse = $response['setBillingAddressOnCart']['cart'];