Merge branch 'ACP2E-378' of https://github.com/magento-l3/magento2ce into PR-2022-03-11

Author: Anna Bukatar

app/code/Magento/Catalog/Test/Fixture/Product.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Test\Fixture;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Type;
@@ -50,6 +51,12 @@ class Product implements RevertibleDataFixtureInterface
         'updated_at' => null,
     ];
 
+    private const DEFAULT_PRODUCT_LINK_DATA = [
+        'sku' => null,
+        'type' => 'related',
+        'position' => 1,
+    ];
+
     /**
      * @var ServiceFactory
      */
@@ -65,18 +72,25 @@ class Product implements RevertibleDataFixtureInterface
      */
     private $dataMerger;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * @param ServiceFactory $serviceFactory
      * @param ProcessorInterface $dataProcessor
      */
     public function __construct(
         ServiceFactory $serviceFactory,
         ProcessorInterface $dataProcessor,
-        DataMerger $dataMerger
+        DataMerger $dataMerger,
+        ProductRepositoryInterface $productRepository
     ) {
         $this->serviceFactory = $serviceFactory;
         $this->dataProcessor = $dataProcessor;
         $this->dataMerger = $dataMerger;
+        $this->productRepository = $productRepository;
     }
 
     /**
@@ -122,6 +136,49 @@ private function prepareData(array $data): array
             unset($data['extension_attributes']['category_links']);
         }
 
+        $data['product_links'] = $this->prepareLinksData($data);
+
         return $this->dataProcessor->process($this, $data);
     }
+
+    /**
+     * Prepare links data
+     *
+     * @param array $data
+     * @return array
+     */
+    private function prepareLinksData(array $data): array
+    {
+        $links = [];
+
+        $position = 1;
+        foreach ($data['product_links'] as $link) {
+            $defaultLinkData = self::DEFAULT_PRODUCT_LINK_DATA;
+            $defaultLinkData['position'] = $position;
+            $linkData = [];
+            if (is_numeric($link)) {
+                $product = $this->productRepository->getById($link);
+            } elseif (is_string($link)) {
+                $product = $this->productRepository->get($link);
+            } elseif ($link instanceof ProductInterface) {
+                $product = $this->productRepository->get($link->getSku());
+            } else {
+                $linkData = $link instanceof DataObject ? $link->toArray() : $link;
+                $product = $this->productRepository->get($linkData['sku']);
+            }
+
+            $linkData += $defaultLinkData;
+            $links[] = [
+                'sku' => $data['sku'],
+                'link_type' => $linkData['type'],
+                'linked_product_sku' => $product->getSku(),
+                'linked_product_type' =>  $product->getTypeId(),
+                'position' => $linkData['position'],
+                'extension_attributes' => array_diff_key($linkData, $defaultLinkData),
+            ];
+            $position++;
+        }
+
+        return $links;
+    }
 }

app/code/Magento/ConfigurableProduct/Test/Fixture/Product.php

@@ -53,19 +53,19 @@ class Product extends \Magento\Catalog\Test\Fixture\Product
      * @param ServiceFactory $serviceFactory
      * @param ProcessorInterface $dataProcessor
      * @param DataMerger $dataMerger
-     * @param Config $eavConfig
      * @param ProductRepositoryInterface $productRepository
+     * @param Config $eavConfig
      * @param VariationMatrix $variationMatrix
      */
     public function __construct(
         ServiceFactory $serviceFactory,
         ProcessorInterface $dataProcessor,
         DataMerger $dataMerger,
-        Config $eavConfig,
         ProductRepositoryInterface $productRepository,
+        Config $eavConfig,
         VariationMatrix $variationMatrix
     ) {
-        parent::__construct($serviceFactory, $dataProcessor, $dataMerger);
+        parent::__construct($serviceFactory, $dataProcessor, $dataMerger, $productRepository);
         $this->eavConfig = $eavConfig;
         $this->variationMatrix = $variationMatrix;
         $this->productRepository = $productRepository;

app/code/Magento/GroupedProduct/Test/Fixture/Product.php

@@ -28,6 +28,7 @@ class Product extends \Magento\Catalog\Test\Fixture\Product
 
     private const DEFAULT_PRODUCT_LINK_DATA = [
         'sku' => null,
+        'type' => 'associated',
         'position' => 1,
         'qty' => 1,
     ];
@@ -49,7 +50,7 @@ public function __construct(
         DataMerger $dataMerger,
         ProductRepositoryInterface $productRepository
     ) {
-        parent::__construct($serviceFactory, $dataProcessor, $dataMerger);
+        parent::__construct($serviceFactory, $dataProcessor, $dataMerger, $productRepository);
         $this->productRepository = $productRepository;
     }
 
@@ -102,18 +103,12 @@ private function prepareLinksData(array $data): array
                 $linkData = $link instanceof DataObject ? $link->toArray() : $link;
                 $product = $this->productRepository->get($linkData['sku']);
             }
-
+            if (isset($link['type']) && $link['type'] !== $defaultLinkData['type']) {
+                unset($defaultLinkData['qty']);
+            }
+            $linkData['sku'] = $product->getSku();
             $linkData += $defaultLinkData;
-            $links[] = [
-                'sku' => $data['sku'],
-                'link_type' => 'associated',
-                'linked_product_sku' => $product->getSku(),
-                'linked_product_type' =>  $product->getTypeId(),
-                'position' => $linkData['position'],
-                'extension_attributes' => [
-                    'qty' => $linkData['qty']
-                ],
-            ];
+            $links[] = $linkData;
             $position++;
         }