Merge remote-tracking branch '38219/refactor-quote-address-validation' into blth-del10131-commdashpr

Author: engcom-Dash

app/code/Magento/Customer/Api/AddressRepositoryInterface.php

@@ -1,8 +1,7 @@
 <?php
 /**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Customer\Api;
 
@@ -28,6 +27,7 @@ public function save(\Magento\Customer\Api\Data\AddressInterface $address);
      * @param int $addressId
      * @return \Magento\Customer\Api\Data\AddressInterface
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getById($addressId);
 

app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Customer\Model\ResourceModel;
 
@@ -164,6 +164,7 @@ private function updateAddressCollection(CustomerModel $customer, CustomerAddres
      * @param int $addressId
      * @return \Magento\Customer\Api\Data\AddressInterface
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getById($addressId)
     {

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

@@ -1,14 +1,15 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Quote\Model;
 
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface as CustomerAddress;
 use Magento\Customer\Model\Session;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\LocalizedException;
@@ -68,39 +69,28 @@ public function __construct(
      */
     private function doValidate(AddressInterface $address, ?int $customerId): void
     {
-        //validate customer id
-        if ($customerId) {
-            $customer = $this->customerRepository->getById($customerId);
-            if (!$customer->getId()) {
-                throw new NoSuchEntityException(
-                    __('Invalid customer id %1', $customerId)
-                );
-            }
-        }
-
-        if ($address->getCustomerAddressId()) {
+        $customerAddressId = $address->getCustomerAddressId();
+        if ($customerAddressId) {
             //Existing address cannot belong to a guest
             if (!$customerId) {
                 throw new NoSuchEntityException(
-                    __('Invalid customer address id %1', $address->getCustomerAddressId())
+                    __('Invalid customer address id %1', $customerAddressId)
                 );
             }
+
+            $customer = $this->customerRepository->getById($customerId);
+
             //Validating address ID
-            try {
-                $this->addressRepository->getById($address->getCustomerAddressId());
-            } catch (NoSuchEntityException $e) {
-                throw new NoSuchEntityException(
-                    __('Invalid address id %1', $address->getId())
-                );
-            }
+            $this->addressRepository->getById($customerAddressId);
+
             //Finding available customer's addresses
-            $applicableAddressIds = array_map(function ($address) {
-                /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+            $applicableAddressIds = array_map(function (CustomerAddress $address) {
                 return $address->getId();
-            }, $this->customerRepository->getById($customerId)->getAddresses());
-            if (!in_array($address->getCustomerAddressId(), $applicableAddressIds)) {
+            }, $customer->getAddresses());
+
+            if (!in_array($customerAddressId, $applicableAddressIds)) {
                 throw new NoSuchEntityException(
-                    __('Invalid customer address id %1', $address->getCustomerAddressId())
+                    __('Invalid customer address id %1', $customerAddressId)
                 );
             }
         }