[Tags][Notes] Data objects API problem (#445)

* use correct type for data objects * Apply php-cs-fixer changes * fix batch assignment --------- Co-authored-by: lukmzig <[email protected]>
pimcore · Sep 27, 2024 · d5864bd · d5864bd
1 parent b41c33a
commit d5864bd
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 2 deletions.
diff --git a/src/Note/MappedParameter/NoteElementParameters.php b/src/Note/MappedParameter/NoteElementParameters.php
@@ -16,6 +16,10 @@
 
 namespace Pimcore\Bundle\StudioBackendBundle\Note\MappedParameter;
 
+use Pimcore\Bundle\StudioBackendBundle\Exception\Api\InvalidElementTypeException;
+use Pimcore\Bundle\StudioBackendBundle\Util\Constant\ElementTypes;
+use function in_array;
+
 /**
  * @internal
  */
@@ -26,15 +30,30 @@ public function __construct(
         private ?int $id = null,
 
     ) {
+        $this->validate();
     }
 
     public function getType(): ?string
     {
+        if ($this->type === ElementTypes::TYPE_DATA_OBJECT) {
+            return ElementTypes::TYPE_OBJECT;
+        }
+
         return $this->type;
     }
 
     public function getId(): ?int
     {
         return $this->id;
     }
+
+    /**
+     * @throws InvalidElementTypeException
+     */
+    private function validate(): void
+    {
+        if (!in_array($this->type, ElementTypes::ALLOWED_TYPES, true)) {
+            throw new InvalidElementTypeException($this->type);
+        }
+    }
 }
diff --git a/src/Tag/Controller/Element/BatchAssignController.php b/src/Tag/Controller/Element/BatchAssignController.php
@@ -20,6 +20,7 @@
 use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
 use Pimcore\Bundle\StudioBackendBundle\Exception\Api\ElementSavingFailedException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\Api\NotFoundException;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\ElementTypeParameter as MappedElementTypeParameter;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attribute\Parameter\Path\ElementTypeParameter;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attribute\Response\DefaultResponses;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags;
@@ -74,7 +75,7 @@ public function assignTag(
     ): JsonResponse {
         $this->tagService->batchAssignTagsToElements(
             new BatchCollectionParameters(
-                $elementType,
+                (new MappedElementTypeParameter($elementType))->getType(),
                 $elementTagCollection->getElementIds(),
                 $elementTagCollection->getTagsIds()
             )

diff --git a/src/Tag/Controller/Element/BatchReplaceController.php b/src/Tag/Controller/Element/BatchReplaceController.php
@@ -20,6 +20,7 @@
 use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
 use Pimcore\Bundle\StudioBackendBundle\Exception\Api\ElementSavingFailedException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\Api\NotFoundException;
+use Pimcore\Bundle\StudioBackendBundle\MappedParameter\ElementTypeParameter as MappedElementTypeParameter;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attribute\Parameter\Path\ElementTypeParameter;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attribute\Response\DefaultResponses;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags;
@@ -74,7 +75,7 @@ public function assignTag(
     ): JsonResponse {
         $this->tagService->batchReplaceTagsToElements(
             new BatchCollectionParameters(
-                $elementType,
+                (new MappedElementTypeParameter($elementType))->getType(),
                 $elementTagCollection->getElementIds(),
                 $elementTagCollection->getTagsIds()
             )

diff --git a/src/Tag/MappedParameter/ElementParameters.php b/src/Tag/MappedParameter/ElementParameters.php
@@ -16,6 +16,10 @@
 
 namespace Pimcore\Bundle\StudioBackendBundle\Tag\MappedParameter;
 
+use Pimcore\Bundle\StudioBackendBundle\Exception\Api\InvalidElementTypeException;
+use Pimcore\Bundle\StudioBackendBundle\Util\Constant\ElementTypes;
+use function in_array;
+
 /**
  * @internal
  */
@@ -25,15 +29,30 @@ public function __construct(
         private ?string $type = null,
         private ?int $id = null
     ) {
+        $this->validate();
     }
 
     public function getType(): ?string
     {
+        if ($this->type === ElementTypes::TYPE_DATA_OBJECT) {
+            return ElementTypes::TYPE_OBJECT;
+        }
+
         return $this->type;
     }
 
     public function getId(): ?int
     {
         return $this->id;
     }
+
+    /**
+     * @throws InvalidElementTypeException
+     */
+    private function validate(): void
+    {
+        if (!in_array($this->type, ElementTypes::ALLOWED_TYPES, true)) {
+            throw new InvalidElementTypeException($this->type);
+        }
+    }
 }