ACP-4649 Fixed product attribute merging. (#11257)

ACP-4649 Fixed product attribute merging.
spryker · Dec 19, 2024 · cb0bbda · cb0bbda
1 parent 1b6ed25
commit cb0bbda
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/...r/Zed/Product/Business/Product/Merger/DataMerger/ProductLocalizedAttributesDataMerger.php b/...r/Zed/Product/Business/Product/Merger/DataMerger/ProductLocalizedAttributesDataMerger.php
@@ -79,11 +79,9 @@ protected function mergeLocalizedAttributesData(
         $productConcreteLocalizedAttributesTransfer->fromArray($concreteAttributes, true);
 
         $productConcreteLocalizedAttributesTransfer->setAttributes(
-            array_unique(
-                array_merge(
-                    $productAbstractLocalizedAttributesTransfer->getAttributes(),
-                    $productConcreteLocalizedAttributesTransfer->getAttributes(),
-                ),
+            array_merge(
+                $productAbstractLocalizedAttributesTransfer->getAttributes(),
+                $productConcreteLocalizedAttributesTransfer->getAttributes(),
             ),
         );
 

diff --git a/...d/Product/Business/Product/Merger/DataMerger/ProductLocalizedAttributesDataMergerTest.php b/...d/Product/Business/Product/Merger/DataMerger/ProductLocalizedAttributesDataMergerTest.php
@@ -209,12 +209,12 @@ public function testProductConcreteLocalizedAttributesNestedAttributesExtendedWi
         // Arrange
         $productConcreteLocalizedAttribute = (new LocalizedAttributesTransfer())
             ->setLocale((new LocaleTransfer())->setIdLocale(1))
-            ->setAttributes(['red', 'green'])
+            ->setAttributes(['color' => 'black', 'pack' => 'box', 'system' => ['Windows', 'Linux']])
             ->toArray();
 
         $productAbstractLocalizedAttribute = (new LocalizedAttributesTransfer())
             ->setLocale((new LocaleTransfer())->setIdLocale(1))
-            ->setAttributes(['green', 'blue'])
+            ->setAttributes(['color' => 'red', 'material' => 'wood'])
             ->toArray();
 
         $productConcrete = (new ProductConcreteTransfer())->fromArray(['fkProductAbstract' => 1, 'localizedAttributes' => [$productConcreteLocalizedAttribute]]);
@@ -229,6 +229,6 @@ public function testProductConcreteLocalizedAttributesNestedAttributesExtendedWi
         );
 
         // Assert
-        $this->assertEquals(['green', 'blue', 'red'], $productConcreteCollection[0]->getLocalizedAttributes()[0]->getAttributes());
+        $this->assertEquals(['color' => 'black', 'pack' => 'box', 'material' => 'wood', 'system' => ['Windows', 'Linux']], $productConcreteCollection[0]->getLocalizedAttributes()[0]->getAttributes());
     }
 }