Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3296' into Tier4-Kings-PR-11-22-2024

devarul · devarul · commit 8187bf74af2b · 2024-11-22T17:40:04.000+05:30
diff --git a/app/code/Magento/Quote/Model/CustomerManagement.php b/app/code/Magento/Quote/Model/CustomerManagement.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -10,6 +10,7 @@
 use Magento\Customer\Api\AccountManagementInterface as AccountManagement;
 use Magento\Customer\Api\AddressRepositoryInterface as CustomerAddressRepository;
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Model\AddressFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Validator\Exception as ValidatorException;
@@ -46,24 +47,32 @@ class CustomerManagement
      */
     private $addressFactory;
 
+    /**
+     * @var AddressInterfaceFactory
+     */
+    private $customerAddressFactory;
+
     /**
      * CustomerManagement constructor.
      * @param CustomerRepository $customerRepository
      * @param CustomerAddressRepository $customerAddressRepository
      * @param AccountManagement $accountManagement
+     * @param AddressInterfaceFactory $customerAddressFactory
      * @param ValidatorFactory|null $validatorFactory
      * @param AddressFactory|null $addressFactory
      */
     public function __construct(
         CustomerRepository $customerRepository,
         CustomerAddressRepository $customerAddressRepository,
         AccountManagement $accountManagement,
+        AddressInterfaceFactory $customerAddressFactory,
         ValidatorFactory $validatorFactory = null,
         AddressFactory $addressFactory = null
     ) {
         $this->customerRepository = $customerRepository;
         $this->customerAddressRepository = $customerAddressRepository;
         $this->accountManagement = $accountManagement;
+        $this->customerAddressFactory = $customerAddressFactory;
         $this->validatorFactory = $validatorFactory ?: ObjectManager::getInstance()
             ->get(ValidatorFactory::class);
         $this->addressFactory = $addressFactory ?: ObjectManager::getInstance()
@@ -150,18 +159,29 @@ public function validateAddresses(QuoteEntity $quote)
                 $quote->getShippingAddress()->getCustomerAddressId()
             );
         }
