MAGETWO-89246: Fix out of stock filter for products resolution

- revert commit

Author: cpartica

app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php

@@ -31,11 +31,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      */
     private $productIds = [];
 
-    /**
-     * @var bool
-     */
-    private $hasProductJoin = false;
-
     /**
      * Init model and resource model
      *
@@ -54,7 +49,6 @@ protected function _construct()
      */
     public function joinValues($storeId)
     {
-        $this->joinProductEntityTable();
         $this->getSelect()->joinLeft(
             ['option_value_default' => $this->getTable('catalog_product_bundle_option_value')],
             implode(
@@ -107,48 +101,17 @@ public function setProductIdFilter($productId)
     {
         $this->productIds[] = $productId;
 
-        return $this;
-    }
-
-    private function joinProductEntityTable()
-    {
-        if ($this->hasProductJoin || empty($this->productIds)) {
-            return;
-        }
-
-        if (count($this->productIds) === 1) {
-            $comparedField = reset($this->productIds);
-            $whereClause = "cpe.entity_id = ?";
-        } else {
-            $comparedField = $this->productIds;
-            $whereClause = "cpe.entity_id IN (?)";
-        }
-
         $productTable = $this->getTable('catalog_product_entity');
         $linkField = $this->getConnection()->getAutoIncrementField($productTable);
         $this->getSelect()->join(
             ['cpe' => $productTable],
             'cpe.'.$linkField.' = main_table.parent_id',
             []
         )->where(
-            $whereClause,
-            $comparedField
+            "cpe.entity_id = (?)",
+            $this->productIds
         );
 
-        $this->hasProductJoin = true;
-    }
-
-    /**
-     * Add base select based off product id buffer.
-     *
-     * @return $this
-     */
-    protected function _beforeLoad()
-    {
-        $this->joinProductEntityTable();
-
-        parent::_beforeLoad();
-
         return $this;
     }
 
@@ -160,7 +123,6 @@ protected function _beforeLoad()
     protected function _afterLoad()
     {
         $this->productIds = [];
-        $this->hasProductJoin = false;
 
         return parent::_afterLoad();
     }

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php

@@ -8,11 +8,14 @@
 namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
 
 use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ResourceModel\CategoryProduct;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory;
 use Magento\Framework\Api\SearchResultsInterface;
-use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
 
 /**
  * Product field data provider, used for GraphQL resolver processing.
@@ -25,36 +28,73 @@ class Product
     private $collectionFactory;
 
     /**
-     * @var ProductSearchResultsInterfaceFactory
+     * @var JoinProcessorInterface
      */
-    private $searchResultsFactory;
+    private $joinProcessor;
 
     /**
      * @var CollectionProcessorInterface
      */
     private $collectionProcessor;
 
+    /**
+     * @var ProductSearchResultsInterfaceFactory
+     */
+    private $searchResultsFactory;
+
+    /**
+     * @var CategoryProduct
+     */
+    private $categoryProduct;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var \Magento\Catalog\Model\Layer\Resolver
+     */
+    private $layerResolver;
+
+    /**
+     * @var \Magento\Catalog\Model\ProductRepository
+     */
+    private $productRepository;
+
     /**
      * @var Visibility
      */
     private $visibility;
 
     /**
      * @param CollectionFactory $collectionFactory
-     * @param ProductSearchResultsInterfaceFactory $searchResultsFactory
-     * @param Visibility $visibility
+     * @param JoinProcessorInterface $joinProcessor
      * @param CollectionProcessorInterface $collectionProcessor
+     * @param ProductSearchResultsInterfaceFactory $searchResultsFactory
+     * @param CategoryProduct $categoryProduct
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
      */
     public function __construct(
         CollectionFactory $collectionFactory,
+        JoinProcessorInterface $joinProcessor,
+        CollectionProcessorInterface $collectionProcessor,
         ProductSearchResultsInterfaceFactory $searchResultsFactory,
-        Visibility $visibility,
-        CollectionProcessorInterface $collectionProcessor
+        CategoryProduct $categoryProduct,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        \Magento\Catalog\Model\Layer\Resolver $layerResolver,
+        \Magento\Catalog\Model\ProductRepository $productRepository,
+        Visibility $visibility
     ) {
         $this->collectionFactory = $collectionFactory;
+        $this->joinProcessor = $joinProcessor;
+        $this->collectionProcessor = $collectionProcessor;
         $this->searchResultsFactory = $searchResultsFactory;
+        $this->categoryProduct = $categoryProduct;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->visibility = $visibility;
-        $this->collectionProcessor = $collectionProcessor;
+        $this->layerResolver = $layerResolver;
+        $this->productRepository = $productRepository;
     }
 
     /**
@@ -74,17 +114,29 @@ public function getList(
     ): SearchResultsInterface {
         /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
         $collection = $this->collectionFactory->create();
+        $this->joinProcessor->process($collection);
 
-        $this->collectionProcessor->process($collection, $searchCriteria, $attributes);
+        foreach ($attributes as $attributeCode) {
+            $collection->addAttributeToSelect($attributeCode);
+        }
+        $collection->addAttributeToSelect('special_price');
+        $collection->addAttributeToSelect('special_price_from');
+        $collection->addAttributeToSelect('special_price_to');
+        $collection->addAttributeToSelect('tax_class_id');
+        $collection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
+        $collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
 
         if (!$isChildSearch) {
             $visibilityIds
                 = $isSearch ? $this->visibility->getVisibleInSearchIds() : $this->visibility->getVisibleInCatalogIds();
             $collection->setVisibility($visibilityIds);
         }
+
+        $this->collectionProcessor->process($searchCriteria, $collection);
+        $collection->addWebsiteNamesToResult();
         $collection->load();
 
-        // Methods that perform extra fetches post-load
+        // Methods that perform extra fetches
         $collection->addCategoryIds();
         $collection->addMediaGalleryData();
         $collection->addOptionsToResult();