Attachment API: Fixed error when name not provided in update

Fixes #5353

diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index 033f2334104b44f008d0ce29ecdc84bc68a33117..dabd537292f4823eb7a93faada344f59cc2b2a93 100644 (file)
--- a/app/Uploads/AttachmentService.php
+++ b/app/Uploads/AttachmentService.php
@@ -116,16 +116,18 @@ class AttachmentService
      */
     public function updateFile(Attachment $attachment, array $requestData): Attachment
     {
      */
     public function updateFile(Attachment $attachment, array $requestData): Attachment
     {

-        $attachment->name = $requestData['name'];
-        $link = trim($requestData['link'] ?? '');
+        if (isset($requestData['name'])) {
+            $attachment->name = $requestData['name'];
+        }

 
 

+        $link = trim($requestData['link'] ?? '');

         if (!empty($link)) {
             if (!$attachment->external) {
                 $this->deleteFileInStorage($attachment);
                 $attachment->external = true;
                 $attachment->extension = '';
             }
         if (!empty($link)) {
             if (!$attachment->external) {
                 $this->deleteFileInStorage($attachment);
                 $attachment->external = true;
                 $attachment->extension = '';
             }

-            $attachment->path = $requestData['link'];
+            $attachment->path = $link;

         }
 
         $attachment->save();
         }
 
         $attachment->save();

diff --git a/tests/Api/AttachmentsApiTest.php b/tests/Api/AttachmentsApiTest.php
index b03f280ac6784074ab692df20b3ded892d6c8f32..b234658792482b76bcd89717d1e250f51ba6fb68 100644 (file)
--- a/tests/Api/AttachmentsApiTest.php
+++ b/tests/Api/AttachmentsApiTest.php
@@ -12,7 +12,7 @@ class AttachmentsApiTest extends TestCase
 {
     use TestsApi;
 
 {
     use TestsApi;
 

-    protected $baseEndpoint = '/api/attachments';
+    protected string $baseEndpoint = '/api/attachments';

 
     public function test_index_endpoint_returns_expected_book()
     {
 
     public function test_index_endpoint_returns_expected_book()
     {


@@ -302,6 +302,23 @@ class AttachmentsApiTest extends TestCase
     }
 
     public function test_update_file_attachment_to_link()
     }
 
     public function test_update_file_attachment_to_link()

+    {
+        $this->actingAsApiAdmin();
+        $page = $this->entities->page();
+        $attachment = $this->createAttachmentForPage($page);
+
+        $resp = $this->putJson("{$this->baseEndpoint}/{$attachment->id}", [
+            'link' => 'https://example.com/donkey',
+        ]);
+
+        $resp->assertStatus(200);
+        $this->assertDatabaseHas('attachments', [
+            'id' => $attachment->id,
+            'path' => 'https://example.com/donkey',
+        ]);
+    }
+
+    public function test_update_does_not_require_name()

     {
         $this->actingAsApiAdmin();
         $page = $this->entities->page();
     {
         $this->actingAsApiAdmin();
         $page = $this->entities->page();