apply review feedback

config/documents.yaml

@@ -27,4 +27,12 @@ services:
   #
 
   Pimcore\Bundle\StudioBackendBundle\Document\Repository\SiteRepositoryInterface:
-    class: Pimcore\Bundle\StudioBackendBundle\Document\Repository\SiteRepository
+    class: Pimcore\Bundle\StudioBackendBundle\Document\Repository\SiteRepository
+
+
+  #
+  # Hydrators
+  #
+
+  Pimcore\Bundle\StudioBackendBundle\Document\Hydrator\SiteHydratorInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Document\Hydrator\SiteHydrator

src/Class/Service/FieldCollection/LayoutDefinitionService.php

@@ -21,7 +21,7 @@
 use Pimcore\Bundle\StaticResolverBundle\Models\DataObject\DataObjectResolverInterface;
 use Pimcore\Bundle\StaticResolverBundle\Models\DataObject\FieldCollection\DefinitionResolverInterface;
 use Pimcore\Bundle\StudioBackendBundle\Class\Event\FieldCollection\LayoutDefinitionEvent;
-use Pimcore\Bundle\StudioBackendBundle\Class\Hydrator\FieldCollection\LayoutDefinitionHydratorInterface;
+use Pimcore\Bundle\StudioBackendBundle\Class\Hydrator\FieldCollection\SiteHydratorInterface;
 use Pimcore\Bundle\StudioBackendBundle\Class\Schema\LayoutDefinition;
 use Pimcore\Bundle\StudioBackendBundle\Exception\Api\NotFoundException;
 use Pimcore\Model\DataObject;
@@ -34,11 +34,11 @@
 final class LayoutDefinitionService implements LayoutDefinitionServiceInterface
 {
     public function __construct(
-        private readonly DataObjectResolverInterface $dataObjectResolver,
+        private readonly DataObjectResolverInterface      $dataObjectResolver,
         private readonly ClassDefinitionResolverInterface $classDefinitionResolver,
-        private readonly DefinitionResolverInterface $definitionResolver,
-        private readonly LayoutDefinitionHydratorInterface $layoutDefinitionHydrator,
-        private readonly EventDispatcherInterface $eventDispatcher,
+        private readonly DefinitionResolverInterface      $definitionResolver,
+        private readonly SiteHydratorInterface            $layoutDefinitionHydrator,
+        private readonly EventDispatcherInterface         $eventDispatcher,
     ) {
     }
 

src/Document/Hydrator/SiteHydrator.php

@@ -0,0 +1,37 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Document\Hydrator;
+
+use Pimcore\Bundle\StudioBackendBundle\Document\Schema\Site;
+use Pimcore\Model\Site as SiteModel;
+
+/**
+ * @internal
+ */
+final class SiteHydrator implements SiteHydratorInterface
+{
+    public function hydrate(SiteModel $siteModel): Site
+    {
+        return new Site(
+            $siteModel->getId(),
+            $siteModel->getDomains(),
+            $siteModel->getMainDomain(),
+            $siteModel->getRootId(),
+            $siteModel->getRootPath(),
+        );
+    }
+}

src/Document/Hydrator/SiteHydratorInterface.php

@@ -0,0 +1,28 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace Pimcore\Bundle\StudioBackendBundle\Document\Hydrator;
+
+use Pimcore\Bundle\StudioBackendBundle\Document\Schema\Site;
+use Pimcore\Model\Site as SiteModel;
+
+/**
+ * @internal
+ */
+interface SiteHydratorInterface
+{
+    public function hydrate(SiteModel $siteModel): Site;
+}

src/Document/Schema/Site.php

@@ -26,6 +26,9 @@
     schema: 'Site',
     title: 'Site',
     required: [
+        'id',
+        'domains',
+        'domain',
     ],
     type: 'object'
 )]

src/Document/Service/SiteService.php

@@ -17,6 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\Document\Service;
 
 use Pimcore\Bundle\StudioBackendBundle\Document\Event\PreResponse\SiteEvent;
+use Pimcore\Bundle\StudioBackendBundle\Document\Hydrator\SiteHydratorInterface;
 use Pimcore\Bundle\StudioBackendBundle\Document\MappedParameter\ExcludeMainSiteParameter;
 use Pimcore\Bundle\StudioBackendBundle\Document\Repository\SiteRepositoryInterface;
 use Pimcore\Bundle\StudioBackendBundle\Document\Schema\Site;
@@ -32,6 +33,7 @@
 
     public function __construct(
         private EventDispatcherInterface $eventDispatcher,
+        private SiteHydratorInterface $siteHydrator,
         private SiteRepositoryInterface $siteRepository,
     ) {
     }
@@ -48,13 +50,7 @@ public function getAvailableSites(ExcludeMainSiteParameter $parameter): array
 
         $siteList = $this->siteRepository->listSites();
         foreach ($siteList as $siteEntry) {
-            $site = new Site(
-                $siteEntry->getId(),
-                $siteEntry->getDomains(),
-                $siteEntry->getMainDomain(),
-                $siteEntry->getRootId(),
-                $siteEntry->getRootPath(),
-            );
+            $site = $this->siteHydrator->hydrate($siteEntry);
 
             $this->eventDispatcher->dispatch(new SiteEvent($site), SiteEvent::EVENT_NAME);
             $sites[] = $site;