Merge branch 'ACP2E-1345' of https://github.com/magento-l3/magento2ce into PR01262023

Author: chittima

app/code/Magento/Bundle/Model/ResourceModel/Selection.php

@@ -5,10 +5,10 @@
  */
 namespace Magento\Bundle\Model\ResourceModel;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 
 /**
@@ -141,7 +141,7 @@ public function getParentIdsByChild($childId)
             ''
         )->join(
             ['e' => $this->metadataPool->getMetadata(ProductInterface::class)->getEntityTable()],
-            'e.' . $metadata->getLinkField() . ' = ' .  $this->getMainTable() . '.parent_product_id',
+            'e.' . $metadata->getLinkField() . ' = ' . $this->getMainTable() . '.parent_product_id',
             ['e.entity_id as parent_product_id']
         )->where(
             $this->getMainTable() . '.product_id IN(?)',
@@ -174,10 +174,11 @@ public function saveSelectionPrice($item)
             $values = [
                 'selection_id' => $item->getSelectionId(),
                 'website_id' => $item->getWebsiteId(),
-                'selection_price_type' => $item->getSelectionPriceType(),
-                'selection_price_value' => $item->getSelectionPriceValue(),
+                'selection_price_type' => $item->getSelectionPriceType() ?? 0,
+                'selection_price_value' => $item->getSelectionPriceValue() ?? 0,
                 'parent_product_id' => $item->getParentProductId(),
             ];
+
             $connection->insertOnDuplicate(
                 $this->getTable('catalog_product_bundle_selection_price'),
                 $values,
@@ -187,7 +188,8 @@ public function saveSelectionPrice($item)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 100.2.0
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)

app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/SelectionTest.php

@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Test\Unit\Model\ResourceModel;
+
+use Codeception\PHPUnit\TestCase;
+use Magento\Bundle\Model\ResourceModel\Selection as ResourceSelection;
+use Magento\Bundle\Model\Selection;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+
+class SelectionTest extends TestCase
+{
+    /**
+     * @var Context|Context&\PHPUnit\Framework\MockObject\MockObject|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private Context $context;
+
+    /**
+     * @var MetadataPool|MetadataPool&\PHPUnit\Framework\MockObject\MockObject|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private MetadataPool $metadataPool;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->context = $this->createMock(Context::class);
+        $this->metadataPool = $this->createMock(MetadataPool::class);
+    }
+
+    public function testSaveSelectionPrice()
+    {
+        $item = $this->getMockBuilder(Selection::class)
+            ->disableOriginalConstructor()
+            ->addMethods([
+                'getSelectionId',
+                'getWebsiteId',
+                'getSelectionPriceType',
+                'getSelectionPriceValue',
+                'getParentProductId',
+                'getDefaultPriceScope'])
+            ->getMock();
+        $values = [
+            'selection_id' => 1,
+            'website_id' => 1,
+            'selection_price_type' => null,
+            'selection_price_value' => null,
+            'parent_product_id' => 1,
+        ];
+        $item->expects($this->once())->method('getDefaultPriceScope')->willReturn(false);
+        $item->expects($this->once())->method('getSelectionId')->willReturn($values['selection_id']);
+        $item->expects($this->once())->method('getWebsiteId')->willReturn($values['website_id']);
+        $item->expects($this->once())->method('getSelectionPriceType')->willReturn($values['selection_price_type']);
+        $item->expects($this->once())->method('getSelectionPriceValue')->willReturn($values['selection_price_value']);
+        $item->expects($this->once())->method('getParentProductId')->willReturn($values['parent_product_id']);
+
+        $connection = $this->createMock(AdapterInterface::class);
+        $connection->expects($this->once())
+            ->method('insertOnDuplicate')
+            ->with(
+                'catalog_product_bundle_selection_price',
+                $this->callback(function ($insertValues) {
+                    return $insertValues['selection_price_type'] === 0 && $insertValues['selection_price_value'] === 0;
+                }),
+                ['selection_price_type', 'selection_price_value']
+            );
+
+        $parentResources = $this->createMock(ResourceConnection::class);
+        $parentResources->expects($this->once())->method('getConnection')->willReturn($connection);
+        $parentResources->expects($this->once())->method('getTableName')
+            ->with('catalog_product_bundle_selection_price', 'test_connection_name')
+            ->willReturn('catalog_product_bundle_selection_price');
+        $this->context->expects($this->once())->method('getResources')->willReturn($parentResources);
+
+        $selection = new ResourceSelection($this->context, $this->metadataPool, 'test_connection_name');
+        $selection->saveSelectionPrice($item);
+    }
+}