MAGETWO-82487: FIX #11022 in 2.1-develop: Filter Groups of search criteria parameter have not been included for further processing #11432

 - Merge Pull Request #11432 from davidverholen/magento2:squashtoberfest-11022-2.1
 - Merged commits:
   1. 93a0e57
   2. 051f95d
   3. 525f90a
   4. 6862394
   5. a3f3090
   6. 2a3ac2d
   7. e9339ca

Author: dmanners

app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php

@@ -62,6 +62,7 @@ public function save(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet)
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
+        $this->searchCriteriaBuilder->setFilterGroups((array)$searchCriteria->getFilterGroups());
         $this->searchCriteriaBuilder->addFilters(
             [
                 $this->filterBuilder
@@ -71,9 +72,15 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
                     ->create(),
             ]
         );
+
+        $this->searchCriteriaBuilder->setSortOrders((array)$searchCriteria->getSortOrders());
         $this->searchCriteriaBuilder->setCurrentPage($searchCriteria->getCurrentPage());
         $this->searchCriteriaBuilder->setPageSize($searchCriteria->getPageSize());
-        return $this->attributeSetRepository->getList($this->searchCriteriaBuilder->create());
+
+        $searchResult = $this->attributeSetRepository->getList($this->searchCriteriaBuilder->create());
+        $searchResult->setSearchCriteria($searchCriteria);
+
+        return $searchResult;
     }
 
     /**

app/code/Magento/Eav/Model/AttributeSetRepository.php

@@ -105,6 +105,10 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
             $collection->setEntityTypeFilter($this->eavConfig->getEntityType($entityTypeCode)->getId());
         }
 
+        foreach ($searchCriteria->getFilterGroups() as $group) {
+            $this->addFilterGroupToCollection($group, $collection);
+        }
+
         $collection->setCurPage($searchCriteria->getCurrentPage());
         $collection->setPageSize($searchCriteria->getPageSize());
 
@@ -115,6 +119,29 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         return $searchResults;
     }
 
+    /**
+     * Helper function that adds a FilterGroup to the collection.
+     *
+     * @deprecated already removed in 2.2-develop. Use CollectionProcessorInterface to process search criteria
+     *
+     * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
+     * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection $collection
+     * @return void
+     */
+    private function addFilterGroupToCollection(
+        \Magento\Framework\Api\Search\FilterGroup $filterGroup,
+        \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection $collection
+    ) {
+        foreach ($filterGroup->getFilters() as $filter) {
+            /** entity type filter is already set on collection */
+            if ($filter->getField() === 'entity_type_code') {
+                continue;
+            }
+            $conditionType = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
+            $collection->addFieldToFilter($filter->getField(), [$conditionType, $filter->getValue()]);
+        }
+    }
+
     /**
      * Retrieve entity type code from search criteria
      *

app/code/Magento/Eav/Test/Unit/Model/AttributeSetRepositoryTest.php

@@ -212,12 +212,12 @@ public function testGetList()
         $searchCriteriaMock = $this->getMock('\Magento\Framework\Api\SearchCriteriaInterface');
 
         $filterGroupMock = $this->getMock('\Magento\Framework\Api\Search\FilterGroup', [], [], '', false);
-        $searchCriteriaMock->expects($this->once())->method('getFilterGroups')->willReturn([$filterGroupMock]);
+        $searchCriteriaMock->expects($this->exactly(2))->method('getFilterGroups')->willReturn([$filterGroupMock]);
 
         $filterMock = $this->getMock('\Magento\Framework\Api\Filter', [], [], '', false);
-        $filterGroupMock->expects($this->once())->method('getFilters')->willReturn([$filterMock]);
+        $filterGroupMock->expects($this->exactly(2))->method('getFilters')->willReturn([$filterMock]);
 
-        $filterMock->expects($this->once())->method('getField')->willReturn('entity_type_code');
+        $filterMock->expects($this->exactly(2))->method('getField')->willReturn('entity_type_code');
         $filterMock->expects($this->once())->method('getValue')->willReturn($entityTypeCode);
 
         $collectionMock = $this->getMock(
@@ -273,7 +273,7 @@ public function testGetList()
     public function testGetListIfEntityTypeCodeIsNull()
     {
         $searchCriteriaMock = $this->getMock('\Magento\Framework\Api\SearchCriteriaInterface');
-        $searchCriteriaMock->expects($this->once())->method('getFilterGroups')->willReturn([]);
+        $searchCriteriaMock->expects($this->exactly(2))->method('getFilterGroups')->willReturn([]);
 
         $collectionMock = $this->getMock(
             '\Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection',

dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetRepositoryTest.php

@@ -165,19 +165,9 @@ public function testGetList()
     {
         $searchCriteria = [
             'searchCriteria' => [
-                'filter_groups' => [
-                    [
-                        'filters' => [
-                            [
-                                'field' => 'entity_type_code',
-                                'value' => 'catalog_product',
-                                'condition_type' => 'eq',
-                            ],
-                        ],
-                    ],
-                ],
+                'filter_groups' => [],
                 'current_page' => 1,
-                'page_size' => 2,
+                'page_size' => 2
             ],
         ];