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

Author: Anna Bukatar

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

@@ -6,6 +6,7 @@
 namespace Magento\Bundle\Model\ResourceModel\Selection\Collection;
 
 use Magento\Bundle\Model\ResourceModel\Selection\Collection;
+use Zend_Db_Select_Exception;
 
 /**
  * An applier of additional filters to a selection collection.
@@ -32,16 +33,17 @@ class FilterApplier
      * @param string $conditionType
      *
      * @return void
+     * @throws Zend_Db_Select_Exception
      */
-    public function apply(Collection $collection, $field, $value, $conditionType = 'eq')
+    public function apply(Collection $collection, string $field, $value, string $conditionType = 'eq')
     {
         foreach ($collection->getSelect()->getPart('from') as $tableAlias => $data) {
             if ($data['tableName'] == $collection->getTable('catalog_product_bundle_selection')) {
                 $field = $tableAlias . '.' . $field;
             }
         }
 
-        $collection->getSelect()
+        $collection->getSelect()->distinct(true)
             ->where($field . $this->conditionTypesMap[$conditionType], $value);
     }
 }

app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/Selection/Collection/FilterApplierTest.php

@@ -7,9 +7,11 @@
 
 namespace Magento\Bundle\Test\Unit\Model\ResourceModel\Selection\Collection;
 
+use Magento\Bundle\Model\ResourceModel\Selection\Collection;
 use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier;
 use Magento\Framework\DB\Select;
 use PHPUnit\Framework\TestCase;
+use Zend_Db_Select_Exception;
 
 /**
  * Test selection collection filter applier
@@ -37,12 +39,13 @@ protected function setUp(): void
      * @param $expectedCondition
      * @param $expectedValue
      * @dataProvider applyDataProvider
+     * @throws Zend_Db_Select_Exception
      */
     public function testApply($field, $value, $conditionType, $expectedCondition, $expectedValue): void
     {
         $tableName = 'catalog_product_bundle_selection';
         $select = $this->createMock(Select::class);
-        $collection = $this->createMock(\Magento\Bundle\Model\ResourceModel\Selection\Collection::class);
+        $collection = $this->createMock(Collection::class);
         $collection->method('getSelect')
             ->willReturn($select);
         $collection->method('getTable')
@@ -60,6 +63,10 @@ public function testApply($field, $value, $conditionType, $expectedCondition, $e
                     ]
                 ]
             );
+        $select->expects($this->once())
+            ->method('distinct')
+            ->with(true)
+            ->willReturnSelf();
         $select->expects($this->once())
             ->method('where')
             ->with($expectedCondition, $expectedValue);