ENGCOM-6128: Fix the problem 'Attribute with the same code already exists' #25134

Author: VladimirZaets

dev/tests/integration/testsuite/Magento/Customer/_files/attribute_user_defined_address_custom_attribute.php

@@ -4,55 +4,37 @@
  * See COPYING.txt for license details.
  */
 
-$model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Attribute::class);
-$model->setName(
-    'custom_attribute1'
-)->setEntityTypeId(
-    2
-)->setAttributeSetId(
-    2
-)->setAttributeGroupId(
-    1
-)->setFrontendInput(
-    'text'
-)->setFrontendLabel(
-    'custom_attribute_frontend_label'
-)->setIsUserDefined(
-    1
-);
-$model->save();
-
-$model2 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Attribute::class);
-$model2->setName(
-    'custom_attribute2'
-)->setEntityTypeId(
-    2
-)->setAttributeSetId(
-    2
-)->setAttributeGroupId(
-    1
-)->setFrontendInput(
-    'text'
-)->setFrontendLabel(
-    'custom_attribute_frontend_label'
-)->setIsUserDefined(
-    1
-);
-$model2->save();
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Customer\Model\AttributeFactory $attributeFactory */
+$attributeFactory = $objectManager->create(\Magento\Customer\Model\AttributeFactory::class);
+
+/** @var \Magento\Eav\Api\AttributeRepositoryInterface $attributeRepository */
+$attributeRepository =  $objectManager->create(\Magento\Eav\Api\AttributeRepositoryInterface::class);
 
 /** @var \Magento\Customer\Setup\CustomerSetup $setupResource */
-$setupResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Setup\CustomerSetup::class
-);
-
-$data = [['form_code' => 'customer_address_edit', 'attribute_id' => $model->getAttributeId()]];
-$setupResource->getSetup()->getConnection()->insertMultiple(
-    $setupResource->getSetup()->getTable('customer_form_attribute'),
-    $data
-);
-
-$data2 = [['form_code' => 'customer_address_edit', 'attribute_id' => $model2->getAttributeId()]];
-$setupResource->getSetup()->getConnection()->insertMultiple(
-    $setupResource->getSetup()->getTable('customer_form_attribute'),
-    $data2
-);
+$setupResource = $objectManager->create(\Magento\Customer\Setup\CustomerSetup::class);
+
+$attributeNames = ['custom_attribute1', 'custom_attribute2'];
+foreach ($attributeNames as $attributeName) {
+    /** @var \Magento\Customer\Model\Attribute $attribute */
+    $attribute = $attributeFactory->create();
+
+    $attribute->setName($attributeName)
+        ->setEntityTypeId(2)
+        ->setAttributeSetId(2)
+        ->setAttributeGroupId(1)
+        ->setFrontendInput('text')
+        ->setFrontendLabel('custom_attribute_frontend_label')
+        ->setIsUserDefined(true);
+
+    $attributeRepository->save($attribute);
+
+    $setupResource->getSetup()
+        ->getConnection()
+        ->insertMultiple(
+            $setupResource->getSetup()->getTable('customer_form_attribute'),
+            [['form_code' => 'customer_address_edit', 'attribute_id' => $attribute->getAttributeId()]]
+        );
+}

dev/tests/integration/testsuite/Magento/Customer/_files/attribute_user_defined_address_custom_attribute_rollback.php

@@ -5,8 +5,9 @@
  * See COPYING.txt for license details.
  */
 
-$model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Attribute::class);
-$model->load('custom_attribute_test', 'attribute_code')->delete();
-
-$model2 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Attribute::class);
-$model2->load('custom_attributes_test', 'attribute_code')->delete();
+/** @var \Magento\Customer\Model\Attribute $attributeModel */
+$attributeModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Attribute::class
+);
+$attributeModel->load('custom_attribute1', 'attribute_code')->delete();
+$attributeModel->load('custom_attribute2', 'attribute_code')->delete();