api refactoring

tests/Domain/UploadRequest/UploadRequestBrowsingTest.php

@@ -47,7 +47,7 @@ class UploadRequestBrowsingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->getJson("/api/upload-request/$uploadRequest->id/navigation")
+            ->getJson("/api/file-request/$uploadRequest->id/navigation")
             ->assertStatus(200)
             ->assertExactJson([
                 [
@@ -115,7 +115,7 @@ class UploadRequestBrowsingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->getJson("/api/upload-request/$uploadRequest->id/browse/$root->id")
+            ->getJson("/api/file-request/$uploadRequest->id/browse/$root->id")
             ->assertStatus(200)
             ->assertJsonFragment([
                 'id' => $root->id,
@@ -165,7 +165,7 @@ class UploadRequestBrowsingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->getJson("/api/upload-request/$uploadRequest->id/browse/$root->id")
+            ->getJson("/api/file-request/$uploadRequest->id/browse/$root->id")
             ->assertStatus(200)
             ->assertJsonFragment([
                 'id' => $root->id,

tests/Domain/UploadRequest/UploadRequestEditingTest.php

@@ -34,7 +34,7 @@ class UploadRequestEditingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->patchJson("/api/upload-request/$uploadRequest->id/rename/$folder->id", [
+            ->patchJson("/api/file-request/$uploadRequest->id/rename/$folder->id", [
                 'name' => 'Renamed Folder',
                 'type' => 'folder',
             ])
@@ -71,7 +71,7 @@ class UploadRequestEditingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->patchJson("/api/upload-request/$uploadRequest->id/rename/$file->id", [
+            ->patchJson("/api/file-request/$uploadRequest->id/rename/$file->id", [
                 'name' => 'Renamed File',
                 'type' => 'file',
             ])
@@ -102,7 +102,7 @@ class UploadRequestEditingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->postJson("/api/upload-request/$uploadRequest->id/create-folder", [
+            ->postJson("/api/file-request/$uploadRequest->id/create-folder", [
                 'name'      => 'New Folder',
                 'parent_id' => $uploadRequest->id,
             ])
@@ -162,7 +162,7 @@ class UploadRequestEditingTest extends TestCase
             });
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/remove", [
+            ->postJson("/api/file-request/$uploadRequest->id/remove", [
                 'items' => [
                     [
                         'id'           => $image->id,
@@ -170,7 +170,7 @@ class UploadRequestEditingTest extends TestCase
                         'force_delete' => true,
                     ],
                 ],
-            ])->assertStatus(204);
+            ])->assertStatus(200);
 
         // Assert primary file was deleted
         Storage::assertMissing("files/$user->id/fake-image.jpeg");
@@ -209,7 +209,7 @@ class UploadRequestEditingTest extends TestCase
         Storage::putFileAs("files/$user->id", $fakeFile, $fakeFile->name);
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/remove", [
+            ->postJson("/api/file-request/$uploadRequest->id/remove", [
                 'items' => [
                     [
                         'id'           => $file->id,
@@ -217,7 +217,7 @@ class UploadRequestEditingTest extends TestCase
                         'force_delete' => true,
                     ],
                 ],
-            ])->assertStatus(204);
+            ])->assertStatus(200);
 
         // Assert primary file was deleted
         Storage::assertMissing("files/$user->id/fake-file.pdf");
@@ -264,7 +264,7 @@ class UploadRequestEditingTest extends TestCase
         Storage::putFileAs("files/$user->id", $fakeFile, $fakeFile->name);
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/remove", [
+            ->postJson("/api/file-request/$uploadRequest->id/remove", [
                 'items' => [
                     [
                         'id'           => $folder->id,
@@ -272,7 +272,7 @@ class UploadRequestEditingTest extends TestCase
                         'force_delete' => true,
                     ],
                 ],
-            ])->assertStatus(204);
+            ])->assertStatus(200);
 
         $this
             ->assertDatabaseMissing('folders', [
@@ -317,7 +317,7 @@ class UploadRequestEditingTest extends TestCase
             ]);
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/move", [
+            ->postJson("/api/file-request/$uploadRequest->id/move", [
                 'to_id' => $folder->id,
                 'items' => [
                     [
@@ -325,7 +325,7 @@ class UploadRequestEditingTest extends TestCase
                         'id'   => $file->id,
                     ],
                 ],
-            ])->assertStatus(204);
+            ])->assertStatus(200);
 
         $this->assertDatabaseHas('files', [
             'id'        => $file->id,

tests/Domain/UploadRequest/UploadRequestTest.php

@@ -6,6 +6,7 @@ use Notification;
 use Tests\TestCase;
 use App\Users\Models\User;
 use Domain\Files\Models\File;
+use Domain\Folders\Models\Folder;
 use Illuminate\Http\UploadedFile;
 use Domain\UploadRequest\Models\UploadRequest;
 use Support\Scheduler\Actions\ExpireUnfilledUploadRequestAction;
@@ -34,17 +35,22 @@ class UploadRequestTest extends TestCase
             ->hasSettings()
             ->create();
 
+        $folder = Folder::factory()
+            ->create([
+                'user_id'     => $user->id,
+            ]);
+
         $this
             ->actingAs($user)
-            ->postJson('/api/upload-request', [
-                'folder_id' => '00cacdb9-1d09-4a32-8ad7-c0d45d66b758',
+            ->postJson('/api/file-request', [
+                'folder_id' => $folder->id,
                 'email'     => 'howdy@hi5ve.digital',
                 'notes'     => 'Please send me your files...',
             ])
             ->assertCreated();
 
         $this->assertDatabasehas('upload_requests', [
-            'folder_id' => '00cacdb9-1d09-4a32-8ad7-c0d45d66b758',
+            'folder_id' => $folder->id,
             'email'     => 'howdy@hi5ve.digital',
             'notes'     => 'Please send me your files...',
         ]);
@@ -61,16 +67,21 @@ class UploadRequestTest extends TestCase
             ->hasSettings()
             ->create();
 
+        $folder = Folder::factory()
+            ->create([
+                'user_id'     => $user->id,
+            ]);
+
         $this
             ->actingAs($user)
-            ->postJson('/api/upload-request', [
-                'folder_id' => '00cacdb9-1d09-4a32-8ad7-c0d45d66b758',
+            ->postJson('/api/file-request', [
+                'folder_id' => $folder->id,
                 'notes'     => 'Please send me your files...',
             ])
             ->assertCreated();
 
         $this->assertDatabasehas('upload_requests', [
-            'folder_id' => '00cacdb9-1d09-4a32-8ad7-c0d45d66b758',
+            'folder_id' => $folder->id,
             'notes'     => 'Please send me your files...',
             'email'     => null,
         ]);
@@ -87,17 +98,22 @@ class UploadRequestTest extends TestCase
             ->hasSettings()
             ->create();
 
+        $folder = Folder::factory()
+            ->create([
+                'user_id'     => $user->id,
+            ]);
+
         $this
             ->actingAs($user)
-            ->postJson('/api/upload-request', [
-                'folder_id' => '00cacdb9-1d09-4a32-8ad7-c0d45d66b758',
+            ->postJson('/api/file-request', [
+                'folder_id' => $folder->id,
                 'notes'     => 'Please send me your files...',
                 'name'      => 'My name',
             ])
             ->assertCreated();
 
         $this->assertDatabasehas('upload_requests', [
-            'folder_id' => '00cacdb9-1d09-4a32-8ad7-c0d45d66b758',
+            'folder_id' => $folder->id,
             'notes'     => 'Please send me your files...',
             'email'     => null,
             'name'      => 'My name',
@@ -121,7 +137,7 @@ class UploadRequestTest extends TestCase
                 'user_id' => $user->id,
             ]);
 
-        $this->getJson("/api/upload-request/$uploadRequest->id")
+        $this->getJson("/api/file-request/$uploadRequest->id")
             ->assertOk()
             ->assertJsonFragment([
                 'id' => $uploadRequest->id,
@@ -149,13 +165,11 @@ class UploadRequestTest extends TestCase
             ->create('fake-file.pdf', 12000000, 'application/pdf');
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/upload", [
-                'name'      => $file->name,
-                'extension' => 'pdf',
-                'file'      => $file,
-                'parent_id' => null,
-                'path'      => "/$file->name",
-                'is_last'   => 'true',
+            ->postJson("/api/file-request/$uploadRequest->id/upload/chunks", [
+                'name'            => $file->name,
+                'extension'       => 'pdf',
+                'chunk'           => $file,
+                'is_last_chunk'   => 1,
             ])->assertStatus(201);
 
         $this
@@ -195,13 +209,11 @@ class UploadRequestTest extends TestCase
             ->create('fake-file.pdf', 12000000, 'application/pdf');
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/upload", [
-                'name'      => $file->name,
-                'extension' => 'pdf',
-                'file'      => $file,
-                'parent_id' => null,
-                'path'      => "/$file->name",
-                'is_last'   => 'true',
+            ->postJson("/api/file-request/$uploadRequest->id/upload/chunks", [
+                'name'            => $file->name,
+                'extension'       => 'pdf',
+                'chunk'           => $file,
+                'is_last_chunk'   => 1,
             ])->assertStatus(201);
 
         $this
@@ -240,12 +252,10 @@ class UploadRequestTest extends TestCase
             ->create('fake-file.pdf', 12000000, 'application/pdf');
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/upload", [
-                'name'      => $file->name,
-                'file'      => $file,
-                'parent_id' => null,
-                'path'      => "/$file->name",
-                'is_last'   => 'true',
+            ->postJson("/api/file-request/$uploadRequest->id/upload/chunks", [
+                'name'            => $file->name,
+                'file'            => $file,
+                'is_last_chunk'   => 1,
             ])->assertStatus(410);
     }
 
@@ -265,12 +275,8 @@ class UploadRequestTest extends TestCase
             ]);
 
         $this
-            ->deleteJson("/api/upload-request/$uploadRequest->id")
-            ->assertStatus(201)
-            ->assertJsonFragment([
-                'id'     => $uploadRequest->id,
-                'status' => 'filled',
-            ]);
+            ->deleteJson("/api/file-request/$uploadRequest->id")
+            ->assertStatus(200);
 
         Notification::assertSentTo($user, UploadRequestFulfilledNotification::class);
     }
@@ -313,13 +319,11 @@ class UploadRequestTest extends TestCase
             ->create('fake-file.pdf', 12000000, 'application/pdf');
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/upload", [
-                'name'      => $file->name,
-                'extension' => 'pdf',
-                'file'      => $file,
-                'parent_id' => null,
-                'path'      => "/$file->name",
-                'is_last'   => 'true',
+            ->postJson("/api/file-request/$uploadRequest->id/upload/chunks", [
+                'name'            => $file->name,
+                'extension'       => 'pdf',
+                'chunk'           => $file,
+                'is_last_chunk'   => 1,
             ])->assertCreated();
 
         $this->travel(3)->hours();