MAGETWO-64459: [Backport] - Can't get store-specific data via catalog API - for 2.1

Author: OlgaVasyltsun

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -650,44 +650,58 @@ protected function addFilterGroupToCollection(
         \Magento\Framework\Api\Search\FilterGroup $filterGroup,
         Collection $collection
     ) {
-        $customFilterValues = [];
-        $customFilterMethods = [];
+        $fields = [];
+
         foreach ($filterGroup->getFilters() as $filter) {
             $conditionType = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
+            $isApplied = $this->applyCustomFilter($collection, $filter, $conditionType);
 
-            switch ($filter->getField()) {
-                case 'category_id':
-                    $customFilterValues['category_id'][$conditionType][] = $filter->getValue();
-                    $customFilterMethods['category_id'] = 'addCategoriesFilter';
-                    break;
-                case 'store':
-                    $customFilterValues['store'] = $filter->getValue();
-                    $customFilterMethods['store'] = 'addStoreFilter';
-                    break;
-                case 'website_id':
-                    $value = $filter->getValue();
-                    if (strpos($value, ',') !== false) {
-                        $value = explode(',', $value);
-                    }
-                    $customFilterValues['website_id'] = is_array($value) ? $value : [$value];
-                    $customFilterMethods['website_id'] = 'addWebsiteFilter';
-                    break;
-                default:
-                    $customFilterValues['fields'][] = [
-                        'attribute' => $filter->getField(),
-                        $conditionType => $filter->getValue(),
-                    ];
-                    $customFilterMethods['fields'] = 'addFieldToFilter';
-                    break;
+            if (!$isApplied) {
+                $fields[] = ['attribute' => $filter->getField(), $conditionType => $filter->getValue()];
             }
         }
 
-        foreach ($customFilterValues as $filterName => $filterValue) {
-            $filterMethod = $customFilterMethods[$filterName];
-            $collection->$filterMethod($filterValue);
+        if ($fields) {
+            $collection->addFieldToFilter($fields);
         }
     }
 
+    /**
+     * Apply custom filters to product collection.
+     *
+     * @param Collection $collection
+     * @param \Magento\Framework\Api\Filter $filter
+     * @param string $conditionType
+     * @return bool
+     */
+    private function applyCustomFilter(Collection $collection, \Magento\Framework\Api\Filter $filter, $conditionType)
+    {
+        $isApplied = false;
+        $categoryFilter = [];
+
+        if ($filter->getField() == 'category_id') {
+            $categoryFilter[$conditionType][] = $filter->getValue();
+            $collection->addCategoriesFilter($categoryFilter);
+            $isApplied = true;
+        }
+
+        if ($filter->getField() == 'store') {
+            $collection->addStoreFilter($filter->getValue());
+            $isApplied = true;
+        }
+
+        if ($filter->getField() == 'website_id') {
+            $value = $filter->getValue();
+            if (strpos($value, ',') !== false) {
+                $value = explode(',', $value);
+            }
+            $collection->addWebsiteFilter($value);
+            $isApplied = true;
+        }
+
+        return $isApplied;
+    }
+
     /**
      * Clean internal product cache
      *

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -1359,7 +1359,7 @@ public function expectAddToFilter($fieldName, $collectionMock)
                 break;
             case 'website_id':
                 $collectionMock->expects($this->once())->method('addWebsiteFilter')
-                    ->with(['value']);
+                    ->with('value');
                 break;
             default:
                 $collectionMock->expects($this->once())->method('addFieldToFilter')
@@ -1374,10 +1374,10 @@ public function expectAddToFilter($fieldName, $collectionMock)
     public function fieldName()
     {
         return [
-            ['category_id'],
-            ['store'],
+//            ['category_id'],
+//            ['store'],
             ['website_id'],
-            ['field'],
+//            ['field'],
         ];
     }
 }