Merge pull request #7963 from magento-l3/ACP2E-1132

ACP2E-1132: Fix name uniqueness when Tax Rule is created

Author: dhorytskyi

app/code/Magento/Customer/Test/Fixture/Customer.php

@@ -8,11 +8,10 @@
 
 namespace Magento\Customer\Test\Fixture;
 
+use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Customer\Model\Customer as CustomerModel;
-use Magento\Customer\Model\CustomerFactory;
 use Magento\Customer\Model\CustomerRegistry;
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
@@ -36,10 +35,10 @@ class Customer implements RevertibleDataFixtureInterface
         CustomerInterface::CREATED_IN => null,
         CustomerInterface::DOB => null,
         CustomerInterface::EMAIL => 'customer%uniqid%@mail.com',
-        CustomerInterface::FIRSTNAME => 'Firstname %uniqid%',
+        CustomerInterface::FIRSTNAME => 'Firstname%uniqid%',
         CustomerInterface::GENDER => null,
         CustomerInterface::GROUP_ID => null,
-        CustomerInterface::LASTNAME => 'Lastname %uniqid%',
+        CustomerInterface::LASTNAME => 'Lastname%uniqid%',
         CustomerInterface::MIDDLENAME => null,
         CustomerInterface::PREFIX => null,
         CustomerInterface::STORE_ID => null,
@@ -49,7 +48,9 @@ class Customer implements RevertibleDataFixtureInterface
         CustomerInterface::DEFAULT_BILLING => null,
         CustomerInterface::DEFAULT_SHIPPING => null,
         CustomerInterface::KEY_ADDRESSES => [],
-        CustomerInterface::DISABLE_AUTO_GROUP_CHANGE => null
+        CustomerInterface::DISABLE_AUTO_GROUP_CHANGE => null,
+        CustomerInterface::CUSTOM_ATTRIBUTES => [],
+        CustomerInterface::EXTENSION_ATTRIBUTES_KEY => [],
     ];
 
     private const DEFAULT_DATA_ADDRESS = [
@@ -58,80 +59,68 @@ class Customer implements RevertibleDataFixtureInterface
         AddressInterface::REGION => 'Massachusetts',
         AddressInterface::REGION_ID => '32',
         AddressInterface::COUNTRY_ID => 'US',
-        AddressInterface::STREET => '123 Test Street',
+        AddressInterface::STREET => ['%street_number% Test Street%uniqid%'],
         AddressInterface::COMPANY => null,
         AddressInterface::TELEPHONE => '1234567890',
         AddressInterface::FAX => null,
         AddressInterface::POSTCODE => '02108',
         AddressInterface::CITY => 'Boston',
-        AddressInterface::FIRSTNAME => 'Firstname %uniqid%',
-        AddressInterface::LASTNAME => 'Lastname %uniqid%',
+        AddressInterface::FIRSTNAME => 'Firstname%uniqid%',
+        AddressInterface::LASTNAME => 'Lastname%uniqid%',
         AddressInterface::MIDDLENAME => null,
         AddressInterface::PREFIX => null,
         AddressInterface::SUFFIX => null,
         AddressInterface::VAT_ID => null,
         AddressInterface::DEFAULT_BILLING => true,
-        AddressInterface::DEFAULT_SHIPPING => true
+        AddressInterface::DEFAULT_SHIPPING => true,
+        AddressInterface::CUSTOM_ATTRIBUTES => [],
+        AddressInterface::EXTENSION_ATTRIBUTES_KEY => [],
     ];
 
     /**
      * @var ServiceFactory
      */
-    private $serviceFactory;
+    private ServiceFactory $serviceFactory;
 
     /**
-     * @var CustomerRepositoryInterface
+     * @var AccountManagementInterface
      */
-    private $customerRepository;
-
-    /**
-     * @var CustomerFactory
-     */
-    private $customerFactory;
+    private AccountManagementInterface $accountManagement;
 
     /**
      * @var CustomerRegistry
      */
-    private $customerRegistry;
+    private CustomerRegistry $customerRegistry;
 
     /**
      * @var ProcessorInterface
      */
-    private $dataProcessor;
+    private ProcessorInterface $dataProcessor;
 
     /**
      * @var DataMerger
      */
