MAGETWO-95445: Category Flat Data indexer doesnt show status as reindex required after deleting store/storeview

- Delete abandoned tables in full reindex

Author: nikshostko

app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php

@@ -466,17 +466,6 @@ public function getFlatTableName($storeId)
         return sprintf('%s_%s', $this->getTable('catalog_product_flat'), $storeId);
     }
 
-    /**
-     * Retrieve Catalog Product Flat Table name
-     *
-     * @param int $storeId
-     * @return string
-     */
-    private function getCategoryFlatTableName(int $storeId): string
-    {
-        return sprintf('%s_store_%s', $this->getTable('catalog_category_flat'), $storeId);
-    }
-
     /**
      * Retrieve loaded attribute by code
      *
@@ -526,25 +515,4 @@ public function deleteAbandonedStoreFlatTables()
             $connection->dropTable($table);
         }
     }
-
-    /**
-     * Delete all category flat tables for not existing stores
-     *
-     * @return void
-     */
-    public function deleteAbandonedStoreCategoryFlatTables()
-    {
-        $connection = $this->_resource->getConnection();
-        $existentTables = $connection->getTables($connection->getTableName('catalog_category_flat_store_%'));
-        $actualStoreTables = [];
-        foreach ($this->_storeManager->getStores() as $store) {
-            $actualStoreTables[] = $this->getCategoryFlatTableName($store->getId());
-        }
-
-        $tablesToDelete = array_diff($existentTables, $actualStoreTables);
-
-        foreach ($tablesToDelete as $table) {
-            $connection->dropTable($table);
-        }
-    }
 }

app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Flat\Action;
 
-use Magento\Framework\App\ResourceConnection;
-
 /**
  * Class for full reindex flat categories
  */
@@ -24,28 +22,6 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
      */
     protected $allowTableChanges = true;
 
-    /**
-     * @var \Magento\Catalog\Helper\Product\Flat\Indexer
-     */
-    private $indexer;
-
-    /**
-     * @param ResourceConnection $resource
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-     * @param \Magento\Catalog\Helper\Product\Flat\Indexer $indexer
-     */
-    public function __construct(
-        ResourceConnection $resource,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-        \Magento\Catalog\Helper\Product\Flat\Indexer $indexer = null
-    ) {
-        $this->indexer  = $indexer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Catalog\Helper\Product\Flat\Indexer::class);
-        parent::__construct($resource, $storeManager, $resourceHelper);
-    }
-
     /**
      * Add suffix to table name to show it is old
      *
@@ -196,6 +172,43 @@ protected function switchTables(array $stores = [])
         return $this;
     }
 
+    /**
+     * Retrieve all actual Catalog Product Flat Table names
+     *
+     * @return string[]
+     */
+    private function getActualStoreTablesForCategoryFlat(): array
+    {
+        $actualStoreTables = [];
+        foreach ($this->storeManager->getStores() as $store) {
+            $actualStoreTables[] = sprintf(
+                '%s_store_%s',
+                $this->connection->getTableName('catalog_category_flat'), $store->getId()
+            );
+        }
+
+        return $actualStoreTables;
+    }
+
+    /**
+     * Delete all category flat tables for not existing stores
+     *
+     * @return void
+     */
+    private function deleteAbandonedStoreCategoryFlatTables(): void
+    {
+        $existentTables = $this->connection->getTables(
+            $this->connection->getTableName('catalog_category_flat_store_%')
+        );
+        $actualStoreTables = $this->getActualStoreTablesForCategoryFlat();
+
+        $tablesToDelete = array_diff($existentTables, $actualStoreTables);
+
+        foreach ($tablesToDelete as $table) {
+            $this->connection->dropTable($table);
+        }
+    }
+
     /**
      * Transactional rebuild flat data from eav
      *
@@ -211,7 +224,7 @@ public function reindexAll()
         $stores = $this->storeManager->getStores();
         $this->populateFlatTables($stores);
         $this->switchTables($stores);
-        $this->indexer->deleteAbandonedStoreCategoryFlatTables();
+        $this->deleteAbandonedStoreCategoryFlatTables();
         $this->allowTableChanges = true;
 
         return $this;