OXDEV-8952: Move ThemeDataType generation to Infrastructur

OXID-eSales · Dec 16, 2024 · 91f5515 · 91f5515
1 parent 6109e9a
commit 91f5515
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Move ModuleDataType generation to Infrastructure
+- Move ThemeDataType generation to Infrastructure
 
 ## [1.2.0] - 2024-11-27
 This is the stable release of v1.2.0. No changes have been made since v1.2.0-rc.1.

diff --git a/src/Module/Infrastructure/ModuleListInfrastructure.php b/src/Module/Infrastructure/ModuleListInfrastructure.php
@@ -30,10 +30,10 @@ public function getModuleList(): array
             throw new ModulesNotFoundException();
         }
 
-        $modulesArray = [];
+        $moduleDatatypes = [];
         foreach ($moduleConfigurations as $moduleConfig) {
-            $modulesArray[] = $this->moduleDataTypeFactory->createFromModuleConfiguration($moduleConfig);
+            $moduleDatatypes[] = $this->moduleDataTypeFactory->createFromModuleConfiguration($moduleConfig);
         }
-        return $modulesArray;
+        return $moduleDatatypes;
     }
 }
diff --git a/src/Theme/Infrastructure/ThemeListInfrastructure.php b/src/Theme/Infrastructure/ThemeListInfrastructure.php
@@ -9,15 +9,20 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure;
 
+use OxidEsales\GraphQL\ConfigurationAccess\Theme\DataType\ThemeDataTypeFactoryInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Theme\Exception\ThemesNotFound;
 
 final class ThemeListInfrastructure implements ThemeListInfrastructureInterface
 {
     public function __construct(
-        private readonly CoreThemeFactoryInterface $coreThemeFactory
+        private readonly CoreThemeFactoryInterface $coreThemeFactory,
+        private readonly ThemeDataTypeFactoryInterface $themeDataTypeFactory
     ) {
     }
 
+    /**
+     * @inheritDoc
+     */
     public function getThemes(): array
     {
         $coreThemeService = $this->coreThemeFactory->create();
@@ -27,6 +32,11 @@ public function getThemes(): array
             throw new ThemesNotFound();
         }
 
-        return $themesList;
+        $themeDataTypes = [];
+        foreach ($themesList as $theme) {
+            $themeDataTypes[] = $this->themeDataTypeFactory->createFromCoreTheme(theme: $theme);
+        }
+
+        return $themeDataTypes;
     }
 }
diff --git a/src/Theme/Infrastructure/ThemeListInfrastructureInterface.php b/src/Theme/Infrastructure/ThemeListInfrastructureInterface.php
@@ -7,13 +7,13 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure;
 
-use OxidEsales\Eshop\Core\Theme;
+use OxidEsales\GraphQL\ConfigurationAccess\Theme\DataType\ThemeDataTypeInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Theme\Exception\ThemesNotFound;
 
 interface ThemeListInfrastructureInterface
 {
     /**
-     * @return array<Theme>
+     * @return ThemeDataTypeInterface[]
      * @throws ThemesNotFound
      */
     public function getThemes(): array;

diff --git a/src/Theme/Service/ThemeListService.php b/src/Theme/Service/ThemeListService.php
@@ -11,26 +11,20 @@
 
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\ComponentFiltersInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Service\ComponentFilterServiceInterface;
-use OxidEsales\GraphQL\ConfigurationAccess\Theme\DataType\ThemeDataTypeFactoryInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\ThemeListInfrastructureInterface;
 
 final class ThemeListService implements ThemeListServiceInterface
 {
     public function __construct(
         private readonly ThemeListInfrastructureInterface $themeListInfrastructure,
-        private readonly ComponentFilterServiceInterface $componentFilterService,
-        private readonly ThemeDataTypeFactoryInterface $themeDataTypeFactory
+        private readonly ComponentFilterServiceInterface $componentFilterService
     ) {
     }
 
     public function getThemeList(ComponentFiltersInterface $filters): array
     {
-        $themesArray =  [];
-        $themesList = $this->themeListInfrastructure->getThemes();
-        foreach ($themesList as $theme) {
-            $themesArray[] = $this->themeDataTypeFactory->createFromCoreTheme(theme: $theme);
-        }
+        $themeDataTypes = $this->themeListInfrastructure->getThemes();
 
-        return $this->componentFilterService->filterComponents($themesArray, $filters);
+        return $this->componentFilterService->filterComponents($themeDataTypes, $filters);
     }
 }
diff --git a/tests/Integration/Infrastructure/ThemeListInfrastructureTest.php b/tests/Integration/Infrastructure/ThemeListInfrastructureTest.php
@@ -9,8 +9,9 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Tests\Integration\Infrastructure;
 
-use OxidEsales\Eshop\Core\Theme;
 use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
+use OxidEsales\GraphQL\ConfigurationAccess\Theme\DataType\ThemeDataTypeFactoryInterface;
+use OxidEsales\GraphQL\ConfigurationAccess\Theme\DataType\ThemeDataTypeInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\CoreThemeFactoryInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\ThemeListInfrastructure;
 
@@ -28,14 +29,15 @@ public function testGetThemesValidData(): void
         $this->assertIsArray($themesArray);
 
         foreach ($themesArray as $theme) {
-            $this->assertInstanceOf(Theme::class, $theme);
+            $this->assertInstanceOf(ThemeDataTypeInterface::class, $theme);
         }
     }
 
     public function getSut(): ThemeListInfrastructure
     {
         return new ThemeListInfrastructure(
             $this->get(CoreThemeFactoryInterface::class),
+            $this->get(ThemeDataTypeFactoryInterface::class)
         );
     }
 }