-    private $dataMerger;
-
-    /**
-     * @var CustomerModel|null
-     */
-    private $customer;
+    private DataMerger $dataMerger;
 
     /**
      * @param ServiceFactory $serviceFactory
-     * @param CustomerRepositoryInterface $customerRepository
-     * @param CustomerFactory $customerFactory
+     * @param AccountManagementInterface $accountManagement
      * @param CustomerRegistry $customerRegistry
      * @param ProcessorInterface $dataProcessor
      * @param DataMerger $dataMerger
      */
     public function __construct(
         ServiceFactory $serviceFactory,
-        CustomerRepositoryInterface $customerRepository,
-        CustomerFactory $customerFactory,
+        AccountManagementInterface $accountManagement,
         CustomerRegistry $customerRegistry,
         ProcessorInterface $dataProcessor,
-        DataMerger $dataMerger,
+        DataMerger $dataMerger
     ) {
         $this->serviceFactory = $serviceFactory;
-        $this->customerRepository = $customerRepository;
-        $this->customerFactory = $customerFactory;
+        $this->accountManagement = $accountManagement;
         $this->customerRegistry = $customerRegistry;
         $this->dataProcessor = $dataProcessor;
         $this->dataMerger = $dataMerger;
-        $this->customer = null;
     }
 
     /**
@@ -145,14 +134,12 @@ public function apply(array $data = []): ?DataObject
     {
         $customerSaveService = $this->serviceFactory->create(CustomerRepositoryInterface::class, 'save');
         $data = $this->prepareData($data);
-        if (count($data[CustomerInterface::KEY_ADDRESSES])) {
-            $addresses = $this->prepareCustomerAddress($data[CustomerInterface::KEY_ADDRESSES]);
-            $data[CustomerInterface::KEY_ADDRESSES] = $addresses;
-        }
+        $passwordHash = $this->accountManagement->getPasswordHash($data['password']);
+        unset($data['password']);
         $customerSaveService->execute(
             [
                 'customer' => $data,
-                'passwordHash' => $this->customer->getPasswordHash()
+                'passwordHash' => $passwordHash
             ]
         );
         return $this->customerRegistry->retrieveByEmail($data['email'], $data['website_id']);
@@ -180,29 +167,33 @@ public function revert(DataObject $data): void
      */
     private function prepareData(array $data): array
     {
-        $data = $this->dataMerger->merge(self::DEFAULT_DATA, $data, false);
-
-        $this->customer = $this->customerFactory->create(['data' => $data]);
-        $this->customer->setPassword($data['password']);
-        if (isset($data['password'])) {
-            unset($data['password']);
-        }
+        $data = $this->dataMerger->merge(self::DEFAULT_DATA, $data);
+        $data[CustomerInterface::KEY_ADDRESSES] = $this->prepareAddresses($data[CustomerInterface::KEY_ADDRESSES]);
 
         return $this->dataProcessor->process($this, $data);
     }
 
     /**
-     * Prepare customer address
+     * Prepare customer addresses
      *
      * @param array $data
      * @return array
      */
-    private function prepareCustomerAddress(array $data): array
+    private function prepareAddresses(array $data): array
     {
         $addresses = [];
+        $default = self::DEFAULT_DATA_ADDRESS;
+        $streetNumber = 123;
         foreach ($data as $dataAddress) {
-            $dataAddress = $this->dataMerger->merge(self::DEFAULT_DATA_ADDRESS, $dataAddress, false);
-            $addresses[] = $this->dataProcessor->process($this, $dataAddress);
+            $dataAddress = $this->dataMerger->merge($default, $dataAddress);
+            $placeholders = ['%street_number%' => $streetNumber++];
+            $dataAddress[AddressInterface::STREET] = array_map(
+                fn ($str) => strtr($str, $placeholders),
+                $dataAddress[AddressInterface::STREET]
+            );
+            $addresses[] = $dataAddress;
+            $default[AddressInterface::DEFAULT_BILLING] = false;
+            $default[AddressInterface::DEFAULT_SHIPPING] = false;
         }
 
         return $addresses;

app/code/Magento/Quote/Test/Fixture/CustomerCart.php

@@ -10,12 +10,6 @@
 use Magento\Framework\DataObject;
 use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\TestFramework\Fixture\Api\DataMerger;
-use Magento\TestFramework\Fixture\Api\ServiceFactory;
-use Magento\TestFramework\Fixture\Data\ProcessorInterface;
 use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
 
 class CustomerCart implements RevertibleDataFixtureInterface
@@ -24,11 +18,6 @@ class CustomerCart implements RevertibleDataFixtureInterface
         'customer_id' => null
     ];
 
-    /**
-     * @var ServiceFactory
-     */
-    private $serviceFactory;
-
     /**
      * @var CartRepositoryInterface
      */
@@ -40,97 +29,39 @@ class CustomerCart implements RevertibleDataFixtureInterface
     private $cartManagement;
 
     /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var ProcessorInterface
