MAGETWO-56012: SearchCriteria Unified Processing

Author: Sergii Kovalenko

lib/internal/Magento/Framework/Api/Search/SearchCriteriaBuilder.php

@@ -25,6 +25,11 @@ class SearchCriteriaBuilder extends AbstractSimpleObjectBuilder
      */
     protected $filterGroupBuilder;
 
+    /**
+     * @var array
+     */
+    private $filters = [];
+
     /**
      * @param ObjectFactory $objectFactory
      * @param FilterGroupBuilder $filterGroupBuilder
@@ -47,7 +52,11 @@ public function __construct(
      */
     public function create()
     {
-        $this->data[SearchCriteria::FILTER_GROUPS] = [$this->filterGroupBuilder->create()];
+        foreach ($this->filters as $filter) {
+            $this->data[SearchCriteria::FILTER_GROUPS][] = $this->filterGroupBuilder->setFilters([])
+                ->addFilter($filter)
+                ->create();
+        }
         $this->data[SearchCriteria::SORT_ORDERS] = [$this->sortOrderBuilder->create()];
         return parent::create();
     }
@@ -60,7 +69,7 @@ public function create()
      */
     public function addFilter(\Magento\Framework\Api\Filter $filter)
     {
-        $this->filterGroupBuilder->addFilter($filter);
+        $this->filters[] = $filter;
         return $this;
     }