Magento2/ISSUE#16425: Fixed "OR Condition in searchCriteria (REST API) dosn't work"

Author: andrewbess

app/code/Magento/Eav/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php

@@ -64,20 +64,55 @@ private function addFilterGroupToCollection(
         AbstractDb $collection
     ) {
         $fields = [];
+        $customFilters = [];
         foreach ($filterGroup->getFilters() as $filter) {
             $isApplied = false;
+            $applyLater = false;
             $customFilter = $this->getCustomFilterForField($filter->getField());
             if ($customFilter) {
-                $isApplied = $customFilter->apply($filter, $collection);
+                if ($filter->getConditionType() == 'eq') {
+                    $customFilters = array_map(
+                        function ($customFilter) {
+                            if (count($values = $customFilter['values']) > 1) {
+                                $filter = reset($customFilter['filter']);
+                                $filter->setValue(implode(',', $values));
+                                $filter->setConditionType('in');
+                                $customFilter['filter'] = $filter;
+                            }
+
+                            return $customFilter;
+                        },
+                        array_merge_recursive(
+                            $customFilters,
+                            [$filter->getField() => [
+                                'filter' => [clone $filter],
+                                'values' => [$filter->getValue()]
+                            ]]
+                        )
+                    );
+
+                    $applyLater = true;
+                }
+
+                if (!$applyLater) {
+                    $isApplied = $customFilter->apply($filter, $collection);
+                }
             }
 
-            if (!$isApplied) {
+            if (!$isApplied && !$applyLater) {
                 $field = $this->getFieldMapping($filter->getField());
                 $condition = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
                 $fields[] = ['attribute' => $field, $condition => $filter->getValue()];
             }
         }
 
+        if ($applyLater && count($customFilters)) {
+            foreach ($customFilters as $field => $filter) {
+                $customFilter = $this->getCustomFilterForField($field);
+                $customFilter->apply($filter['filter'], $collection);
+            }
+        }
+
         if ($fields) {
             $collection->addFieldToFilter($fields);
         }

app/code/Magento/Eav/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessorTest.php

@@ -5,14 +5,18 @@
  */
 namespace Magento\Eav\Test\Unit\Model\Api\SearchCriteria\CollectionProcessor;
 
+use InvalidArgumentException;
 use Magento\Eav\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor;
 use Magento\Framework\Api\Filter;
 use Magento\Framework\Api\Search\FilterGroup;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Data\Collection\AbstractDb;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use stdClass;
 
-class FilterProcessorTest extends \PHPUnit\Framework\TestCase
+class FilterProcessorTest extends TestCase
 {
     /**
      * Return model
@@ -31,8 +35,11 @@ private function getModel(array $customFilters, array $fieldMapping)
      */
     public function testProcess()
     {
-        /** @var CustomFilterInterface|\PHPUnit_Framework_MockObject_MockObject $customFilterMock */
-        $customFilterMock = $this->createPartialMock(CustomFilterInterface::class, ['apply']);
+        /** @var CustomFilterInterface|MockObject $customFilterMock */
+        $customFilterMock = $this->createPartialMock(
+            CustomFilterInterface::class,
+            ['apply']
+        );
 
         $customFilterField = 'customFilterField';
         $customFilters = [$customFilterField => $customFilterMock];
@@ -62,25 +69,25 @@ public function testProcess()
 
         $model = $this->getModel($customFilters, $fieldMapping);
 
-        /** @var FilterGroup|\PHPUnit_Framework_MockObject_MockObject $filterGroupOneMock */
+        /** @var FilterGroup|MockObject $filterGroupOneMock */
         $filterGroupOneMock = $this->getMockBuilder(FilterGroup::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        /** @var FilterGroup|\PHPUnit_Framework_MockObject_MockObject $filterGroupTwoMock */
+        /** @var FilterGroup|MockObject $filterGroupTwoMock */
         $filterGroupTwoMock = $this->getMockBuilder(FilterGroup::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        /** @var Filter|\PHPUnit_Framework_MockObject_MockObject $filterOneMock */
+        /** @var Filter|MockObject $filterOneMock */
         $filterOneMock = $this->getMockBuilder(Filter::class)
             ->disableOriginalConstructor()
             ->getMock();
         $filterOneMock->expects($this->once())
             ->method('getField')
             ->willReturn($customFilterField);
 
-        /** @var Filter|\PHPUnit_Framework_MockObject_MockObject $filterTwoMock */
+        /** @var Filter|MockObject $filterTwoMock */
         $filterTwoMock = $this->getMockBuilder(Filter::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -94,7 +101,7 @@ public function testProcess()
             ->method('getConditionType')
             ->willReturn($otherFilterFieldCondition);
 
-        /** @var Filter|\PHPUnit_Framework_MockObject_MockObject $filterThreeMock */
+        /** @var Filter|MockObject $filterThreeMock */
         $filterThreeMock = $this->getMockBuilder(Filter::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -116,15 +123,15 @@ public function testProcess()
             ->method('getFilters')
             ->willReturn([$filterThreeMock]);
 
-        /** @var SearchCriteriaInterface|\PHPUnit_Framework_MockObject_MockObject $searchCriteriaMock */
+        /** @var SearchCriteriaInterface|MockObject $searchCriteriaMock */
         $searchCriteriaMock = $this->getMockBuilder(SearchCriteriaInterface::class)
             ->getMock();
 
         $searchCriteriaMock->expects($this->once())
             ->method('getFilterGroups')
             ->willReturn([$filterGroupOneMock, $filterGroupTwoMock]);
 
-        /** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $searchCriteriarMock */
+        /** @var AbstractDb|MockObject $searchCriteriarMock */
         $collectionMock = $this->getMockBuilder(AbstractDb::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -144,25 +151,24 @@ public function testProcess()
         $model->process($searchCriteriaMock, $collectionMock);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testProcessWithException()
     {
-        /** @var \stdClass|\PHPUnit_Framework_MockObject_MockObject $customFilterMock */
-        $customFilterMock = $this->createPartialMock(\stdClass::class, ['apply']);
+        $this->expectException(InvalidArgumentException::class);
+
+        /** @var stdClass|MockObject $customFilterMock */
+        $customFilterMock = $this->createPartialMock(stdClass::class, ['apply']);
 
         $customFilterField = 'customFilterField';
         $customFilters = [$customFilterField => $customFilterMock];
 
         $model = $this->getModel($customFilters, []);
 
-        /** @var FilterGroup|\PHPUnit_Framework_MockObject_MockObject $filterGroupOneMock */
+        /** @var FilterGroup|MockObject $filterGroupOneMock */
         $filterGroupOneMock = $this->getMockBuilder(FilterGroup::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        /** @var Filter|\PHPUnit_Framework_MockObject_MockObject $filterOneMock */
+        /** @var Filter|MockObject $filterOneMock */
         $filterOneMock = $this->getMockBuilder(Filter::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -174,15 +180,15 @@ public function testProcessWithException()
             ->method('getFilters')
             ->willReturn([$filterOneMock]);
 
-        /** @var SearchCriteriaInterface|\PHPUnit_Framework_MockObject_MockObject $searchCriteriaMock */
+        /** @var SearchCriteriaInterface|MockObject $searchCriteriaMock */
         $searchCriteriaMock = $this->getMockBuilder(SearchCriteriaInterface::class)
             ->getMock();
 
         $searchCriteriaMock->expects($this->once())
             ->method('getFilterGroups')
             ->willReturn([$filterGroupOneMock]);
 
-        /** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $searchCriteriarMock */
+        /** @var AbstractDb|MockObject $searchCriteriarMock */
         $collectionMock = $this->getMockBuilder(AbstractDb::class)
             ->disableOriginalConstructor()
             ->getMock();