diff --git a/tests/Unit/Theme/Infrastructure/ThemeListInfrastructureTest.php b/tests/Unit/Theme/Infrastructure/ThemeListInfrastructureTest.php
@@ -10,6 +10,8 @@
 namespace OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\Theme\Infrastructure;
 
 use OxidEsales\Eshop\Core\Theme;
+use OxidEsales\GraphQL\ConfigurationAccess\Theme\DataType\ThemeDataType;
+use OxidEsales\GraphQL\ConfigurationAccess\Theme\DataType\ThemeDataTypeFactoryInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\CoreThemeFactoryInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Theme\Exception\ThemesNotFound;
 use OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\ThemeListInfrastructure;
@@ -24,14 +26,22 @@ public function testGetThemes(): void
     {
         $theme1 = $this->createStub(Theme::class);
         $theme2 = $this->createStub(Theme::class);
+        $themeDataType1 = $this->createStub(ThemeDataType::class);
+        $themeDataType2 = $this->createStub(ThemeDataType::class);
 
         $coreThemeMock = $this->createMock(Theme::class);
         $coreThemeMock->method('getList')->willReturn([$theme1, $theme2]);
         $coreThemeFactoryMock = $this->getCoreThemeFactoryMock(returnValue: $coreThemeMock);
 
-        $sut = $this->getSut(coreThemeFactory: $coreThemeFactoryMock);
+        $themeDataTypeFactory = $this->createMock(ThemeDataTypeFactoryInterface::class);
+        $themeDataTypeFactory->method('createFromCoreTheme')->willReturnMap([
+            [$theme1, $themeDataType1],
+            [$theme2, $themeDataType2]
+        ]);
+
+        $sut = $this->getSut(coreThemeFactory: $coreThemeFactoryMock, themeDataTypeFactory: $themeDataTypeFactory);
         $actualThemesArray = $sut->getThemes();
-        $this->assertSame([$theme1, $theme2], $actualThemesArray);
+        $this->assertSame([$themeDataType1, $themeDataType2], $actualThemesArray);
     }
 
     public function testGetThemesThrowsException(): void
@@ -47,10 +57,12 @@ public function testGetThemesThrowsException(): void
     }
 
     private function getSut(
-        CoreThemeFactoryInterface $coreThemeFactory
+        CoreThemeFactoryInterface $coreThemeFactory = null,
+        ThemeDataTypeFactoryInterface $themeDataTypeFactory = null
     ): ThemeListInfrastructure {
         return new ThemeListInfrastructure(
-            coreThemeFactory: $coreThemeFactory
+            coreThemeFactory: $coreThemeFactory ?? $this->createStub(CoreThemeFactoryInterface::class),
+            themeDataTypeFactory: $themeDataTypeFactory ?? $this->createStub(ThemeDataTypeFactoryInterface::class)
         );
     }
 

diff --git a/tests/Unit/Theme/Service/ThemeListServiceTest.php b/tests/Unit/Theme/Service/ThemeListServiceTest.php
@@ -25,37 +25,24 @@ class ThemeListServiceTest extends TestCase
 {
     public function testGetThemeListWithFilters(): void
     {
-        $theme1 = $this->createStub(Theme::class);
-        $theme2 = $this->createStub(Theme::class);
-        $themes = [$theme1, $theme2];
         $themeDataType1 = $this->createStub(ThemeDataTypeInterface::class);
         $themeDataType2 = $this->createStub(ThemeDataTypeInterface::class);
-        $themeList = [$themeDataType1, $themeDataType2];
+        $themes = [$themeDataType1, $themeDataType2];
         $filteredThemeList = [$themeDataType1];
 
         $themeListInfrastructureMock = $this->createMock(ThemeListInfrastructureInterface::class);
         $themeListInfrastructureMock->method('getThemes')->willReturn($themes);
 
-        $themeDataTypeFactoryMock = $this->createMock(ThemeDataTypeFactoryInterface::class);
-        $themeDataTypeFactoryMock
-            ->expects($this->exactly(2))
-            ->method('createFromCoreTheme')
-            ->willReturnMap([
-                [$theme1, $themeDataType1],
-                [$theme2, $themeDataType2]
-            ]);
-
         $componentFiltersStub = $this->createStub(ComponentFiltersInterface::class);
 
         $componentFilterServiceMock = $this->createMock(ComponentFilterServiceInterface::class);
         $componentFilterServiceMock->method('filterComponents')
-            ->with($themeList, $componentFiltersStub)
+            ->with($themes, $componentFiltersStub)
             ->willReturn($filteredThemeList);
 
         $themeListService = new ThemeListService(
             themeListInfrastructure: $themeListInfrastructureMock,
             componentFilterService:  $componentFilterServiceMock,
-            themeDataTypeFactory:  $themeDataTypeFactoryMock
         );
         $actualThemes = $themeListService->getThemeList($componentFiltersStub);
         $this->assertSame($filteredThemeList, $actualThemes);