Merge pull request #7 from spryker/bugfix/acp-3384-config-gets-remove…

…d-when-disconnected

ACP-3384 Only deactivate configurations to prevent loss of config det…

src/Spryker/Glue/AppKernel/Controller/AppConfigController.php

@@ -39,6 +39,7 @@ public function postConfigureAction(GlueRequestTransfer $glueRequestTransfer): G
             ->mapGlueRequestTransferToAppConfigTransfer($glueRequestTransfer, new AppConfigTransfer());
 
         $appConfigTransfer = $this->updateStatus($appConfigTransfer);
+        $appConfigTransfer->setIsActive(true);
 
         $appConfigResponseTransfer = $this->getFactory()->getAppKernelFacade()
             ->saveConfig($appConfigTransfer);
@@ -66,6 +67,7 @@ protected function updateStatus(AppConfigTransfer $appConfigTransfer): AppConfig
                     ->getConfig((new AppConfigCriteriaTransfer())->setTenantIdentifier($appConfigTransfer->getTenantIdentifier()));
 
                 $appConfigTransfer->setStatus($existingAppConfigTransfer->getStatus());
+                $appConfigTransfer->setIsActive($existingAppConfigTransfer->getIsActive());
             } catch (AppConfigNotFoundException) {
             }
         }

src/Spryker/Glue/AppKernel/Controller/AppDisconnectController.php

@@ -7,11 +7,13 @@
 
 namespace Spryker\Glue\AppKernel\Controller;
 
+use Generated\Shared\Transfer\AppConfigCriteriaTransfer;
 use Generated\Shared\Transfer\AppDisconnectTransfer;
 use Generated\Shared\Transfer\GlueRequestTransfer;
 use Generated\Shared\Transfer\GlueResponseTransfer;
 use Spryker\Glue\AppKernel\AppKernelConfig;
 use Spryker\Glue\Kernel\Backend\Controller\AbstractController;
+use Spryker\Zed\AppKernel\Persistence\Exception\AppConfigNotFoundException;
 
 /**
  * @method \Spryker\Glue\AppKernel\AppKernelFactory getFactory()
@@ -36,11 +38,27 @@ public function postDisconnectAction(GlueRequestTransfer $glueRequestTransfer):
         $disconnectParameterTransfer = $this->getFactory()->createGlueRequestMapper()
             ->mapGlueRequestTransferToAppDisconnectTransfer($glueRequestTransfer, new AppDisconnectTransfer());
 
-        $appDisconnectResponseTransfer = $this->getFactory()->getAppKernelFacade()
-            ->deleteConfig($disconnectParameterTransfer);
+        $appConfigCriteriaTransfer = new AppConfigCriteriaTransfer();
+        $appConfigCriteriaTransfer->setTenantIdentifier($disconnectParameterTransfer->getTenantIdentifier());
 
-        if (!$appDisconnectResponseTransfer->getIsSuccessful()) {
-            return $this->getFactory()->createResponseBuilder()
+        try {
+            $appConfigTransfer = $this->getFactory()
+                ->getAppKernelFacade()
+                ->getConfig($appConfigCriteriaTransfer);
+
+            $appConfigTransfer->setIsActive(false);
+            $appConfigResponseTransfer = $this->getFactory()
+                ->getAppKernelFacade()
+                ->saveConfig($appConfigTransfer);
+        } catch (AppConfigNotFoundException $exception) {
+            return $this->getFactory()
+                ->createResponseBuilder()
+                ->buildErrorResponse($exception->getMessage());
+        }
+
+        if (!$appConfigResponseTransfer->getIsSuccessful()) {
+            return $this->getFactory()
+                ->createResponseBuilder()
                 ->buildErrorResponse(AppKernelConfig::RESPONSE_MESSAGE_DISCONNECT_ERROR);
         }
 

src/Spryker/Glue/AppKernel/Dependency/Facade/AppKernelToAppKernelFacadeBridge.php

@@ -10,8 +10,6 @@
 use Generated\Shared\Transfer\AppConfigCriteriaTransfer;
 use Generated\Shared\Transfer\AppConfigResponseTransfer;
 use Generated\Shared\Transfer\AppConfigTransfer;
-use Generated\Shared\Transfer\AppDisconnectResponseTransfer;
-use Generated\Shared\Transfer\AppDisconnectTransfer;
 
 class AppKernelToAppKernelFacadeBridge implements AppKernelToAppKernelFacadeInterface
 {
@@ -47,14 +45,4 @@ public function saveConfig(AppConfigTransfer $appConfigTransfer): AppConfigRespo
     {
         return $this->appKernelFacade->saveConfig($appConfigTransfer);
     }
-
-    /**
-     * @param \Generated\Shared\Transfer\AppDisconnectTransfer $appDisconnectTransfer
-     *
-     * @return \Generated\Shared\Transfer\AppDisconnectResponseTransfer
-     */
-    public function deleteConfig(AppDisconnectTransfer $appDisconnectTransfer): AppDisconnectResponseTransfer
-    {
-        return $this->appKernelFacade->deleteConfig($appDisconnectTransfer);
-    }
 }

src/Spryker/Glue/AppKernel/Dependency/Facade/AppKernelToAppKernelFacadeInterface.php

@@ -10,8 +10,6 @@
 use Generated\Shared\Transfer\AppConfigCriteriaTransfer;
 use Generated\Shared\Transfer\AppConfigResponseTransfer;
 use Generated\Shared\Transfer\AppConfigTransfer;
