Merge remote-tracking branch 'origin/MAGETWO-74766' into 2.2-develop-pr30

Author: zakdma

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

@@ -530,19 +530,6 @@ public function getStoreId()
         return $this->_storeManager->getStore()->getId();
     }
 
-    /**
-     * Get collection instance
-     *
-     * @return object
-     * @deprecated 101.1.0 because collections should be used directly via factory
-     */
-    public function getResourceCollection()
-    {
-        $collection = parent::getResourceCollection();
-        $collection->setStoreId($this->getStoreId());
-        return $collection;
-    }
-
     /**
      * Get product url model
      *

app/code/Magento/Catalog/etc/di.xml

@@ -859,6 +859,7 @@
             <argument name="customFilters" xsi:type="array">
                 <item name="category_id" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductCategoryFilter</item>
                 <item name="store" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductStoreFilter</item>
+                <item name="store_id" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductStoreFilter</item>
                 <item name="website_id" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductWebsiteFilter</item>
             </argument>
         </arguments>

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php

@@ -30,6 +30,11 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
      */
     private $productResource;
 
+    /**
+     * @var \Magento\Framework\Api\SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
     /**
      * @inheritdoc
      */
@@ -39,6 +44,8 @@ protected function setUp()
             ->get(ProductRepositoryInterface::class);
         $this->productResource = Bootstrap::getObjectManager()
             ->get(ProductResource::class);
+        $this->searchCriteriaBuilder = Bootstrap::getObjectManager()
+            ->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
     }
 
     /**
@@ -174,4 +181,21 @@ public function skuDataProvider(): array
             ['sku' => 'simple ']
         ];
     }
+
+    /**
+     * Checks filtering by store_id.
+     *
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/product_simple.php
+     * @return void
+     */
+    public function testFilterByStoreId()
+    {
+        $searchCriteria = $this->searchCriteriaBuilder
+            ->addFilter('store_id', '1', 'eq')
+            ->create();
+        $list = $this->productRepository->getList($searchCriteria);
+        $count = $list->getTotalCount();
+
+        $this->assertGreaterThanOrEqual(1, $count);
+    }
 }