chore: Forward element instance to the element resolver to allow furt…

…her usage of mock objects avoiding db loads.
CandoImage · Jul 19, 2024 · 10c4abd · 10c4abd
1 parent b5f0b32
commit 10c4abd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/GraphQL/FieldHelper/AbstractFieldHelper.php b/src/GraphQL/FieldHelper/AbstractFieldHelper.php
@@ -23,6 +23,7 @@
 use GraphQL\Language\AST\SelectionSetNode;
 use GraphQL\Type\Definition\ResolveInfo;
 use Pimcore\Bundle\DataHubBundle\GraphQL\Traits\ServiceTrait;
+use Pimcore\Bundle\EcommerceFrameworkBundle\Model\DefaultMockup;
 use Pimcore\Model\Element\ElementInterface;
 
 abstract class AbstractFieldHelper
@@ -118,10 +119,13 @@ public function getArguments(FieldNode $ast)
      */
     public function extractData(&$data, $container, $args, $context = [], ResolveInfo $resolveInfo = null)
     {
-        if ($container instanceof ElementInterface) {
+        if ($container instanceof ElementInterface || $container instanceof DefaultMockup) {
             // we have to at least add the ID and pass it around even if not requested because we need it internally
             // to resolve fields of linked elements (such as asset image and so on)
             $data['id'] = $container->getId();
+            // Register the element for downstream resolvers to avoid object
+            // loads.
+            $data[ElementInterface::class] = $container;
         }
 
         $resolveInfoArray = (array)$resolveInfo;

diff --git a/src/GraphQL/Resolver/Element.php b/src/GraphQL/Resolver/Element.php
@@ -57,7 +57,7 @@ public function __construct(string $elementType, Service $graphQlService)
      */
     public function resolveTag($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
-        $element = ElementService::getElementById($this->elementType, $value['id']);
+        $element = $value[ElementInterface::class] ?? ElementService::getElementById($this->elementType, $value['id']);
 
         if ($element) {
             $result = $this->getTags('document', $element->getId());
@@ -82,7 +82,7 @@ public function resolveTag($value = null, $args = [], $context = [], ResolveInfo
     public function resolveProperties($value = null, array $args = [], array $context = [], ResolveInfo $resolveInfo = null)
     {
         $elementId = $value['id'];
-        $element = ElementService::getElementById($this->elementType, $elementId);
+        $element = $value[ElementInterface::class] ?? ElementService::getElementById($this->elementType, $elementId);
 
         if (!$element) {
             throw new ClientSafeException('element ' . $this->elementType . ' ' . $elementId . ' not found');
@@ -116,7 +116,7 @@ public function resolveProperties($value = null, array $args = [], array $contex
      */
     public function resolveParent($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
-        $element = ElementService::getElementById($this->elementType, $value['id']);
+        $element = $value[ElementInterface::class] ?? ElementService::getElementById($this->elementType, $value['id']);
         if ($element) {
             $parent = $element->getParent();
             if ($parent) {
@@ -139,7 +139,8 @@ public function resolveParent($value = null, $args = [], $context = [], ResolveI
      */
     public function resolveChildren($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
-        $element = ElementService::getElementById($this->elementType, $value['id']);
+        $element = $value[ElementInterface::class] ?? ElementService::getElementById($this->elementType, $value['id']);
+
         if ($element) {
             $arguments = $this->composeArguments($args);
 
@@ -161,7 +162,7 @@ public function resolveChildren($value = null, $args = [], $context = [], Resolv
      */
     public function resolveSiblings($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null)
     {
-        $element = ElementService::getElementById($this->elementType, $value['id']);
+        $element = $value[ElementInterface::class] ?? ElementService::getElementById($this->elementType, $value['id']);
         if ($element) {
             $arguments = $this->composeArguments($args);