BUGFIX: Convert tags for collections

Author: Sebobo

Classes/GraphQL/Resolver/Type/AssetCollectionResolver.php

@@ -20,6 +20,7 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Persistence\PersistenceManagerInterface;
 use Neos\Media\Domain\Model\AssetCollection;
+use Neos\Media\Domain\Model\Tag;
 use Neos\Media\Domain\Repository\AssetCollectionRepository;
 use Neos\Media\Domain\Repository\AssetRepository;
 use Neos\Neos\Domain\Model\Site;
@@ -83,8 +84,14 @@ public function tags(Types\AssetCollection $assetCollection): Types\Tags
     {
         /** @var AssetCollection $originalAssetCollection */
         $originalAssetCollection = $this->assetCollectionRepository->findByIdentifier($assetCollection->id->value);
-        return $originalAssetCollection ?
-            Types\Tags::fromArray($originalAssetCollection->getTags()->toArray()) : Types\Tags::empty();
+
+        return $originalAssetCollection ? Types\Tags::fromArray(array_map(
+            fn(Tag $tag) => instantiate(Types\Tag::class, [
+                'id' => $this->persistenceManager->getIdentifierByObject($tag),
+                'label' => $tag->getLabel(),
+            ]),
+            $originalAssetCollection->getTags()->toArray()
+        )) : Types\Tags::empty();
     }
 
     public function parent(Types\AssetCollection $assetCollection): ?Types\AssetCollectionParent

Tests/Functional/GraphQL/TagApiTest.php

@@ -15,6 +15,7 @@
  */
 
 use Flowpack\Media\Ui\GraphQL\MediaApi;
+use Flowpack\Media\Ui\GraphQL\Resolver\Type\AssetCollectionResolver;
 use Flowpack\Media\Ui\GraphQL\Types;
 use Flowpack\Media\Ui\Tests\Functional\AbstractMediaTestCase;
 use Neos\Flow\Persistence\Doctrine\PersistenceManager;
@@ -37,6 +38,7 @@ public function setUp(): void
         }
 
         $this->mediaApi = $this->objectManager->get(MediaApi::class);
+        $this->assetCollectionResolver = $this->objectManager->get(AssetCollectionResolver::class);
     }
 
     public function testCreateTag(): void
@@ -63,4 +65,21 @@ public function testDeleteTag(): void
         $deletedTag = $this->mediaApi->tag($tag->id);
         $this->assertNull($deletedTag);
     }
+
+    public function testTagAssetCollection(): void
+    {
+        $assetCollection = $this->mediaApi->createAssetCollection(
+            Types\AssetCollectionTitle::fromString('Test Collection')
+        );
+        $tag = $this->mediaApi->createTag('Test Tag', $assetCollection->id);
+        $createdTag = $this->mediaApi->tag($tag->id);
+
+        $resolvedTags = $this->assetCollectionResolver->tags($assetCollection);
+        $this->assertCount(1, $resolvedTags->tags);
+        $this->assertEquals(
+            $createdTag,
+            $resolvedTags->tags[0],
+            'The tag should be associated with the asset collection'
+        );
+    }
 }