AC-6731: Validation fixes for WebAPI

Author: sreenia806

app/code/Magento/Quote/Model/BillingAddressManagement.php

@@ -10,7 +10,6 @@
 use Magento\Framework\Exception\InputException;
 use Magento\Quote\Api\BillingAddressManagementInterface;
 use Magento\Quote\Api\Data\AddressInterface;
-use Magento\Quote\Api\Data\CartInterface;
 use Psr\Log\LoggerInterface as Logger;
 
 /**
@@ -79,7 +78,7 @@ public function assign($cartId, AddressInterface $address, $useForShipping = fal
         $quote = $this->quoteRepository->getActive($cartId);
 
         // validate the address
-        $this->validateAddress($quote, $address);
+        $this->addressValidator->validateAddress($quote, $address);
 
         $address->setCustomerId($quote->getCustomerId());
         $quote->removeAddress($quote->getBillingAddress()->getId());
@@ -118,23 +117,4 @@ private function getShippingAddressAssignment()
         }
         return $this->shippingAddressAssignment;
     }
-
-    /**
-     * Validate address to be used for cart.
-     *
-     * @param CartInterface $cart
-     * @param AddressInterface $address
-     * @return void
-     * @throws InputException The specified address belongs to another customer.
-     */
-    public function validateAddress(CartInterface $cart, AddressInterface $address): void
-    {
-        // check if address belongs to quote.
-        if ($address->getId() !== null) {
-            $old = $cart->getAddressesCollection()->getItemById($address->getId());
-            if ($old === null) {
-                throw new InputException(__('Invalid address'));
-            }
-        }
-    }
 }

app/code/Magento/Quote/Model/QuoteAddressValidator.php

@@ -59,15 +59,15 @@ public function __construct(
      * @param int|null $customerId Cart belongs to
      * @return void
      * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
-     * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
+     * @throws NoSuchEntityException The specified customer ID or address ID is not valid.
      */
     private function doValidate(AddressInterface $address, ?int $customerId): void
     {
         //validate customer id
         if ($customerId) {
             $customer = $this->customerRepository->getById($customerId);
             if (!$customer->getId()) {
-                throw new \Magento\Framework\Exception\NoSuchEntityException(
+                throw new NoSuchEntityException(
                     __('Invalid customer id %1', $customerId)
                 );
             }
@@ -76,15 +76,15 @@ private function doValidate(AddressInterface $address, ?int $customerId): void
         if ($address->getCustomerAddressId()) {
             //Existing address cannot belong to a guest
             if (!$customerId) {
-                throw new \Magento\Framework\Exception\NoSuchEntityException(
+                throw new NoSuchEntityException(
                     __('Invalid customer address id %1', $address->getCustomerAddressId())
                 );
             }
             //Validating address ID
             try {
                 $this->addressRepository->getById($address->getCustomerAddressId());
             } catch (NoSuchEntityException $e) {
-                throw new \Magento\Framework\Exception\NoSuchEntityException(
+                throw new NoSuchEntityException(
                     __('Invalid address id %1', $address->getId())
                 );
             }
@@ -94,7 +94,7 @@ private function doValidate(AddressInterface $address, ?int $customerId): void
                 return $address->getId();
             }, $this->customerRepository->getById($customerId)->getAddresses());
             if (!in_array($address->getCustomerAddressId(), $applicableAddressIds)) {
-                throw new \Magento\Framework\Exception\NoSuchEntityException(
+                throw new NoSuchEntityException(
                     __('Invalid customer address id %1', $address->getCustomerAddressId())
                 );
             }
@@ -107,7 +107,7 @@ private function doValidate(AddressInterface $address, ?int $customerId): void
      * @param \Magento\Quote\Api\Data\AddressInterface $addressData The address data object.
      * @return bool
      * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
-     * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
+     * @throws NoSuchEntityException The specified customer ID or address ID is not valid.
      */
     public function validate(AddressInterface $addressData)
     {
@@ -123,10 +123,31 @@ public function validate(AddressInterface $addressData)
      * @param AddressInterface $address
      * @return void
      * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
-     * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
+     * @throws NoSuchEntityException The specified customer ID or address ID is not valid.
      */
     public function validateForCart(CartInterface $cart, AddressInterface $address): void
     {
         $this->doValidate($address, $cart->getCustomerIsGuest() ? null : $cart->getCustomer()->getId());
     }
+
+    /**
+     * Validate address id to be used for cart.
+     *
+     * @param CartInterface $cart
+     * @param AddressInterface $address
+     * @return void
+     * @throws NoSuchEntityException The specified customer ID or address ID is not valid.
+     */
+    public function validateAddress(CartInterface $cart, AddressInterface $address): void
+    {
+        // check if address belongs to quote.
+        if ($address->getId() !== null) {
+            $old = $cart->getAddressesCollection()->getItemById($address->getId());
+            if ($old === null) {
+                throw new NoSuchEntityException(
+                    __('Invalid quote address id %1', $address->getId())
+                );
+            }
+        }
+    }
 }