MAGETWO-98832: Multistore Allowed Countries List Problem

ysapiga · ysapiga · commit f5342dc0426b · 2019-04-05T20:21:26.000+03:00
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -17,7 +17,6 @@
 use Magento\Customer\Model\Config\Share as ConfigShare;
 use Magento\Customer\Model\Customer as CustomerModel;
 use Magento\Customer\Model\Customer\CredentialsValidator;
-use Magento\Customer\Model\Data\Address as DataAddress;
 use Magento\Customer\Model\Metadata\Validator;
 use Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory;
 use Magento\Directory\Model\AllowedCountries;
@@ -1618,11 +1617,11 @@ private function setIgnoreValidationFlag($customer)
     /**
      * Check is address allowed for store
      *
-     * @param DataAddress $address
+     * @param AddressInterface $address
      * @param int $storeId
      * @return bool
      */
-    private function isAddressAllowedForWebsite(DataAddress $address, int $storeId): bool
+    private function isAddressAllowedForWebsite(AddressInterface $address, int $storeId): bool
     {
         $allowedCountries = $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
 
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -12,6 +12,7 @@
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Customer\Model\Data\Customer;
 use Magento\Customer\Model\EmailNotificationInterface;
+use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Area;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -155,6 +156,11 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
      */
     private $searchCriteriaBuilderMock;
 
+    /**
+     * @var AllowedCountries|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $allowedCountriesReader;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -193,6 +199,7 @@ protected function setUp()
         $this->extensibleDataObjectConverter = $this->createMock(
             \Magento\Framework\Api\ExtensibleDataObjectConverter::class
         );
+        $this->allowedCountriesReader = $this->createMock(AllowedCountries::class);
         $this->authenticationMock = $this->getMockBuilder(AuthenticationInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -256,6 +263,7 @@ protected function setUp()
                 'visitorCollectionFactory' => $this->visitorCollectionFactory,
                 'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
                 'addressRegistry' => $this->addressRegistryMock,
+                'allowedCountriesReader' => $this->allowedCountriesReader,
             ]
         );
         $this->objectManagerHelper->setBackwardCompatibleProperty(
@@ -551,7 +559,14 @@ public function testCreateAccountWithPasswordHashWithAddressException()
             ->expects($this->once())
             ->method('delete')
             ->with($customer);
-
+        $this->allowedCountriesReader
+            ->expects($this->atLeastOnce())
+            ->method('getAllowedCountries')
+            ->willReturn(['US' => 'US']);
+        $address
+            ->expects($this->atLeastOnce())
+            ->method('getCountryId')
+            ->willReturn('US');
         $this->accountManagement->createAccountWithPasswordHash($customer, $hash);
     }
 
@@ -725,6 +740,14 @@ public function testCreateAccountWithoutPassword()
         $this->emailNotificationMock->expects($this->once())
             ->method('newAccount')
             ->willReturnSelf();
+        $this->allowedCountriesReader
+            ->expects($this->atLeastOnce())
+            ->method('getAllowedCountries')
+            ->willReturn(['US' => 'US']);
+        $address
+            ->expects($this->atLeastOnce())
+            ->method('getCountryId')
+            ->willReturn('US');
 
         $this->accountManagement->createAccount($customer);
     }
@@ -970,6 +993,14 @@ public function testCreateAccountWithPassword()
         $this->emailNotificationMock->expects($this->once())
             ->method('newAccount')
             ->willReturnSelf();
+        $this->allowedCountriesReader
+            ->expects($this->atLeastOnce())
+            ->method('getAllowedCountries')
+            ->willReturn(['US' => 'US']);
+        $address
+            ->expects($this->atLeastOnce())
+            ->method('getCountryId')
+            ->willReturn('US');
 
         $this->accountManagement->createAccount($customer, $password);
     }
@@ -1954,6 +1985,14 @@ public function testCreateAccountWithPasswordHashWithCustomerAddresses()
             ->method('getWebsite')
             ->with($websiteId)
             ->willReturn($website);
+        $this->allowedCountriesReader
+            ->expects($this->atLeastOnce())
+            ->method('getAllowedCountries')
+            ->willReturn(['US' => 'US']);
+        $existingAddress
+            ->expects($this->atLeastOnce())
+            ->method('getCountryId')
+            ->willReturn('US');
 
         $this->assertSame($customer, $this->accountManagement->createAccountWithPasswordHash($customer, $hash));
     }
@@ -2081,6 +2120,14 @@ public function testCreateAccountUnexpectedValueException(): void
             ->method('newAccount')
             ->willThrowException($exception);
         $this->logger->expects($this->once())->method('error')->with($exception);
+        $this->allowedCountriesReader
+            ->expects($this->atLeastOnce())
+            ->method('getAllowedCountries')
+            ->willReturn(['US' => 'US']);
+        $address
+            ->expects($this->atLeastOnce())
+            ->method('getCountryId')
+            ->willReturn('US');
 
         $this->accountManagement->createAccount($customer);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\State\ExpiredException;
 use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -53,6 +54,9 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Api\ExtensibleDataObjectConverter */
     private $extensibleDataObjectConverter;
 
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
     /** @var  \Magento\Framework\Api\DataObjectHelper */
     protected $dataObjectHelper;
 
@@ -114,6 +118,9 @@ protected function setUp()
 
         $this->extensibleDataObjectConverter = $this->objectManager
             ->create(\Magento\Framework\Api\ExtensibleDataObjectConverter::class);
+
+        $this->storeManager = $this->objectManager
+            ->create(StoreManagerInterface::class);
     }
 
     /**
@@ -844,6 +851,52 @@ public function testCreateNewCustomerWithPasswordHash()
         );
     }
 
+    /**
+     * Customer has two addresses one of it is allowed in website and second is not
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoDataFixture Magento/Store/_files/websites_different_countries.php
+     * @magentoConfigFixture fixture_second_store_store general/country/allow UA
+     * @return void
+     */
+    public function testCreateNewCustomerWithPasswordHashWithNotAllowedCountry()
+    {
+        /** Preconditions:
+         * Customer with two addresses created
+         * Two websites with different allowed country configured
+         */
+        $customerRepository = $this->objectManager->create(
+            CustomerRepositoryInterface::class
+        );
+        $fixtureCustomerId = 1;
+        $allowedCountryIdForSecondWebsite = 'UA';
+        /** @var \Magento\Customer\Model\Customer $customer */
+        $store =$this->storeManager->getStore('fixture_second_store');
+        $customerData = $customerRepository->getById($fixtureCustomerId);
+        $customerData->getAddresses()[1]->setRegion(null)->setCountryId($allowedCountryIdForSecondWebsite)
+            ->setRegionId(null);
+        $customerData->setStoreId($store->getId())->setWebsiteId($store->getWebsiteId())->setId(null);
+        $encryptor = $this->objectManager->get(\Magento\Framework\Encryption\EncryptorInterface::class);
+        /** @var \Magento\Framework\Math\Random $mathRandom */
+        $password = $this->objectManager->get(\Magento\Framework\Math\Random::class)->getRandomString(8);
+        $passwordHash = $encryptor->getHash($password, true);
+        $savedCustomer = $this->accountManagement->createAccountWithPasswordHash(
+            $customerData,
+            $passwordHash
+        );
+        $this->assertCount(
+            1,
+            $savedCustomer->getAddresses(),
+            'The wrong address quantity was saved'
+        );
+        $this->assertSame(
+            'UA',
+            $savedCustomer->getAddresses()[0]->getCountryId(),
+            'The address with the disallowed country was saved'
+        );
+    }
+
     /**
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/Customer/_files/customer.php
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
@@ -19,7 +19,9 @@
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Framework\Api\ExtensibleDataInterface;
-
+use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Store\Model\StoreManagerInterface;
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -30,12 +32,23 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var string
+     */
+    private $allowedCountriesConfigPath = 'general/country/allow';
+
     /**
      * @inheritdoc
      */
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
+        $this->config = Bootstrap::getObjectManager()->get(ConfigInterface::class);
     }
 
     /**
@@ -330,6 +343,39 @@ public function testAssignCustomerWithAddressChange(): void
         }
     }
 
+    /**
+     * Customer has address with country which not allowed in website
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     * @return void
+     */
+    public function testAssignCustomerWithAddressChangeWithNotAllowedCountry()
+    {
+        /** Preconditions:
+         * Customer with  address is created
+         */
+        $this->config->saveConfig(
+            $this->allowedCountriesConfigPath,
+            'FR'
+        );
+        Bootstrap::getObjectManager()->get(ReinitableConfigInterface::class)->reinit();
+        Bootstrap::getObjectManager()->create(StoreManagerInterface::class)->reinitStores();
+
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
+        $customerData = $this->_prepareQuoteForTestAssignCustomerWithAddressChange($quote);
+
+        /** Execute SUT */
+        $quote->assignCustomerWithAddressChange($customerData);
+
+        /** Check that addresses are empty */
+        $this->assertNull($quote->getBillingAddress()->getCountryId());
+        $this->assertNull($quote->getShippingAddress()->getCountryId());
+
+        $this->config->deleteConfig($this->allowedCountriesConfigPath);
+    }
+
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
      * @return void
