MC-32634: Default store and view are disappearing after changing Default website code and using exported config.php to install magento

Author: rostyslav-hymon

app/code/Magento/Store/Model/Config/Importer/DataDifferenceCalculator.php

@@ -20,6 +20,17 @@ class DataDifferenceCalculator
      */
     private $runtimeConfigSource;
 
+    /**
+     * Scopes identifier
+     *
+     * @var string[]
+     */
+    private $identifiers = [
+        'websites' => 'website_id',
+        'groups' => 'group_id',
+        'stores' => 'store_id',
+    ];
+
     /**
      * @param ConfigSourceInterface $runtimeConfigSource The config source to retrieve current config
      */
@@ -28,6 +39,31 @@ public function __construct(ConfigSourceInterface $runtimeConfigSource)
         $this->runtimeConfigSource = $runtimeConfigSource;
     }
 
+    /**
+     * Update data by checking ID
+     *
+     * @param string $scope
+     * @param array $data
+     * @param array $runtimeScopeData
+     * @return array
+     */
+    private function updateDataById(string $scope, array $data, array $runtimeScopeData): array
+    {
+        $diffData = array_diff_key($data, $runtimeScopeData);
+        foreach ($diffData as $code => $datum) {
+            foreach ($runtimeScopeData as $runTimeScopeCode => $runtimeScopeDatum) {
+                if (isset($datum[$this->identifiers[$scope]])
+                    && $datum[$this->identifiers[$scope]] === $runtimeScopeDatum[$this->identifiers[$scope]]
+                ) {
+                    $data[$runTimeScopeCode] = $data[$code];
+                    unset($data[$code]);
+                }
+            }
+        }
+
+        return $data;
+    }
+
     /**
      * Calculates items to delete.
      *
@@ -41,6 +77,7 @@ public function getItemsToDelete($scope, array $data)
         $runtimeScopeData = $this->changeDataKeyToCode(
             $this->getRuntimeData($scope)
         );
+        $data = $this->updateDataById($scope, $data, $runtimeScopeData);
 
         return array_diff_key($runtimeScopeData, $data);
     }
@@ -58,6 +95,7 @@ public function getItemsToCreate($scope, array $data)
         $runtimeScopeData = $this->changeDataKeyToCode(
             $this->getRuntimeData($scope)
         );
+        $data = $this->updateDataById($scope, $data, $runtimeScopeData);
 
         return array_diff_key($data, $runtimeScopeData);
     }
@@ -77,7 +115,7 @@ public function getItemsToUpdate($scope, array $data)
         $runtimeScopeData = $this->changeDataKeyToCode(
             $this->getRuntimeData($scope)
         );
-
+        $data = $this->updateDataById($scope, $data, $runtimeScopeData);
         foreach ($runtimeScopeData as $entityCode => $entityData) {
             if (isset($data[$entityCode]) && array_diff_assoc($entityData, $data[$entityCode])) {
                 $itemsToUpdate[$entityCode] = array_replace($entityData, $data[$entityCode]);

dev/tests/integration/testsuite/Magento/Deploy/_files/scopes/config_with_changed_stores.php

@@ -14,9 +14,9 @@
                 'default_group_id' => '0',
                 'is_default' => '0',
             ],
-            'base' => [
+            'base_code_changed' => [
                 'website_id' => '1',
-                'code' => 'base',
+                'code' => 'base_code_changed',
                 'name' => 'Main Website',
                 'sort_order' => '0',
                 'default_group_id' => '1',