OXDEV-8215: Add lang property to ModuleDataType

OXID-eSales · Aug 8, 2024 · bcc30d1 · bcc30d1
1 parent 854121c
commit bcc30d1
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 deletions.
diff --git a/src/Module/DataType/ModuleDataType.php b/src/Module/DataType/ModuleDataType.php
@@ -16,6 +16,9 @@
 #[Type]
 final class ModuleDataType extends AbstractComponentDataType implements ModuleDataTypeInterface
 {
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
     public function __construct(
         string $id,
         string $title,
@@ -25,7 +28,8 @@ public function __construct(
         private readonly ?string $thumbnail,
         private readonly ?string $author,
         private readonly ?string $url,
-        private readonly ?string $email
+        private readonly ?string $email,
+        private readonly string $lang
     ) {
         parent::__construct($id, $title, $version, $description, $active);
     }
@@ -53,4 +57,10 @@ public function getEmail(): ?string
     {
         return $this->email;
     }
+
+    #[Field]
+    public function getLang(): string
+    {
+        return $this->lang;
+    }
 }
diff --git a/src/Module/DataType/ModuleDataTypeFactory.php b/src/Module/DataType/ModuleDataTypeFactory.php
@@ -43,7 +43,8 @@ public function createFromModuleConfiguration(
             thumbnail: $moduleConfig->getThumbnail(),
             author: $moduleConfig->getAuthor(),
             url: $moduleConfig->getUrl(),
-            email: $moduleConfig->getEmail()
+            email: $moduleConfig->getEmail(),
+            lang: $moduleConfig->getLang()
         );
     }
 }
diff --git a/src/Module/DataType/ModuleDataTypeInterface.php b/src/Module/DataType/ModuleDataTypeInterface.php
@@ -27,5 +27,5 @@ public function getUrl(): ?string;
     public function getEmail(): ?string;
 
     #[Field]
-    public function isActive(): bool;
+    public function getLang(): string;
 }
diff --git a/tests/Unit/Module/Controller/ModuleListControllerTest.php b/tests/Unit/Module/Controller/ModuleListControllerTest.php
@@ -12,7 +12,6 @@
 use OxidEsales\GraphQL\ConfigurationAccess\Module\Controller\ModuleListController;
 use OxidEsales\GraphQL\ConfigurationAccess\Module\Service\ModuleListServiceInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\ComponentFilters;
-use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\ComponentFiltersInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\UnitTestCase;
 use OxidEsales\GraphQL\ConfigurationAccess\Module\DataType\ModuleDataTypeInterface;
 

diff --git a/tests/Unit/Module/DataType/ModuleDataTypeFactoryTest.php b/tests/Unit/Module/DataType/ModuleDataTypeFactoryTest.php
@@ -72,5 +72,6 @@ public function testCreateFromCoreModule()
         $this->assertSame($expectedUrl, $moduleDataType->getUrl());
         $this->assertSame($expectedEmail, $moduleDataType->getEmail());
         $this->assertSame($expectedIsActivated, $moduleDataType->isActive());
+        $this->assertSame($expectedLang, $moduleDataType->getLang());
     }
 }
diff --git a/tests/Unit/Module/DataType/ModuleDataTypeTest.php b/tests/Unit/Module/DataType/ModuleDataTypeTest.php
@@ -12,6 +12,7 @@
 use OxidEsales\GraphQL\ConfigurationAccess\Module\DataType\ModuleDataType;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\ComponentDataTypeInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\UnitTestCase;
+use phpDocumentor\Reflection\DocBlock\Description;
 
 /**
  * @covers \OxidEsales\GraphQL\ConfigurationAccess\Module\DataType\ModuleDataType
@@ -24,25 +25,26 @@ public function testModuleDataType(): void
         $author = uniqid();
         $url = uniqid();
         $email = uniqid();
-        $active = (bool)random_int(0, 1);
+        $lang = uniqid();
 
         $moduleDataType = new ModuleDataType(
             id: uniqid(),
             title: uniqid(),
             version: uniqid(),
             description: uniqid(),
-            active: $active,
+            active: false,
             thumbnail: $thumbnail,
             author: $author,
             url: $url,
-            email: $email
+            email: $email,
+            lang: $lang
         );
 
         $this->assertInstanceOf(ComponentDataTypeInterface::class, $moduleDataType);
         $this->assertSame($thumbnail, $moduleDataType->getThumbnail());
         $this->assertSame($author, $moduleDataType->getAuthor());
         $this->assertSame($url, $moduleDataType->getUrl());
         $this->assertSame($email, $moduleDataType->getEmail());
-        $this->assertSame($active, $moduleDataType->isActive());
+        $this->assertSame($lang, $moduleDataType->getLang());
     }
 }
diff --git a/tests/Unit/Theme/Controller/ThemeListControllerTest.php b/tests/Unit/Theme/Controller/ThemeListControllerTest.php
@@ -10,7 +10,6 @@
 namespace OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\Theme\Controller;
 
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\ComponentFilters;
-use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\ComponentFiltersInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Theme\Controller\ThemeListController;
 use OxidEsales\GraphQL\ConfigurationAccess\Theme\DataType\ThemeDataTypeInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Theme\Service\ThemeListServiceInterface;

diff --git a/tests/Unit/Theme/DataType/ThemeDataTypeTest.php b/tests/Unit/Theme/DataType/ThemeDataTypeTest.php
@@ -24,7 +24,7 @@ public function testThemeDataType(): void
         $id = uniqid();
         $version = uniqid();
         $description = uniqid();
-        $active = true;
+        $active = (bool)random_int(0, 1);
 
         $sut = new ThemeDataType($id, $name, $version, $description, $active);