Apply suggestion by covering all the relational types and improve exc…

…eption message
pimcore · Feb 19, 2024 · 72d32e9 · 72d32e9
1 parent b76286c
commit 72d32e9
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 1 deletion.
diff --git a/src/GraphQL/DataObjectInputProcessor/AdvancedManyToManyObjectRelation.php b/src/GraphQL/DataObjectInputProcessor/AdvancedManyToManyObjectRelation.php
@@ -21,6 +21,7 @@
 use Pimcore\Model\DataObject\Concrete;
 use Pimcore\Model\DataObject\Data\ObjectMetadata;
 use Pimcore\Model\DataObject\Fieldcollection\Data\AbstractData;
+use Pimcore\Model\Exception\NotFoundException;
 
 class AdvancedManyToManyObjectRelation extends Base
 {
@@ -58,6 +59,13 @@ public function process($object, $newValue, $args, $context, ResolveInfo $info)
                             $item->setData($data);
                         }
                         $result[] = $item;
+                    } else {
+                        throw new NotFoundException(
+                            sprintf('Element with id %s or fullpath %s not found',
+                                $newValueItemValue['id'],
+                                $newValueItemValue['fullpath']
+                            )
+                        );
                     }
                 }
             }

diff --git a/src/GraphQL/DataObjectInputProcessor/AdvancedManyToManyRelation.php b/src/GraphQL/DataObjectInputProcessor/AdvancedManyToManyRelation.php
@@ -21,6 +21,7 @@
 use Pimcore\Model\DataObject\Concrete;
 use Pimcore\Model\DataObject\Data\ElementMetadata;
 use Pimcore\Model\DataObject\Fieldcollection\Data\AbstractData;
+use Pimcore\Model\Exception\NotFoundException;
 
 class AdvancedManyToManyRelation extends Base
 {
@@ -57,6 +58,13 @@ public function process($object, $newValue, $args, $context, ResolveInfo $info)
                             $item->setData($data);
                         }
                         $result[] = $item;
+                    } else {
+                        throw new NotFoundException(
+                            sprintf('Element with id %s or fullpath %s not found',
+                                $newValueItemValue['id'],
+                                $newValueItemValue['fullpath']
+                            )
+                        );
                     }
                 }
             }

diff --git a/src/GraphQL/DataObjectInputProcessor/ManyToManyObjectRelation.php b/src/GraphQL/DataObjectInputProcessor/ManyToManyObjectRelation.php
@@ -21,6 +21,7 @@
 use Pimcore\Bundle\DataHubBundle\GraphQL\Traits\ElementIdentificationTrait;
 use Pimcore\Model\DataObject\Concrete;
 use Pimcore\Model\DataObject\Fieldcollection\Data\AbstractData;
+use Pimcore\Model\Exception\NotFoundException;
 
 class ManyToManyObjectRelation extends Base
 {
@@ -50,6 +51,13 @@ public function process($object, $newValue, $args, $context, ResolveInfo $info)
 
                     if ($element) {
                         $result[] = $element;
+                    } else {
+                        throw new NotFoundException(
+                            sprintf('Element with id %s or fullpath %s not found',
+                                $newValueItemValue['id'],
+                                $newValueItemValue['fullpath']
+                            )
+                        );
                     }
                 }
             }

diff --git a/src/GraphQL/DataObjectInputProcessor/ManyToManyRelation.php b/src/GraphQL/DataObjectInputProcessor/ManyToManyRelation.php
@@ -48,7 +48,10 @@ public function process($object, $newValue, $args, $context, ResolveInfo $info)
                         $result[] = $element;
                     } else {
                         throw new NotFoundException(
-                            "Doesn't found element: " . $newValueItemValue['fullpath']
+                            sprintf('Element with id %s or fullpath %s not found',
+                                $newValueItemValue['id'],
+                                $newValueItemValue['fullpath']
+                            )
                         );
                     }
                 }

diff --git a/src/GraphQL/DataObjectInputProcessor/ManyToOneRelation.php b/src/GraphQL/DataObjectInputProcessor/ManyToOneRelation.php
@@ -20,6 +20,7 @@
 use Pimcore\Bundle\DataHubBundle\GraphQL\Traits\ElementIdentificationTrait;
 use Pimcore\Model\DataObject\Concrete;
 use Pimcore\Model\DataObject\Fieldcollection\Data\AbstractData;
+use Pimcore\Model\Exception\NotFoundException;
 
 class ManyToOneRelation extends Base
 {
@@ -40,10 +41,20 @@ public function process($object, $newValue, $args, $context, ResolveInfo $info):
         $me = $this;
         Service::setValue($object, $attribute, function ($container, $setter) use ($newValue) {
             $element = null;
+
             if (is_array($newValue)) {
                 $element = $this->getElementByTypeAndIdOrPath($newValue);
             }
 
+            if (!$element) {
+                throw new NotFoundException(
+                    sprintf('Element with id %s or fullpath %s not found',
+                        $newValue['id'],
+                        $newValue['fullpath']
+                    )
+                );
+            }
+
             return $container->$setter($element);
         });
     }