MAGETWO-93997: [Forwardport] Create commands to set/show dimension modes for indexers

Author: slopukhov

app/code/Magento/Catalog/Console/Command/PriceIndexerDimensionsModeSetCommand.php

@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
-
 namespace Magento\Catalog\Model\Indexer\Product\Price;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -41,6 +40,7 @@ class DimensionModeConfiguration
             CustomerGroupDimensionProvider::DIMENSION_NAME
         ],
     ];
+
     /**
      * @var ScopeConfigInterface
      */
@@ -59,12 +59,23 @@ public function __construct(ScopeConfigInterface $scopeConfig)
         $this->scopeConfig = $scopeConfig;
     }
 
+    /**
+     * Return dimension modes configuration.
+     *
+     * @return array
+     */
+    public function getDimensionModes(): array
+    {
+        return $this->modesMapping;
+    }
+
     /**
      * Get names of dimensions which used for provided mode.
      * By default return dimensions for current enabled mode
      *
      * @param string|null $mode
      * @return string[]
+     * @throws \InvalidArgumentException
      */
     public function getDimensionConfiguration(string $mode = null): array
     {
@@ -82,7 +93,7 @@ public function getDimensionConfiguration(string $mode = null): array
     private function getCurrentMode(): string
     {
         if (null === $this->currentMode) {
-            $this->currentMode = $this->scopeConfig->getValue(ModeSwitcher::XML_PATH_PRICE_DIMENSIONS_MODE)
+            $this->currentMode = $this->scopeConfig->getValue(ModeSwitcherConfiguration::XML_PATH_PRICE_DIMENSIONS_MODE)
                 ?: self::DIMENSION_NONE;
         }
 

app/code/Magento/Catalog/Model/Indexer/Product/Price/DimensionModeConfiguration.php

@@ -10,14 +10,14 @@
 use Magento\Framework\Search\Request\Dimension;
 use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
 use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Indexer\Model\DimensionModes;
+use Magento\Indexer\Model\DimensionMode;
 
 /**
  * Class to prepare new tables for new indexer mode
  */
-class ModeSwitcher
+class ModeSwitcher implements \Magento\Indexer\Model\ModeSwitcherInterface
 {
-    const XML_PATH_PRICE_DIMENSIONS_MODE = 'indexer/catalog_product_price/dimensions_mode';
-
     /**
      * TableMaintainer
      *
@@ -38,15 +38,60 @@ class ModeSwitcher
     private $dimensionsArray;
 
     /**
-     * @param \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer $tableMaintainer
-     * @param \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory $dimensionCollectionFactory
+     * @var \Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration
+     */
+    private $dimensionModeConfiguration;
+
+    /**
+     * @var ModeSwitcherConfiguration
+     */
+    private $modeSwitcherConfiguration;
+
+    /**
+     * @param TableMaintainer            $tableMaintainer
+     * @param DimensionCollectionFactory $dimensionCollectionFactory
+     * @param DimensionModeConfiguration $dimensionModeConfiguration
+     * @param ModeSwitcherConfiguration  $modeSwitcherConfiguration
      */
     public function __construct(
-        \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer $tableMaintainer,
-        \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory $dimensionCollectionFactory
+        TableMaintainer $tableMaintainer,
+        DimensionCollectionFactory $dimensionCollectionFactory,
+        DimensionModeConfiguration $dimensionModeConfiguration,
+        ModeSwitcherConfiguration $modeSwitcherConfiguration
     ) {
         $this->tableMaintainer = $tableMaintainer;
         $this->dimensionCollectionFactory = $dimensionCollectionFactory;
+        $this->dimensionModeConfiguration = $dimensionModeConfiguration;
+        $this->modeSwitcherConfiguration = $modeSwitcherConfiguration;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDimensionModes(): DimensionModes
+    {
+        $dimensionsList = [];
+        foreach ($this->dimensionModeConfiguration->getDimensionModes() as $dimension => $modes) {
+            $dimensionsList[] = new DimensionMode($dimension, $modes);
+        }
+
+        return new DimensionModes($dimensionsList);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function switchMode(string $currentMode, string $previousMode)
+    {
+        //Create new tables and move data
+        $this->createTables($currentMode);
+        $this->moveData($currentMode, $previousMode);
+
+        //Change config options
+        $this->modeSwitcherConfiguration->saveMode($currentMode);
+
+        //Delete old tables
+        $this->dropTables($previousMode);
     }
 
     /**
@@ -120,7 +165,7 @@ public function dropTables(string $previousMode)
      *
      * @param string $mode
      *
-     * @return array
+     * @return \Magento\Framework\Indexer\MultiDimensionProvider
      */
     private function getDimensionsArray(string $mode): \Magento\Framework\Indexer\MultiDimensionProvider
     {