Merge remote-tracking branch 'github-magento2ce/MAGETWO-91694' into EPAM-PR-12

Author: nikshostko

app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php

@@ -8,7 +8,12 @@
 namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
 
 use Magento\Framework\App\ResourceConnection;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Store\Model\Store;
 
+/**
+ * Flat item eraser. Used to clear items from the catalog flat table.
+ */
 class Eraser
 {
     /**
@@ -50,12 +55,7 @@ public function __construct(
      */
     public function removeDeletedProducts(array &$ids, $storeId)
     {
-        $select = $this->connection->select()->from(
-            $this->productIndexerHelper->getTable('catalog_product_entity')
-        )->where(
-            'entity_id IN(?)',
-            $ids
-        );
+        $select = $this->getSelectForProducts($ids);
         $result = $this->connection->query($select);
 
         $existentProducts = [];
@@ -69,6 +69,61 @@ public function removeDeletedProducts(array &$ids, $storeId)
         $this->deleteProductsFromStore($productsToDelete, $storeId);
     }
 
+    /**
+     * Remove products with "Disabled" status from the flat table(s).
+     *
+     * @param array $ids
+     * @param int $storeId
+     * @return void
+     */
+    public function removeDisabledProducts(array &$ids, $storeId)
+    {
+        /* @var $statusAttribute \Magento\Eav\Model\Entity\Attribute */
+        $statusAttribute = $this->productIndexerHelper->getAttribute('status');
+
+        $select = $this->getSelectForProducts($ids);
+        $select->joinLeft(
+            ['status_global_attr' => $statusAttribute->getBackendTable()],
+            ' status_global_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
+            . ' AND status_global_attr.store_id = ' . Store::DEFAULT_STORE_ID,
+            []
+        );
+        $select->joinLeft(
+            ['status_attr' => $statusAttribute->getBackendTable()],
+            ' status_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
+            . ' AND status_attr.store_id = ' . $storeId,
+            []
+        );
+        $select->where('IFNULL(status_attr.value, status_global_attr.value) = ?', Status::STATUS_DISABLED);
+
+        $result = $this->connection->query($select);
+
+        $disabledProducts = [];
+        foreach ($result->fetchAll() as $product) {
+            $disabledProducts[] = $product['entity_id'];
+        }
+
+        if (!empty($disabledProducts)) {
+            $ids = array_diff($ids, $disabledProducts);
+            $this->deleteProductsFromStore($disabledProducts, $storeId);
+        }
+    }
+
+    /**
+     * Get Select object for existed products.
+     *
+     * @param array $ids
+     * @return \Magento\Framework\DB\Select
+     */
+    private function getSelectForProducts(array $ids)
+    {
+        $productTable = $this->productIndexerHelper->getTable('catalog_product_entity');
+        $select = $this->connection->select()->from($productTable)
+            ->columns('entity_id')
+            ->where('entity_id IN(?)', $ids);
+        return $select;
+    }
+
     /**
      * Delete products from flat table(s)
      *

app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php

@@ -75,6 +75,7 @@ public function execute($id = null)
             $tableExists = $this->_isFlatTableExists($store->getId());
             if ($tableExists) {
                 $this->flatItemEraser->removeDeletedProducts($ids, $store->getId());
+                $this->flatItemEraser->removeDisabledProducts($ids, $store->getId());
             }
 
             /* @var $status \Magento\Eav\Model\Entity\Attribute */

app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/EraserTest.php

@@ -54,6 +54,7 @@ public function testRemoveDeletedProducts()
         $productsToDeleteIds = [1, 2];
         $select = $this->createMock(\Magento\Framework\DB\Select::class);
         $select->expects($this->once())->method('from')->with('catalog_product_entity')->will($this->returnSelf());
+        $select->expects($this->once())->method('columns')->with('entity_id')->will($this->returnSelf());
         $select->expects($this->once())->method('where')->with('entity_id IN(?)', $productsToDeleteIds)
             ->will($this->returnSelf());
         $products = [['entity_id' => 2]];