-        if (!empty($addresses)) {
-            foreach ($addresses as $address) {
-                $validator = $this->validatorFactory->createValidator('customer_address', 'save');
-                $addressModel = $this->addressFactory->create();
-                $addressModel->updateData($address);
-                if (!$validator->isValid($addressModel)) {
-                    throw new ValidatorException(
-                        null,
-                        null,
-                        $validator->getMessages()
-                    );
-                }
+        if (empty($addresses) && $quote->getCustomerIsGuest()) {
+            $billingAddress = $quote->getBillingAddress();
+            $customerAddress = $this->customerAddressFactory->create();
+            $customerAddress->setFirstname($billingAddress->getFirstname());
+            $customerAddress->setLastname($billingAddress->getLastname());
+            $customerAddress->setStreet($billingAddress->getStreet());
+            $customerAddress->setCity($billingAddress->getCity());
+            $customerAddress->setPostcode($billingAddress->getPostcode());
+            $customerAddress->setTelephone($billingAddress->getTelephone());
+            $customerAddress->setCountryId($billingAddress->getCountryId());
+            $customerAddress->setCustomAttributes($billingAddress->getCustomAttributes());
+            $addresses[] = $customerAddress;
+        }
+        foreach ($addresses as $address) {
+            $validator = $this->validatorFactory->createValidator('customer_address', 'save');
+            $addressModel = $this->addressFactory->create();
+            $addressModel->updateData($address);
+            if (!$validator->isValid($addressModel)) {
+                throw new ValidatorException(
+                    null,
+                    null,
+                    $validator->getMessages()
+                );
             }
         }
     }
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -565,10 +565,10 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
         if (!$quote->getCustomerIsGuest()) {
             if ($quote->getCustomerId()) {
                 $this->_prepareCustomerQuote($quote);
-                $this->customerManagement->validateAddresses($quote);
             }
             $this->customerManagement->populateCustomerInfo($quote);
         }
+        $this->customerManagement->validateAddresses($quote);
         $addresses = [];
         $quote->reserveOrderId();
         if ($quote->isVirtual()) {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/CustomerManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/CustomerManagementTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -11,9 +11,11 @@
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\AddressFactory;
 use Magento\Framework\Validator;
+use Magento\Framework\Validator\Exception as ValidatorException;
 use Magento\Framework\Validator\Factory;
 use Magento\Quote\Model\CustomerManagement;
 use Magento\Quote\Model\Quote;
@@ -76,6 +78,11 @@ class CustomerManagementTest extends TestCase
      */
     private $addressFactoryMock;
 
+    /**
+     * @var MockObject
+     */
+    private $customerAddressFactoryMock;
+
     protected function setUp(): void
     {
         $this->customerRepositoryMock = $this->getMockForAbstractClass(
@@ -107,7 +114,8 @@ protected function setUp(): void
         );
         $this->quoteMock = $this->getMockBuilder(Quote::class)
             ->addMethods(['getPasswordHash'])
-            ->onlyMethods(['getId', 'getCustomer', 'getBillingAddress', 'getShippingAddress', 'setCustomer'])
+            ->onlyMethods(['getId', 'getCustomer', 'getBillingAddress', 'getShippingAddress', 'setCustomer',
+                'getCustomerIsGuest'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->quoteAddressMock = $this->createMock(Address::class);
@@ -136,10 +144,20 @@ protected function setUp(): void
         $this->validatorFactoryMock = $this->getMockBuilder(Factory::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->customerAddressFactoryMock = $this->getMockForAbstractClass(
+            AddressInterfaceFactory::class,
+            [],
+            '',
+            false,
+            true,
+            true,
+            ['create']
+        );
         $this->customerManagement = new CustomerManagement(
             $this->customerRepositoryMock,
             $this->customerAddressRepositoryMock,
             $this->accountManagementMock,
+            $this->customerAddressFactoryMock,
             $this->validatorFactoryMock,
             $this->addressFactoryMock
         );
@@ -249,19 +267,35 @@ public function testValidateAddresses()
 
     public function testValidateAddressesNotSavedInAddressBook()
     {
+        $this->expectException(ValidatorException::class);
+        $this->quoteMock->method('getCustomerIsGuest')->willReturn(true);
+        $this->quoteAddressMock->method('getStreet')->willReturn(['test']);
+        $this->quoteAddressMock->method('getCustomAttributes')->willReturn(['test']);
+        $this->customerAddressFactoryMock->method('create')
+            ->willReturn($this->customerAddressMock);
+        $addressMock = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->addressFactoryMock->expects($this->exactly(1))->method('create')->willReturn($addressMock);
         $this->quoteMock
-            ->expects($this->once())
+            ->expects($this->atMost(2))
             ->method('getBillingAddress')
             ->willReturn($this->quoteAddressMock);
         $this->quoteMock
             ->expects($this->once())
             ->method('getShippingAddress')
             ->willReturn($this->quoteAddressMock);
         $this->quoteAddressMock->expects($this->any())->method('getCustomerAddressId')->willReturn(null);
+        $validatorMock = $this->getMockBuilder(Validator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->validatorFactoryMock
-            ->expects($this->never())
+            ->expects($this->exactly(1))
             ->method('createValidator')
-            ->with('customer_address', 'save', null);
+            ->with('customer_address', 'save', null)
+            ->willReturn($validatorMock);
+        $validatorMock->expects($this->exactly(1))->method('isValid')->with($addressMock)->willReturn(false);
+        $validatorMock->expects($this->exactly(1))->method('getMessages')->willReturn([]);
         $this->customerManagement->validateAddresses($this->quoteMock);
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/ApplicationStateComparator/_files/state-filter-list.php b/dev/tests/integration/framework/Magento/TestFramework/ApplicationStateComparator/_files/state-filter-list.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -41,6 +41,7 @@
         Magento\Framework\Logger\Handler\Base::class => [ // TODO: remove this after ACPT-1034 is fixed
             'stream' => null,
         ],
+        Magento\Framework\Validator\AbstractValidator::class => ['_defaultTranslator' => null],
     ],
     'services' => [ // Note: These apply only to the service names that match.
         Magento\Framework\ObjectManager\ConfigInterface::class => ['_mergedArguments' => null],
diff --git a/dev/tests/integration/framework/Magento/TestFramework/ApplicationStateComparator/_files/state-skip-list.php b/dev/tests/integration/framework/Magento/TestFramework/ApplicationStateComparator/_files/state-skip-list.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -81,7 +81,7 @@
 //        Magento\Customer\Model\ResourceModel\AddressRepository::class => null,
 //        Magento\Customer\Model\CustomerRegistry::class => null,
 //        Magento\Customer\Model\ResourceModel\Address\Relation::class => null,
-//        Magento\Customer\Model\ResourceModel\Address::class => null,
+        Magento\Customer\Model\ResourceModel\Address::class => null,
 //        Magento\Customer\Model\AttributeMetadataConverter::class => null,
         Magento\Customer\Model\Metadata\CustomerMetadata::class => null, // TODO?
 //        Magento\Customer\Model\Metadata\AttributeMetadataCache::class => null,
