156 Integrated DataExtractor service into hydrator

pimcore · May 14, 2024 · d49098c · d49098c
1 parent 0de7e38
commit d49098c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 78 deletions.
diff --git a/config/dependencies.yaml b/config/dependencies.yaml
@@ -18,7 +18,4 @@ services:
     class: Pimcore\Bundle\StudioBackendBundle\Dependency\Service\DependencyHydratorService
 
   Pimcore\Bundle\StudioBackendBundle\Dependency\Hydrator\DependencyHydratorInterface:
-    class: Pimcore\Bundle\StudioBackendBundle\Dependency\Hydrator\DependencyHydrator
-
-  Pimcore\Bundle\StudioBackendBundle\Dependency\Extractor\DependencyDataExtractorInterface:
-    class: Pimcore\Bundle\StudioBackendBundle\Dependency\Extractor\DependencyDataExtractor
+    class: Pimcore\Bundle\StudioBackendBundle\Dependency\Hydrator\DependencyHydrator
diff --git a/src/Dependency/Extractor/DependencyDataExtractor.php b/src/Dependency/Extractor/DependencyDataExtractor.php
diff --git a/src/Dependency/Extractor/DependencyDataExtractorInterface.php b/src/Dependency/Extractor/DependencyDataExtractorInterface.php
diff --git a/src/Dependency/Hydrator/DependencyHydrator.php b/src/Dependency/Hydrator/DependencyHydrator.php
@@ -16,17 +16,21 @@
 
 namespace Pimcore\Bundle\StudioBackendBundle\Dependency\Hydrator;
 
-use Pimcore\Bundle\StudioBackendBundle\Dependency\Extractor\DependencyDataExtractorInterface;
+use Pimcore\Bundle\StaticResolverBundle\Models\Element\ServiceResolverInterface;
 use Pimcore\Bundle\StudioBackendBundle\Dependency\Schema\Dependency;
+use Pimcore\Bundle\StudioBackendBundle\Util\Traits\ElementProviderTrait;
 
 /**
  * @internal
  */
 final readonly class DependencyHydrator implements DependencyHydratorInterface
 {
+    use ElementProviderTrait;
+
     public function __construct(
-        private DependencyDataExtractorInterface $dataExtractor
+        private ServiceResolverInterface $serviceResolver,
     ) {
+
     }
 
     public function hydrate(array $dependency): ?Dependency
@@ -38,7 +42,7 @@ public function hydrate(array $dependency): ?Dependency
             return null;
         }
 
-        $data = $this->dataExtractor->extractData($elementType, $elementId);
+        $data = $this->extractData($elementType, $elementId);
 
         return new Dependency(
             $data['id'],
@@ -48,4 +52,17 @@ public function hydrate(array $dependency): ?Dependency
             $data['published']
         );
     }
+
+    private function extractData(string $elementType, int $elementId): array
+    {
+        $element = $this->getElement($this->serviceResolver, $elementType, $elementId);
+
+        return [
+            'id' => $element->getId(),
+            'type' => $this->serviceResolver->getElementType($element),
+            'subtype' => $element->getType(),
+            'published' => $this->serviceResolver->isPublished($element),
+            'path' => $element->getRealFullPath(),
+        ];
+    }
 }