fix: check if attribute code exists in the case we have no attribute id

Author: cmuench

app/code/Magento/Catalog/Model/Product/Attribute/Repository.php

@@ -133,6 +133,18 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
                 ->getEntityType(\Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE)
                 ->getId()
         );
+        if (!$attribute->getAttributeId() && $attribute->getAttributeCode()) {
+            try {
+                $existingAttribute = $this->get($attribute->getAttributeCode());
+                if ($existingAttribute->getAttributeId()) {
+                    $attribute->setAttributeId($existingAttribute->getAttributeId());
+                }
+            } catch (NoSuchEntityException $e) {
+                // It's a new attribute, proceed as usual
+            }
+        }
+
+        $validOptionIds = [];
         if ($attribute->getAttributeId()) {
             $existingModel = $this->get($attribute->getAttributeCode());
 
@@ -148,6 +160,13 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
             $attribute->setBackendModel($existingModel->getBackendModel());
 
             $this->updateDefaultFrontendLabel($attribute, $existingModel);
+
+            $source = $existingModel->getSource();
+            if ($source) {
+                foreach ($source->getAllOptions() as $opt) {
+                    $validOptionIds[] = $opt['value'];
+                }
+            }
         } else {
             $attribute->setAttributeId(null);
 
@@ -181,7 +200,11 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
             $optionIndex = 0;
             foreach ($attribute->getOptions() as $option) {
                 $optionIndex++;
-                $optionId = $option->getValue() ?: 'option_' . $optionIndex;
+                $optionId = $option->getValue();
+                if ($optionId && is_numeric($optionId) && !in_array($optionId, $validOptionIds)) {
+                    $optionId = null;
+                }
+                $optionId = $optionId ?: 'option_' . $optionIndex;
                 $options['value'][$optionId][0] = $option->getLabel();
                 $options['order'][$optionId] = $option->getSortOrder() ?: $sortOrder++;
                 if (is_array($option->getStoreLabels())) {

app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php

@@ -210,9 +210,9 @@ public function testSaveNoSuchEntityException()
         $this->expectExceptionMessage('No such entity with attribute_code = test attribute code');
         $attributeMock = $this->createMock(Attribute::class);
         $existingModelMock = $this->createMock(Attribute::class);
-        $attributeMock->expects($this->once())->method('getAttributeId')->willReturn('12');
+        $attributeMock->expects($this->any())->method('getAttributeId')->willReturn('12');
         $attributeCode = 'test attribute code';
-        $attributeMock->expects($this->once())->method('getAttributeCode')->willReturn($attributeCode);
+        $attributeMock->expects($this->any())->method('getAttributeCode')->willReturn($attributeCode);
         $this->eavAttributeRepositoryMock->expects($this->once())
             ->method('get')
             ->with(
@@ -234,7 +234,7 @@ public function testSaveInputExceptionRequiredField()
             Attribute::class,
             ['getFrontendLabels', 'getDefaultFrontendLabel', 'getAttributeId', 'setAttributeId']
         );
-        $attributeMock->expects($this->once())->method('getAttributeId')->willReturn(null);
+        $attributeMock->expects($this->any())->method('getAttributeId')->willReturn(null);
         $attributeMock->expects($this->once())->method('setAttributeId')->with(null)->willReturnSelf();
         $attributeMock->expects($this->once())->method('getFrontendLabels')->willReturn(null);
         $attributeMock->expects($this->once())->method('getDefaultFrontendLabel')->willReturn(null);
@@ -286,7 +286,7 @@ public function testSaveInputExceptionInvalidFieldValue()
             Attribute::class,
             ['getFrontendLabels', 'getDefaultFrontendLabel', 'getAttributeId', 'setAttributeId']
         );
-        $attributeMock->expects($this->once())->method('getAttributeId')->willReturn(null);
+        $attributeMock->expects($this->any())->method('getAttributeId')->willReturn(null);
         $attributeMock->expects($this->once())->method('setAttributeId')->with(null)->willReturnSelf();
         $labelMock = $this->createMock(FrontendLabel::class);
         $attributeMock->expects($this->any())->method('getFrontendLabels')->willReturn([$labelMock]);