ACP2E-779: Configurable products can be associated with the grouped products during product import

Author: Anna Bukatar

app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Import entity of grouped product type
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -12,12 +10,15 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\ImportExport\Model\Import;
 
+/**
+ * Import entity of grouped product type
+ */
 class Grouped extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
 {
     /**
      * Default delimiter for sku and qty.
      */
-    const SKU_QTY_DELIMITER = '=';
+    public const SKU_QTY_DELIMITER = '=';
 
     /**
      * Column names that holds values with particular meaning.
@@ -42,8 +43,6 @@ class Grouped extends \Magento\CatalogImportExport\Model\Import\Product\Type\Abs
     private $allowedProductTypes;
 
     /**
-     * Product entity identifier field
-     *
      * @var string
      */
     private $productEntityIdentifierField;
@@ -111,7 +110,7 @@ public function saveData()
                     ) {
                         $linkedProductId = $newSku[$associatedSku][$this->getProductEntityIdentifierField()];
                     } elseif (isset($oldSku[$associatedSku]) &&
-                        in_array($newSku[$associatedSku]['type_id'], $this->allowedProductTypes)
+                        in_array($oldSku[$associatedSku]['type_id'], $this->allowedProductTypes)
                     ) {
                         $linkedProductId = $oldSku[$associatedSku][$this->getProductEntityIdentifierField()];
                     } else {

app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/GroupedTest.php

@@ -20,6 +20,7 @@
 use Magento\GroupedImportExport;
 use Magento\GroupedImportExport\Model\Import\Product\Type\Grouped;
 use Magento\GroupedImportExport\Model\Import\Product\Type\Grouped\Links;
+use Magento\Catalog\Model\ProductTypes\ConfigInterface;
 use Magento\ImportExport\Test\Unit\Model\Import\AbstractImportTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 
@@ -73,6 +74,11 @@ class GroupedTest extends AbstractImportTestCase
      */
     protected $links;
 
+    /**
+     * @var ConfigInterface|MockObject
+     */
+    private $configMock;
+
     /**
      * @var Product|MockObject
      */
@@ -117,6 +123,10 @@ protected function setUp(): void
             1 => 'grouped'
         ];
         $this->links = $this->createMock(Links::class);
+        $this->configMock = $this->getMockForAbstractClass(ConfigInterface::class);
+        $this->configMock->expects($this->once())
+            ->method('getComposableTypes')
+            ->willReturn(['simple', 'virtual', 'downloadable']);
         $entityAttributes = [
             [
                 'attribute_set_name' => 'attribute_id',
@@ -156,7 +166,8 @@ protected function setUp(): void
                 'prodAttrColFac' => $this->attrCollectionFactory,
                 'resource' => $this->resource,
                 'params' => $this->params,
-                'links' => $this->links
+                'links' => $this->links,
+                'config' => $this->configMock
             ]
         );
         $metadataPoolMock = $this->createMock(MetadataPool::class);
@@ -214,10 +225,10 @@ public function saveDataProvider(): array
             [
                 'skus' => [
                     'newSku' => [
-                        'sku_assoc1' => ['entity_id' => 1],
+                        'sku_assoc1' => ['entity_id' => 1, 'type_id' => 'simple'],
                         'productsku' => ['entity_id' => 3, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
                     ],
-                    'oldSku' => ['sku_assoc2' => ['entity_id' => 2]]
+                    'oldSku' => ['sku_assoc2' => ['entity_id' => 2, 'type_id' => 'simple']]
                 ],
                 'bunch' => [
                     'associated_skus' => 'sku_assoc1=1, sku_assoc2=2',
@@ -249,7 +260,7 @@ public function saveDataProvider(): array
             [
                 'skus' => [
                     'newSku' => [
-                        'sku_assoc1' => ['entity_id' => 1],
+                        'sku_assoc1' => ['entity_id' => 1, 'type_id' => 'simple'],
                         'productsku' => ['entity_id' => 3, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
                     ],
                     'oldSku' => []
@@ -272,13 +283,13 @@ public function testSaveDataScopeStore(): void
     {
         $this->entityModel->expects($this->once())->method('getNewSku')->willReturn(
             [
-                'sku_assoc1' => ['entity_id' => 1],
+                'sku_assoc1' => ['entity_id' => 1, 'type_id' => 'simple'],
                 'productsku' => ['entity_id' => 2, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
             ]
         );
         $this->entityModel->expects($this->once())->method('getOldSku')->willReturn(
             [
-                'sku_assoc2' => ['entity_id' => 3]
+                'sku_assoc2' => ['entity_id' => 3, 'type_id' => 'simple']
             ]
         );
         $attributes = ['position' => ['id' => 0], 'qty' => ['id' => 0]];
@@ -302,4 +313,48 @@ public function testSaveDataScopeStore(): void
         $this->links->expects($this->once())->method('saveLinksData');
         $this->grouped->saveData();
     }
+
+    /**
+     * Test saveData() with composite product associated with a grouped product
+     *
+     * @return void
+     */
+    public function testSaveDataAssociatedComposite(): void
+    {
+        $this->entityModel->expects($this->once())->method('getNewSku')->willReturn(
+            [
+                'sku_assoc1' => ['entity_id' => 1, 'type_id' => 'configurable'],
+                'productsku' => ['entity_id' => 2, 'attr_set_code' => 'Default', 'type_id' => 'grouped']
+            ]
+        );
+        $this->entityModel->expects($this->once())->method('getOldSku')->willReturn([]);
+        $attributes = ['position' => ['id' => 0], 'qty' => ['id' => 0]];
+        $this->links->expects($this->once())->method('getAttributes')->willReturn($attributes);
+
+        $bunch = [
+            [
+                'associated_skus' => 'sku_assoc1=1',
+                'sku' => 'productsku',
+                'product_type' => 'grouped'
+            ]
+        ];
+
+        $this->entityModel->expects($this->any())->method('isRowAllowedToImport')->willReturn(true);
+        $this->entityModel
+            ->method('getNextBunch')
+            ->willReturnOnConsecutiveCalls($bunch);
+        $this->entityModel
+            ->method('getRowScope')
+            ->willReturnOnConsecutiveCalls(Product::SCOPE_DEFAULT, Product::SCOPE_STORE);
+
+        $expectedLinkData = [
+            'product_ids' => [],
+            'attr_product_ids' => [],
+            'position' => [],
+            'qty' => [],
+            'relation' => []
+        ];
+        $this->links->expects($this->once())->method('saveLinksData')->with($expectedLinkData);
+        $this->grouped->saveData();
+    }
 }