Fix price attribute scope change with app:config:import magento#33559

Author: rmsundar1

app/code/Magento/Catalog/Observer/SwitchPriceAttributeScopeOnConfigChange.php renamed to app/code/Magento/Catalog/Model/Config/PriceScopeChange.php

@@ -3,67 +3,54 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Catalog\Observer;
 
-use Magento\Framework\Event\Observer as EventObserver;
-use Magento\Framework\Event\ObserverInterface;
+namespace Magento\Catalog\Model\Config;
+
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-use Magento\Store\Model\Store;
-use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Store\Model\Store;
 
-/**
- * Observer is responsible for changing scope for all price attributes in system
- * depending on 'Catalog Price Scope' configuration parameter
- */
-class SwitchPriceAttributeScopeOnConfigChange implements ObserverInterface
+class PriceScopeChange
 {
     /**
-     * @var ReinitableConfigInterface
+     * @var SearchCriteriaBuilder
      */
-    private $config;
+    private $searchCriteriaBuilder;
 
     /**
      * @var ProductAttributeRepositoryInterface
      */
     private $productAttributeRepository;
 
     /**
-     * @var SearchCriteriaBuilder
-     */
-    private $searchCriteriaBuilder;
-
-    /**
-     * @param ReinitableConfigInterface $config
      * @param ProductAttributeRepositoryInterface $productAttributeRepository
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      */
     public function __construct(
-        ReinitableConfigInterface $config,
         ProductAttributeRepositoryInterface $productAttributeRepository,
         SearchCriteriaBuilder $searchCriteriaBuilder
     ) {
-        $this->config = $config;
         $this->productAttributeRepository = $productAttributeRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
     }
 
     /**
-     * Change scope for all price attributes according to
-     * 'Catalog Price Scope' configuration parameter value
+     * Updates the price attributes scope
+     *
+     * @param int $value
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\StateException
      *
-     * @param EventObserver $observer
-     * @return void
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @retrun void
      */
-    public function execute(EventObserver $observer)
+    public function changeScope(int $value)
     {
         $this->searchCriteriaBuilder->addFilter('frontend_input', 'price');
         $criteria = $this->searchCriteriaBuilder->create();
 
-        $scope = $this->config->getValue(Store::XML_PATH_PRICE_SCOPE);
-        $scope = ($scope == Store::PRICE_SCOPE_WEBSITE)
+        $scope = ($value === Store::PRICE_SCOPE_WEBSITE)
             ? ProductAttributeInterface::SCOPE_WEBSITE_TEXT
             : ProductAttributeInterface::SCOPE_GLOBAL_TEXT;
 

app/code/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScope.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Price\System\Config;
 
+use Magento\Catalog\Model\Config\PriceScopeChange;
+
 /**
  * Price scope backend model
  */
@@ -15,14 +17,20 @@ class PriceScope extends \Magento\Framework\App\Config\Value
      */
     protected $indexerRegistry;
 
+    /**
+     * @var PriceScopeChange
+     */
+    private $priceScopeChange;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param PriceScopeChange $priceScopeChange
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      */
     public function __construct(
@@ -31,12 +39,14 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
         \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
+        \Magento\Catalog\Model\Config\PriceScopeChange $priceScopeChange,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
         $this->indexerRegistry = $indexerRegistry;
+        $this->priceScopeChange = $priceScopeChange;
     }
 
     /**
@@ -61,5 +71,6 @@ public function processValue()
             $this->indexerRegistry->get(\Magento\Catalog\Model\Indexer\Product\Price\Processor::INDEXER_ID)
                 ->invalidate();
         }
+        $this->priceScopeChange->changeScope((int)$this->getValue());
     }
 }

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

@@ -52,9 +52,6 @@
     <event name="magento_catalog_api_data_categorytreeinterface_load_after">
         <observer name="legacy_categorytree_load_after" instance="Magento\Framework\EntityManager\Observer\AfterEntityLoad" />
     </event>
-    <event name="admin_system_config_changed_section_catalog">
-        <observer name="catalog_update_price_attribute" instance="Magento\Catalog\Observer\SwitchPriceAttributeScopeOnConfigChange" />
-    </event>
     <event name="catalog_product_save_before">
         <observer name="set_special_price_start_date" instance="Magento\Catalog\Observer\SetSpecialPriceStartDate" />
     </event>