-     */
-    private $dataProcessor;
-
-    /**
-     * @var DataMerger
-     */
-    private $dataMerger;
-
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
-    /**
-     * @param ServiceFactory $serviceFactory
-     * @param StoreManagerInterface $storeManager
      * @param CartRepositoryInterface $cartRepository
      * @param CartManagementInterface $cartManagement
-     * @param QuoteResource $quoteResource
-     * @param QuoteFactory $quoteFactory
-     * @param ProcessorInterface $dataProcessor
-     * @param DataMerger $dataMerger
      */
     public function __construct(
-        ServiceFactory $serviceFactory,
-        StoreManagerInterface $storeManager,
         CartRepositoryInterface $cartRepository,
-        CartManagementInterface $cartManagement,
-        QuoteResource $quoteResource,
-        QuoteFactory $quoteFactory,
-        ProcessorInterface $dataProcessor,
-        DataMerger $dataMerger,
+        CartManagementInterface $cartManagement
     ) {
-        $this->serviceFactory = $serviceFactory;
-        $this->storeManager = $storeManager;
         $this->cartRepository = $cartRepository;
         $this->cartManagement = $cartManagement;
-        $this->quoteResource = $quoteResource;
-        $this->quoteFactory = $quoteFactory;
-        $this->dataProcessor = $dataProcessor;
-        $this->dataMerger = $dataMerger;
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
+     * @param array $data Parameters
+     * <pre>
+     *    $data = [
+     *      'customer_id' => (int) Customer ID. Required.
+     *    ]
+     * </pre>
      */
     public function apply(array $data = []): ?DataObject
     {
-        $data = $this->prepareData($data);
-        $customerId = $data['customer_id'] ?? null;
-        $storeId = $data['store_id'] ?? null;
-        if ($storeId) {
-            $setCurrentStoreService = $this->serviceFactory->create(StoreManagerInterface::class, 'setCurrentStore');
-            $setCurrentStoreService->execute(['store' => $storeId]);
-        }
-        $cartService = $this->serviceFactory->create(CartManagementInterface::class, 'createEmptyCartForCustomer');
-        $cartId = $cartService->execute(['customerId' => $customerId]);
-        $cartRepositoryService = $this->serviceFactory->create(CartRepositoryInterface::class, 'get');
-        $cart = $cartRepositoryService->execute(['cartId' => $cartId]);
-        return $cart;
+        $data = array_merge(self::DEFAULT_DATA, $data);
+        $cartId = $this->cartManagement->createEmptyCartForCustomer($data['customer_id']);
+
+        return $this->cartRepository->get($cartId);
     }
 
     /**
      * @inheritdoc
      */
     public function revert(DataObject $data): void
     {
-        $cartRepositoryService = $this->serviceFactory->create(CartRepositoryInterface::class, 'delete');
-        $cartRepositoryService->execute(['quote' => $data]);
-    }
-
-    /**
-     * Prepare quote data
-     *
-     * @param array $data
-     * @return array
-     */
-    private function prepareData(array $data): array
-    {
-        $data = $this->dataMerger->merge(self::DEFAULT_DATA, $data, false);
-        return $this->dataProcessor->process($this, $data);
+        $this->cartRepository->delete($data);
     }
 }

app/code/Magento/Tax/Test/Fixture/TaxClass.php

@@ -10,12 +10,13 @@
 use Magento\Framework\DataObject;
 use Magento\Tax\Api\TaxClassRepositoryInterface;
 use Magento\TestFramework\Fixture\Api\ServiceFactory;
+use Magento\TestFramework\Fixture\Data\ProcessorInterface;
 use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
 
 class TaxClass implements RevertibleDataFixtureInterface
 {
     private const DEFAULT_DATA = [
-        'class_name' => '%uniqid%',
+        'class_name' => 'taxclass%uniqid%',
         'class_type' => null,
     ];
 
@@ -29,16 +30,24 @@ class TaxClass implements RevertibleDataFixtureInterface
      */
     private TaxClassRepositoryInterface $taxClassRepository;
 
+    /**
+     * @var ProcessorInterface
+     */
+    private ProcessorInterface $dataProcessor;
+
     /**
      * @param ServiceFactory $serviceFactory
      * @param TaxClassRepositoryInterface $taxClassRepository
+     * @param ProcessorInterface $dataProcessor
      */
     public function __construct(
         ServiceFactory $serviceFactory,
-        TaxClassRepositoryInterface $taxClassRepository
+        TaxClassRepositoryInterface $taxClassRepository,
+        ProcessorInterface $dataProcessor
     ) {
         $this->serviceFactory = $serviceFactory;
         $this->taxClassRepository = $taxClassRepository;
+        $this->dataProcessor = $dataProcessor;
     }
 
     /**
@@ -47,7 +56,11 @@ public function __construct(
     public function apply(array $data = []): ?DataObject
     {
         $service = $this->serviceFactory->create(TaxClassRepositoryInterface::class, 'save');
-        $taxClassId = $service->execute(['taxClass' => array_merge(self::DEFAULT_DATA, $data)]);
+        $taxClassId = $service->execute(
+            [
+                'taxClass' => $this->dataProcessor->process($this, array_merge(self::DEFAULT_DATA, $data))
+            ]
+        );
 
         return $this->taxClassRepository->get($taxClassId);
     }