OXDEV-8216: Move module's Infrastructure method to Service

OXID-eSales · Aug 12, 2024 · 5b02a65 · 5b02a65
1 parent d7d3efd
commit 5b02a65
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 133 deletions.
diff --git a/...ule/Controller/ModuleSwitchController.php → ...Controller/ModuleActivationController.php b/...ule/Controller/ModuleSwitchController.php → ...Controller/ModuleActivationController.php
@@ -17,7 +17,7 @@
 class ModuleSwitchController
 {
     public function __construct(
-        private readonly ModuleSwitchServiceInterface $moduleSwitchService
+        private readonly ModuleActivationServiceInterface $moduleService
     ) {
     }
 

diff --git a/...astructure/ModuleSwitchInfrastructure.php → ...odule/Service/ModuleActivationService.php b/...astructure/ModuleSwitchInfrastructure.php → ...odule/Service/ModuleActivationService.php
@@ -7,14 +7,14 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\GraphQL\ConfigurationAccess\Module\Infrastructure;
+namespace OxidEsales\GraphQL\ConfigurationAccess\Module\Service;
 
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Setup\Bridge\ModuleActivationBridgeInterface;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\ContextInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Module\Exception\ModuleActivationException;
 use OxidEsales\GraphQL\ConfigurationAccess\Module\Exception\ModuleDeactivationException;
 
-class ModuleSwitchInfrastructure implements ModuleSwitchInfrastructureInterface
+class ModuleActivationService implements ModuleActivationServiceInterface
 {
     public function __construct(
         private readonly ContextInterface $context,

diff --git a/...e/ModuleSwitchInfrastructureInterface.php → ...vice/ModuleActivationServiceInterface.php b/...e/ModuleSwitchInfrastructureInterface.php → ...vice/ModuleActivationServiceInterface.php
@@ -5,12 +5,12 @@
  * See LICENSE file for license details.
  */
 
-namespace OxidEsales\GraphQL\ConfigurationAccess\Module\Infrastructure;
+namespace OxidEsales\GraphQL\ConfigurationAccess\Module\Service;
 
 use OxidEsales\GraphQL\ConfigurationAccess\Module\Exception\ModuleActivationException;
 use OxidEsales\GraphQL\ConfigurationAccess\Module\Exception\ModuleDeactivationException;
 
-interface ModuleSwitchInfrastructureInterface
+interface ModuleActivationServiceInterface
 {
     /**
      * @throws ModuleActivationException

diff --git a/src/Module/Service/ModuleSwitchService.php b/src/Module/Service/ModuleSwitchService.php
diff --git a/src/Module/Service/ModuleSwitchServiceInterface.php b/src/Module/Service/ModuleSwitchServiceInterface.php
diff --git a/src/Module/services.yaml b/src/Module/services.yaml
@@ -10,8 +10,5 @@ services:
   OxidEsales\GraphQL\ConfigurationAccess\Module\Service\ModuleSettingServiceInterface:
     class: OxidEsales\GraphQL\ConfigurationAccess\Module\Service\ModuleSettingService
 
-  OxidEsales\GraphQL\ConfigurationAccess\Module\Infrastructure\ModuleSwitchInfrastructureInterface:
-    class: OxidEsales\GraphQL\ConfigurationAccess\Module\Infrastructure\ModuleSwitchInfrastructure
-
-  OxidEsales\GraphQL\ConfigurationAccess\Module\Service\ModuleSwitchServiceInterface:
-    class: OxidEsales\GraphQL\ConfigurationAccess\Module\Service\ModuleSwitchService
+  OxidEsales\GraphQL\ConfigurationAccess\Module\Service\ModuleActivationServiceInterface:
+    class: OxidEsales\GraphQL\ConfigurationAccess\Module\Service\ModuleActivationService
diff --git a/...Controller/ModuleSwitchControllerTest.php → ...roller/ModuleActivationControllerTest.php b/...Controller/ModuleSwitchControllerTest.php → ...roller/ModuleActivationControllerTest.php
@@ -10,7 +10,7 @@
 namespace OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\Module\Controller;
 
 use OxidEsales\GraphQL\ConfigurationAccess\Module\Controller\ModuleSwitchController;
-use OxidEsales\GraphQL\ConfigurationAccess\Module\Service\ModuleSwitchServiceInterface;
+use OxidEsales\GraphQL\ConfigurationAccess\Module\Service\ModuleActivationServiceInterface;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -22,13 +22,13 @@ public function testActivateModule(): void
     {
         $moduleId = 'testModuleId';
 
-        $moduleSwitchServiceMock = $this->createMock(ModuleSwitchServiceInterface::class);
-        $moduleSwitchServiceMock
+        $moduleActivationServiceMock = $this->createMock(ModuleActivationServiceInterface::class);
+        $moduleActivationServiceMock
             ->method('activateModule')
             ->with($moduleId)
             ->willReturn(true);
 
-        $sut = $this->getSut(moduleSwitchService: $moduleSwitchServiceMock);
+        $sut = $this->getSut(moduleActivationService: $moduleActivationServiceMock);
 
         $result = $sut->activateModule($moduleId);
         $this->assertTrue($result);
@@ -38,24 +38,23 @@ public function testDeactivateModule(): void
     {
         $moduleId = 'testModuleId';
 
-        $moduleSwitchServiceMock = $this->createMock(ModuleSwitchServiceInterface::class);
-        $moduleSwitchServiceMock
+        $moduleActivationServiceMock = $this->createMock(ModuleActivationServiceInterface::class);
+        $moduleActivationServiceMock
             ->method('deactivateModule')
             ->with($moduleId)
             ->willReturn(true);
 
-        $sut = $this->getSut(moduleSwitchService: $moduleSwitchServiceMock);
+        $sut = $this->getSut(moduleActivationService: $moduleActivationServiceMock);
 
         $result = $sut->deactivateModule($moduleId);
         $this->assertTrue($result);
     }
 
     public function getSut(
-        ModuleSwitchServiceInterface $moduleSwitchService = null
     ): ModuleSwitchController {
         return new ModuleSwitchController(
-            moduleSwitchService: $moduleSwitchService
-            ?? $this->createStub(ModuleSwitchServiceInterface::class)
+        ModuleActivationServiceInterface $moduleActivationService = null
+            moduleService: $moduleActivationService
         );
     }
 }
diff --git a/...ucture/ModuleSwitchInfrastructureTest.php → .../Service/ModuleActivationsServiceTest.php b/...ucture/ModuleSwitchInfrastructureTest.php → .../Service/ModuleActivationsServiceTest.php
@@ -7,19 +7,19 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\Module\Infrastructure;
+namespace OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\Module\Service;
 
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\ContextInterface;
-use OxidEsales\GraphQL\ConfigurationAccess\Module\Infrastructure\ModuleSwitchInfrastructure;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Setup\Bridge\ModuleActivationBridgeInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Module\Exception\ModuleActivationException;
 use OxidEsales\GraphQL\ConfigurationAccess\Module\Exception\ModuleDeactivationException;
+use OxidEsales\GraphQL\ConfigurationAccess\Module\Service\ModuleActivationService;
 use OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\UnitTestCase;
 
 /**
- * @covers \OxidEsales\GraphQL\ConfigurationAccess\Module\Infrastructure\ModuleSwitchInfrastructure
+ * @covers \OxidEsales\GraphQL\ConfigurationAccess\Module\Service\ModuleActivationService
  */
-class ModuleSwitchInfrastructureTest extends UnitTestCase
+class ModuleActivationsServiceTest extends UnitTestCase
 {
     /**
      * @dataProvider activationDataProvider
@@ -103,8 +103,8 @@ public static function exceptionDataProvider(): \Generator
     public function getSut(
         ContextInterface $context = null,
         ModuleActivationBridgeInterface $moduleActivationBridge = null
-    ): ModuleSwitchInfrastructure {
-        return new ModuleSwitchInfrastructure(
+    ): ModuleActivationService {
+        return new ModuleActivationService(
             context: $context
                 ??  $this->createStub(ContextInterface::class),
             moduleActivationBridge: $moduleActivationBridge

diff --git a/tests/Unit/Module/Service/ModuleSwitchServiceTest.php b/tests/Unit/Module/Service/ModuleSwitchServiceTest.php