Add Files page upload flow with manual folders and duplicate handling.

Users can create folders, upload files or folders, and choose replace or keep both on name conflicts instead of auto-grouping by transfer.

Co-authored-by: Cursor <cursoragent@cursor.com>

tests/Feature/TransferFilesTest.php

@@ -16,7 +16,16 @@ class TransferFilesTest extends TestCase
     use FakesTransferBilling;
     use RefreshDatabase;
 
-    private function createTransfer(User $user, string $title, string $filename): Transfer
+    private function createUser(): User
+    {
+        return User::create([
+            'public_id' => (string) Str::uuid(),
+            'name' => 'Test User',
+            'email' => 'transfer+'.uniqid().'@example.com',
+        ]);
+    }
+
+    private function createShareTransfer(User $user, string $title, string $filename): Transfer
     {
         $this->actingAs($user)->post(route('transfer.transfers.store'), [
             'title' => $title,
@@ -26,18 +35,22 @@ class TransferFilesTest extends TestCase
         return Transfer::query()->where('title', $title)->firstOrFail();
     }
 
+    private function createFolder(User $user, string $name): Transfer
+    {
+        $this->actingAs($user)->post(route('transfer.files.folders.store'), [
+            'name' => $name,
+        ])->assertRedirect();
+
+        return Transfer::query()->where('title', $name)->where('is_folder', true)->firstOrFail();
+    }
+
     public function test_owner_can_download_file(): void
     {
         Storage::fake('qr');
         $this->fakeTransferBillingApi();
 
-        $user = User::create([
-            'public_id' => (string) Str::uuid(),
-            'name' => 'Test User',
-            'email' => 'transfer+'.uniqid().'@example.com',
-        ]);
-
-        $transfer = $this->createTransfer($user, 'Docs', 'brief.pdf');
+        $user = $this->createUser();
+        $transfer = $this->createShareTransfer($user, 'Docs', 'brief.pdf');
         $file = $transfer->files()->first();
 
         $this->actingAs($user)
@@ -50,13 +63,8 @@ class TransferFilesTest extends TestCase
         Storage::fake('qr');
         $this->fakeTransferBillingApi();
 
-        $user = User::create([
-            'public_id' => (string) Str::uuid(),
-            'name' => 'Test User',
-            'email' => 'transfer+'.uniqid().'@example.com',
-        ]);
-
-        $transfer = $this->createTransfer($user, 'Docs', 'brief.pdf');
+        $user = $this->createUser();
+        $transfer = $this->createShareTransfer($user, 'Docs', 'brief.pdf');
         $file = $transfer->files()->first();
 
         $this->actingAs($user)
@@ -66,48 +74,96 @@ class TransferFilesTest extends TestCase
         $this->assertDatabaseMissing('transfer_files', ['id' => $file->id]);
     }
 
-    public function test_owner_can_move_file_to_another_transfer(): void
+    public function test_owner_can_move_file_into_user_folder(): void
     {
         Storage::fake('qr');
         $this->fakeTransferBillingApi();
 
-        $user = User::create([
-            'public_id' => (string) Str::uuid(),
-            'name' => 'Test User',
-            'email' => 'transfer+'.uniqid().'@example.com',
-        ]);
-
-        $source = $this->createTransfer($user, 'Source folder', 'one.pdf');
-        $destination = $this->createTransfer($user, 'Destination folder', 'two.pdf');
-        $file = $source->files()->first();
+        $user = $this->createUser();
+        $this->createShareTransfer($user, 'Loose file', 'one.pdf');
+        $file = Transfer::query()->where('title', 'Loose file')->first()->files()->first();
+        $folder = $this->createFolder($user, 'Destination folder');
 
         $this->actingAs($user)
             ->post(route('transfer.files.move'), [
-                'destination' => $destination->id,
+                'destination' => $folder->id,
                 'files' => [$file->id],
             ])
-            ->assertRedirect(route('transfer.files.index', ['folder' => $destination->id]));
+            ->assertRedirect(route('transfer.files.index', ['folder' => $folder->id]));
 
-        $this->assertSame($destination->id, $file->fresh()->transfer_id);
+        $this->assertSame($folder->id, $file->fresh()->transfer_id);
     }
 
-    public function test_files_index_supports_folder_filter(): void
+    public function test_files_index_shows_user_folder(): void
     {
         Storage::fake('qr');
         $this->fakeTransferBillingApi();
 
-        $user = User::create([
-            'public_id' => (string) Str::uuid(),
-            'name' => 'Test User',
-            'email' => 'transfer+'.uniqid().'@example.com',
-        ]);
-
-        $transfer = $this->createTransfer($user, 'BKC', 'cover.psd');
+        $user = $this->createUser();
+        $folder = $this->createFolder($user, 'BKC');
 
         $this->actingAs($user)
-            ->get(route('transfer.files.index', ['folder' => $transfer->id]))
+            ->get(route('transfer.files.index'))
+            ->assertOk()
+            ->assertSee('BKC');
+
+        $this->actingAs($user)
+            ->get(route('transfer.files.index', ['folder' => $folder->id]))
             ->assertOk()
-            ->assertSee('cover.psd')
             ->assertSee('BKC');
     }
+
+    public function test_upload_detects_duplicate_filenames(): void
+    {
+        Storage::fake('qr');
+        $this->fakeTransferBillingApi();
+
+        $user = $this->createUser();
+        $this->createShareTransfer($user, 'Docs', 'brief.pdf');
+
+        $this->actingAs($user)
+            ->postJson(route('transfer.files.upload.check'), [
+                'filenames' => ['brief.pdf', 'new.docx'],
+            ])
+            ->assertOk()
+            ->assertJsonPath('conflicts.0.filename', 'brief.pdf');
+    }
+
+    public function test_upload_can_replace_duplicate_file(): void
+    {
+        Storage::fake('qr');
+        $this->fakeTransferBillingApi();
+
+        $user = $this->createUser();
+        $this->createShareTransfer($user, 'Docs', 'brief.pdf');
+
+        $this->actingAs($user)
+            ->post(route('transfer.files.upload'), [
+                'files' => [UploadedFile::fake()->create('brief.pdf', 80, 'application/pdf')],
+                'resolutions' => ['brief.pdf' => 'replace'],
+            ])
+            ->assertRedirect();
+
+        $this->assertSame(1, \App\Models\TransferFile::query()->count());
+        $this->assertDatabaseHas('transfer_files', ['original_name' => 'brief.pdf']);
+    }
+
+    public function test_upload_keep_both_renames_duplicate(): void
+    {
+        Storage::fake('qr');
+        $this->fakeTransferBillingApi();
+
+        $user = $this->createUser();
+        $this->createShareTransfer($user, 'Docs', 'brief.pdf');
+
+        $this->actingAs($user)
+            ->post(route('transfer.files.upload'), [
+                'files' => [UploadedFile::fake()->create('brief.pdf', 80, 'application/pdf')],
+                'resolutions' => ['brief.pdf' => 'keep_both'],
+            ])
+            ->assertRedirect();
+
+        $this->assertDatabaseHas('transfer_files', ['original_name' => 'brief.pdf']);
+        $this->assertDatabaseHas('transfer_files', ['original_name' => 'brief (1).pdf']);
+    }
 }