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

Author: OlgaVasyltsun

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

@@ -676,18 +676,15 @@ protected function addFilterGroupToCollection(
      */
     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;
+            return true;
         }
 
         if ($filter->getField() == 'store') {
             $collection->addStoreFilter($filter->getValue());
-            $isApplied = true;
+            return true;
         }
 
         if ($filter->getField() == 'website_id') {
@@ -696,10 +693,10 @@ private function applyCustomFilter(Collection $collection, \Magento\Framework\Ap
                 $value = explode(',', $value);
             }
             $collection->addWebsiteFilter($value);
-            $isApplied = true;
+            return true;
         }
 
-        return $isApplied;
+        return false;
     }
 
     /**

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

@@ -1374,10 +1374,10 @@ public function expectAddToFilter($fieldName, $collectionMock)
     public function fieldName()
     {
         return [
-//            ['category_id'],
-//            ['store'],
+            ['category_id'],
+            ['store'],
             ['website_id'],
-//            ['field'],
+            ['field'],
         ];
     }
 }