Correctly parse @id referenced entities in API

Fixes issue #1370

Author: jbtronics

src/Serializer/APIPlatform/SkippableItemNormalizer.php

@@ -63,9 +63,15 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
         // check (line 271). For abstract resource classes with a discriminator map (e.g. Attachment), this
         // fails because the array has no _type key. Fix by resolving IRI strings directly.
         // See: https://github.com/Part-DB/Part-DB-server/issues/1370
-        if (is_string($data)) {
+        if (is_string($data) || (is_array($data) && isset($data['@id']) && is_string($data['@id']))) {
+            if (is_array($data)) {
+                $iri = $data['@id'];
+            } else {
+                $iri = $data;
+            }
+
             try {
-                return $this->iriConverter->getResourceFromIri($data, $context + ['fetch_data' => true]);
+                return $this->iriConverter->getResourceFromIri($iri, $context + ['fetch_data' => true]);
             } catch (ItemNotFoundException $e) {
                 if (false === ($context['denormalize_throw_on_relation_not_found'] ?? true)) {
                     return null;
@@ -76,7 +82,7 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
                 throw NotNormalizableValueException::createForUnexpectedDataType($e->getMessage(), $data, [$type], $context['deserialization_path'] ?? null, true, $e->getCode(), $e);
             } catch (InvalidArgumentException $e) {
                 if (!isset($context['not_normalizable_value_exceptions'])) {
-                    throw new UnexpectedValueException(sprintf('Invalid IRI "%s".', $data), $e->getCode(), $e);
+                    throw new UnexpectedValueException(sprintf('Invalid IRI "%s".', $iri), $e->getCode(), $e);
                 }
                 throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('Invalid IRI "%s".', $data), $data, [$type], $context['deserialization_path'] ?? null, true, $e->getCode(), $e);
             }

tests/API/Endpoints/PartEndpointTest.php

@@ -70,7 +70,7 @@ public function testDeleteItem(): void
         $this->_testDeleteItem(1);
     }
 
-    public function testAttachmentPatchWithIRI(): void
+    public function testMasterPictureAttachmentPatchWithIRI(): void
     {
         $client = static::createAuthenticatedClient();
 
@@ -93,4 +93,28 @@ public function testAttachmentPatchWithIRI(): void
         self::assertResponseIsSuccessful();
         self::assertJsonContains(['master_picture_attachment' => ['@id' => $attachmentIri]]);
     }
+
+    public function testMasterPictureAttachmentPatchWithArray(): void
+    {
+        $client = static::createAuthenticatedClient();
+
+        // Create a new attachment with a picture URL for Part 1
+        $response = $client->request('POST', '/api/attachments', ['json' => [
+            'name' => 'Test Picture',
+            'url' => 'http://example.com/test.jpg',
+            '_type' => 'Part',
+            'element' => '/api/parts/1',
+            'attachment_type' => '/api/attachment_types/1',
+        ]]);
+        self::assertResponseIsSuccessful();
+        $attachmentIri = $response->toArray()['@id'];
+
+        // Now PATCH Part 1 to set master_picture_attachment
+        $client->request('PATCH', '/api/parts/1', [
+            'json' => ['master_picture_attachment' => ['@id' => $attachmentIri, '_type' => 'Part']],
+            'headers' => ['Content-Type' => 'application/merge-patch+json'],
+        ]);
+        self::assertResponseIsSuccessful();
+        self::assertJsonContains(['master_picture_attachment' => ['@id' => $attachmentIri]]);
+    }
 }