MAGE-838 Add reversion for customer group enablement

Helper/ConfigHelper.php

@@ -1160,6 +1160,16 @@ public function isCustomerGroupsEnabled($storeId = null)
         return $this->configInterface->isSetFlag(self::CUSTOMER_GROUPS_ENABLE, ScopeInterface::SCOPE_STORE, $storeId);
     }
 
+    public function setCustomerGroupsEnabled(bool $val, ?string $scope = null, ?int $scopeId = null): void
+    {
+        $this->configWriter->save(
+            self::CUSTOMER_GROUPS_ENABLE,
+            $val ? '1' : '0',
+            $scope,
+            $scopeId
+        );
+    }
+
     /**
      * @param $storeId
      * @return bool

Model/Backend/EnableCustomerGroups.php

@@ -36,6 +36,9 @@ public function __construct(
      */
     public function afterSave(): Value
     {
+        $this->replicaState->setAppliedScope($this->getScope(), $this->getScopeId());
+        $this->replicaState->setCustomerGroupsEnabled((bool) $this->getValue());
+
         $storeIds = $this->configChecker->getAffectedStoreIds(
             $this->getPath(),
             $this->getScope(),

Model/Backend/Sorts.php

@@ -48,9 +48,7 @@ public function __construct(
      */
     public function afterSave(): \Magento\Framework\App\Config\Value
     {
-        // Save context of the admin operation for possible state reversion
-        $this->replicaState->setParentScope($this->getScope());
-        $this->replicaState->setParentScopeId($this->getScopeId());
+        $this->replicaState->setAppliedScope($this->getScope(), $this->getScopeId());
 
         $storeIds = $this->configChecker->getAffectedStoreIds(
             $this->getPath(),

Model/Product/ReplicaManager.php

@@ -303,6 +303,14 @@ protected function revertReplicaConfig(int $storeId): bool
             return true;
         }
 
+        if ($this->replicaState->wereCustomerGroupsEnabled()) {
+            $this->configHelper->setCustomerGroupsEnabled(
+                false,
+                $this->replicaState->getParentScope(),
+                $this->replicaState->getParentScopeId());
+            return true;
+        }
+
         return false;
     }
 

Registry/ReplicaState.php

@@ -17,24 +17,34 @@ class ReplicaState
     private ?string $_parentScope = null;
     private ?int $_parentScopeId = null;
 
+    private bool $_customerGroupsEnabled = false;
+
+    /**
+     * Save context of the original admin operation
+     * This is considered the "parent" scope.
+     * This is different from the affected store IDs for the applied/parent scope
+     * Retaining this is necessary for potential state reversion on error because while changes are persisted
+     * to Algolia indices for each store, the idea of default / website scope is a Magento only concept.
+     *
+     * @param string $scope
+     * @param int $scopeId
+     * @return void
+     */
+    public function setAppliedScope(string $scope, int $scopeId): void {
+        $this->_parentScope = $scope;
+        $this->_parentScopeId = $scopeId;
+    }
+
     public function getParentScope(): ?string
     {
         return $this->_parentScope;
     }
 
-    public function setParentScope(string $scope) {
-        $this->_parentScope = $scope;
-    }
-
     public function getParentScopeId(): ?int
     {
         return $this->_parentScopeId;
     }
 
-    public function setParentScopeId(int $scopeId) {
-        $this->_parentScopeId = $scopeId;
-    }
-
     public function getOriginalSortConfiguration(int $storeId): array
     {
         return $this->_scopeConfigurationOld[$storeId] ?? [];
@@ -55,7 +65,8 @@ public function setUpdatedSortConfiguration(array $updatedSortConfiguration, int
         $this->_scopeConfigurationNew[$storeId] = $updatedSortConfiguration;
     }
 
-    protected function hasConfigDataToCompare(int $storeId) {
+    protected function hasConfigDataToCompare(int $storeId): bool
+    {
         return isset($this->_scopeConfigurationOld[$storeId])
             && isset($this->_scopeConfigurationNew[$storeId]);
     }
@@ -79,4 +90,14 @@ public function setChangeState(int $state, int $storeId): void
         $this->_scopeState[$storeId] = $state;
     }
 
+    public function wereCustomerGroupsEnabled(): bool
+    {
+        return $this->_customerGroupsEnabled;
+    }
+
+    public function setCustomerGroupsEnabled(bool $customerGroupsEnabled): void
+    {
+        $this->_customerGroupsEnabled = $customerGroupsEnabled;
+    }
+
 }