Cleanup old image

Author: karlomikus

CHANGELOG.md

@@ -20,6 +20,9 @@
         OPENAI_ORGANIZATION= #Optional
         ```
 
+## Fixes
+- Correctly clean up old image when new one is uploaded
+
 ## Changes
 - Removed feeds
 - Improved bar delete query plan

app/Services/Image/ImageService.php

@@ -39,7 +39,9 @@ public function uploadAndSaveImages(array $requestImages, int $userId): array
 
                 if ($dtoImage->image) {
                     try {
+                        $oldFilePath = $image->file_path;
                         [$filepath, $fileExtension, $thumbHash] = $this->processImageFile($dtoImage->image);
+                        $this->filesystem->delete($oldFilePath);
 
                         $image->file_path = $filepath;
                         $image->placeholder_hash = $thumbHash;

tests/Feature/Http/ImageControllerTest.php

@@ -54,6 +54,51 @@ public function test_single_image_upload(): void
         Storage::disk('uploads')->assertExists($filename);
     }
 
+    public function test_single_image_upload_updates_old_image(): void
+    {
+        $s = Storage::fake('uploads');
+        File::ensureDirectoryExists($s->path('temp'));
+
+        $response = $this->post('/api/images', [
+            'images' => [
+                [
+                    'image' => UploadedFile::fake()->createWithContent('image.jpg', $this->getFakeImageContent('jpg')),
+                    'copyright' => 'Made with test',
+                    'sort' => 1,
+                ]
+            ],
+        ]);
+
+        $response->assertJson(function (AssertableJson $json) {
+            $json->has('data', 1, function ($json) {
+                $json->has('id')
+                    ->has('file_path')
+                    ->where('copyright', 'Made with test')
+                    ->etc();
+            });
+        });
+
+        $filename = $response->json('data.0.file_path');
+
+        Storage::disk('uploads')->assertExists($filename);
+
+        $oldId = $response->json('data.0.id');
+        $response = $this->post('/api/images', [
+            'images' => [
+                [
+                    'id' => $oldId,
+                    'image' => UploadedFile::fake()->createWithContent('image.jpg', $this->getFakeImageContent('jpg')),
+                    'copyright' => 'New image',
+                    'sort' => 2,
+                ]
+            ],
+        ]);
+        $newFilename = $response->json('data.0.file_path');
+
+        Storage::disk('uploads')->assertExists($newFilename);
+        Storage::disk('uploads')->assertMissing($filename);
+    }
+
     public function test_multiple_image_upload(): void
     {
         $s = Storage::fake('uploads');