-use Generated\Shared\Transfer\AppDisconnectResponseTransfer;
-use Generated\Shared\Transfer\AppDisconnectTransfer;
 
 interface AppKernelToAppKernelFacadeInterface
 {
@@ -28,11 +26,4 @@ public function getConfig(AppConfigCriteriaTransfer $appConfigCriteriaTransfer):
      * @return \Generated\Shared\Transfer\AppConfigResponseTransfer
      */
     public function saveConfig(AppConfigTransfer $appConfigTransfer): AppConfigResponseTransfer;
-
-    /**
-     * @param \Generated\Shared\Transfer\AppDisconnectTransfer $appDisconnectTransfer
-     *
-     * @return \Generated\Shared\Transfer\AppDisconnectResponseTransfer
-     */
-    public function deleteConfig(AppDisconnectTransfer $appDisconnectTransfer): AppDisconnectResponseTransfer;
 }

src/Spryker/Zed/AppKernel/Business/AppKernelBusinessFactory.php

@@ -8,8 +8,6 @@
 namespace Spryker\Zed\AppKernel\Business;
 
 use Spryker\Zed\AppKernel\AppKernelDependencyProvider;
-use Spryker\Zed\AppKernel\Business\Deleter\ConfigDeleter;
-use Spryker\Zed\AppKernel\Business\Deleter\ConfigDeleterInterface;
 use Spryker\Zed\AppKernel\Business\EncryptionConfigurator\PropelEncryptionConfigurator;
 use Spryker\Zed\AppKernel\Business\EncryptionConfigurator\PropelEncryptionConfiguratorInterface;
 use Spryker\Zed\AppKernel\Business\Reader\ConfigReader;
@@ -40,16 +38,6 @@ public function createConfigWriter(): ConfigWriterInterface
             $this->createPropelEncryptionConfigurator(),
             $this->getConfigurationBeforeSavePlugins(),
             $this->getConfigurationAfterSavePlugins(),
-        );
-    }
-
-    /**
-     * @return \Spryker\Zed\AppKernel\Business\Deleter\ConfigDeleterInterface
-     */
-    public function createConfigDeleter(): ConfigDeleterInterface
-    {
-        return new ConfigDeleter(
-            $this->getEntityManager(),
             $this->getConfigurationBeforeDeletePlugins(),
             $this->getConfigurationAfterDeletePlugins(),
         );

src/Spryker/Zed/AppKernel/Business/AppKernelFacade.php

@@ -10,8 +10,6 @@
 use Generated\Shared\Transfer\AppConfigCriteriaTransfer;
 use Generated\Shared\Transfer\AppConfigResponseTransfer;
 use Generated\Shared\Transfer\AppConfigTransfer;
-use Generated\Shared\Transfer\AppDisconnectResponseTransfer;
-use Generated\Shared\Transfer\AppDisconnectTransfer;
 use Spryker\Shared\Kernel\Transfer\TransferInterface;
 use Spryker\Zed\Kernel\Business\AbstractFacade;
 
@@ -38,22 +36,6 @@ public function saveConfig(AppConfigTransfer $appConfigTransfer): AppConfigRespo
             ->saveConfig($appConfigTransfer);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @api
-     *
-     * @param \Generated\Shared\Transfer\AppDisconnectTransfer $appDisconnectTransfer
-     *
-     * @return \Generated\Shared\Transfer\AppDisconnectResponseTransfer
-     */
-    public function deleteConfig(AppDisconnectTransfer $appDisconnectTransfer): AppDisconnectResponseTransfer
-    {
-        return $this->getFactory()
-            ->createConfigDeleter()
-            ->deleteConfig($appDisconnectTransfer);
-    }
-
     /**
      * {@inheritDoc}
      *

src/Spryker/Zed/AppKernel/Business/AppKernelFacadeInterface.php

@@ -10,8 +10,6 @@
 use Generated\Shared\Transfer\AppConfigCriteriaTransfer;
 use Generated\Shared\Transfer\AppConfigResponseTransfer;
 use Generated\Shared\Transfer\AppConfigTransfer;
-use Generated\Shared\Transfer\AppDisconnectResponseTransfer;
-use Generated\Shared\Transfer\AppDisconnectTransfer;
 use Spryker\Shared\Kernel\Transfer\TransferInterface;
 
 interface AppKernelFacadeInterface
@@ -38,23 +36,6 @@ interface AppKernelFacadeInterface
      */
     public function saveConfig(AppConfigTransfer $appConfigTransfer): AppConfigResponseTransfer;
 
-    /**
-     * Specification:
-     * - Deletes the App configuration from the DB.
-     * - Requires `AppDisconnectTransfer.tenantIdentifier` to be set.
-     * - Executes `ConfigurationBeforeDeletePluginInterface::beforeDelete()` method before the configuration is deleted from the database.
-     * - Executes `ConfigurationAfterDeletePluginInterface::afterDelete()` method after the configuration was deleted from the database.
-     * - Returns a successful `AppDisconnectResponseTransfer` when configuration was deleted from the database.
-     * - Returns a failed `AppDisconnectResponseTransfer` when configuration could not be deleted from the database.
-     *
-     * @api
-     *
-     * @param \Generated\Shared\Transfer\AppDisconnectTransfer $appDisconnectTransfer
-     *
-     * @return \Generated\Shared\Transfer\AppDisconnectResponseTransfer
-     */
-    public function deleteConfig(AppDisconnectTransfer $appDisconnectTransfer): AppDisconnectResponseTransfer;
-
     /**
      * Specification:
      * - Reads the App configuration from the DB.