BUGFIX: Type issues with tagging assets

Author: Sebobo

Classes/GraphQL/Mutator/AssetMutator.php

@@ -198,12 +198,15 @@ public function setAssetTags(
         Types\AssetSourceId $assetSourceId,
         Types\TagIds $tagIds
     ): ?Types\Asset {
-        $asset = $this->assetSourceContext->getAssetProxy($id, $assetSourceId);
+        $asset = $this->assetSourceContext->getAsset($id, $assetSourceId);
         if (!$asset) {
             throw new MediaUiException('Cannot tag asset that was never imported', 1594621322);
         }
         if (!$asset instanceof Asset) {
-            throw new MediaUiException('Asset type does not support tagging', 1619081714);
+            throw new MediaUiException(
+                sprintf('Asset type %s does not support tagging', $asset::class),
+                1619081714
+            );
         }
 
         $tags = new ArrayCollection();
@@ -233,7 +236,7 @@ public function setAssetCollections(
         Types\AssetSourceId $assetSourceId,
         Types\AssetCollectionIds $assetCollectionIds
     ): MutationResult {
-        $asset = $this->assetSourceContext->getAssetProxy($id, $assetSourceId);
+        $asset = $this->assetSourceContext->getAsset($id, $assetSourceId);
         if (!$asset) {
             throw new MediaUiException('Cannot assign collections to asset that was never imported', 1594621322);
         }
@@ -265,7 +268,7 @@ public function setAssetCollections(
      */
     public function untagAsset(Types\AssetId $id, Types\AssetSourceId $assetSourceId, Types\TagId $tagId): ?Types\Asset
     {
-        $asset = $this->assetSourceContext->getAssetProxy($id, $assetSourceId);
+        $asset = $this->assetSourceContext->getAsset($id, $assetSourceId);
         if (!$asset) {
             throw new MediaUiException('Cannot untag asset that was never imported', 1591561930);
         }

Tests/Functional/AbstractMediaTestCase.php

@@ -11,12 +11,15 @@
  * source code.
  */
 
+use Flowpack\Media\Ui\GraphQL\Types;
 use Neos\Flow\Persistence\PersistenceManagerInterface;
 use Neos\Flow\ResourceManagement\PersistentResource;
 use Neos\Flow\ResourceManagement\ResourceManager;
 use Neos\Flow\Tests\FunctionalTestCase;
 use Neos\Utility\Files;
 
+use function Wwwision\Types\instantiate;
+
 /**
  * Abstract Functional Test template
  */
@@ -89,10 +92,21 @@ protected function prepareTemporaryDirectory()
 
     /**
      * Initializes the resource manager and modifies the persistent resource storage location.
-     * @return void
      */
-    protected function prepareResourceManager()
+    protected function prepareResourceManager(): void
     {
         $this->resourceManager = $this->objectManager->get(ResourceManager::class);
     }
+
+    protected static function createFile(): Types\UploadedFile
+    {
+        $fileContent = Files::getFileContents(__DIR__ . '/Fixtures/norman.svg');
+        return instantiate(Types\UploadedFile::class, [
+            'streamOrFile' => $fileContent,
+            'size' => strlen($fileContent),
+            'clientMediaType' => 'image/svg+xml',
+            'clientFilename' => 'test.svg',
+            'errorStatus' => 0,
+        ]);
+    }
 }

Tests/Functional/GraphQL/Fixtures/norman.svg renamed to Tests/Functional/Fixtures/norman.svg

@@ -20,7 +20,6 @@
 use Flowpack\Media\Ui\Tests\Functional\AbstractMediaTestCase;
 use Neos\Flow\Persistence\Doctrine\PersistenceManager;
 use Neos\Flow\Tests\Behavior\Features\Bootstrap\SecurityOperationsTrait;
-use Neos\Utility\Files;
 
 use function Wwwision\Types\instantiate;
 
@@ -50,18 +49,6 @@ public function setUp(): void
         $this->iAmAuthenticatedWithRole('Neos.Neos:Editor');
     }
 
-    protected static function createFile(): Types\UploadedFile
-    {
-        $fileContent = Files::getFileContents(__DIR__ . '/Fixtures/norman.svg');
-        return instantiate(Types\UploadedFile::class, [
-            'streamOrFile' => $fileContent,
-            'size' => strlen($fileContent),
-            'clientMediaType' => 'image/svg+xml',
-            'clientFilename' => 'test.svg',
-            'errorStatus' => 0,
-        ]);
-    }
-
     public function testUploadFile(): void
     {
         $file = self::createFile();

Tests/Functional/GraphQL/AssetApiTest.php

@@ -16,6 +16,7 @@
 
 use Flowpack\Media\Ui\GraphQL\MediaApi;
 use Flowpack\Media\Ui\GraphQL\Resolver\Type\AssetCollectionResolver;
+use Flowpack\Media\Ui\GraphQL\Resolver\Type\AssetResolver;
 use Flowpack\Media\Ui\GraphQL\Types;
 use Flowpack\Media\Ui\Tests\Functional\AbstractMediaTestCase;
 use Neos\Flow\Persistence\Doctrine\PersistenceManager;
@@ -39,6 +40,7 @@ public function setUp(): void
 
         $this->mediaApi = $this->objectManager->get(MediaApi::class);
         $this->assetCollectionResolver = $this->objectManager->get(AssetCollectionResolver::class);
+        $this->assetResolver = $this->objectManager->get(AssetResolver::class);
     }
 
     public function testCreateTag(): void
@@ -82,4 +84,36 @@ public function testTagAssetCollection(): void
             'The tag should be associated with the asset collection'
         );
     }
+
+    public function testTagAsset(): void
+    {
+        $file = self::createFile();
+        $result = $this->mediaApi->uploadFile($file);
+        $this->assertTrue($result->success);
+
+        $this->persistenceManager->persistAll();
+        $assets = $this->mediaApi->assets();
+        /** @var Types\Asset $uploadedAsset */
+        $uploadedAsset = $assets->getIterator()->current();
+
+        $tag = $this->mediaApi->createTag(Types\TagLabel::fromString('Test Tag'));
+        $this->mediaApi->tagAsset(
+            $uploadedAsset->id,
+            $uploadedAsset->assetSource->id,
+            $tag->id
+        );
+
+        $resolvedTags = $this->assetResolver->tags($uploadedAsset);
+        $this->assertCount(1, $resolvedTags->tags);
+        $this->assertEquals('Test Tag', $resolvedTags->tags[0]->label);
+
+        $this->mediaApi->untagAsset(
+            $uploadedAsset->id,
+            $uploadedAsset->assetSource->id,
+            $tag->id
+        );
+
+        $resolvedTags = $this->assetResolver->tags($uploadedAsset);
+        $this->assertCount(0, $resolvedTags->tags);
+    }
 }