From eb7b319ebd4d1e9b5d605e20bee67ca244b9bbff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Wed, 23 Feb 2022 10:39:50 +0100 Subject: [PATCH] get navigation tree for upload request --- resources/js/store/modules/fileBrowser.js | 7 +- routes/upload-request.php | 3 + .../Console/Commands/SetupDevEnvironment.php | 28 +++---- ...etFolderTreeForUploadRequestController.php | 35 ++++++++ tests/App/Users/PersonalAccessTokenTest.php | 2 +- tests/Domain/Admin/AdminTest.php | 2 +- tests/Domain/Browsing/BrowseTest.php | 18 ++--- tests/Domain/Files/ContentAccessTest.php | 2 +- tests/Domain/Files/FileTest.php | 2 +- tests/Domain/Folders/FavouriteFolderTest.php | 4 +- tests/Domain/Folders/FolderTest.php | 28 +++---- tests/Domain/Homepage/HomepageTest.php | 2 +- tests/Domain/Sharing/UserShareTest.php | 12 +-- tests/Domain/Sharing/VisitorBrowseTest.php | 16 ++-- .../Sharing/VisitorManipulatingTest.php | 22 ++--- tests/Domain/Spotlight/SearchTest.php | 2 +- tests/Domain/Teams/TeamFileAccessTest.php | 4 +- tests/Domain/Traffic/TrafficTest.php | 2 +- tests/Domain/Trash/TrashTest.php | 4 +- .../UploadRequestBrowsingTest.php | 80 +++++++++++++++++++ tests/Domain/Zip/SharedZippingTest.php | 12 +-- tests/Domain/Zip/UserZippingTest.php | 4 +- tests/Support/Gate/GateTest.php | 20 ++--- 23 files changed, 215 insertions(+), 96 deletions(-) create mode 100644 src/Domain/UploadRequest/Controllers/GetFolderTreeForUploadRequestController.php create mode 100644 tests/Domain/UploadRequest/UploadRequestBrowsingTest.php diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js index 3072b7ff..f5941b86 100644 --- a/resources/js/store/modules/fileBrowser.js +++ b/resources/js/store/modules/fileBrowser.js @@ -103,9 +103,10 @@ const actions = { getFolderTree: ({ commit, getters }) => { return new Promise((resolve, reject) => { // Get route - let route = getters.sharedDetail - ? `/api/browse/navigation/${router.currentRoute.params.token}` - : '/api/browse/navigation' + let route = { + RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/navigation`, + Public: `/api/browse/navigation/${router.currentRoute.params.token}`, + }[router.currentRoute.name] || '/api/browse/navigation' axios .get(route + getters.sorting.URI) diff --git a/routes/upload-request.php b/routes/upload-request.php index 2dda7d19..feb22527 100644 --- a/routes/upload-request.php +++ b/routes/upload-request.php @@ -2,6 +2,7 @@ use Domain\UploadRequest\Controllers\CreateFolderController; use Domain\UploadRequest\Controllers\DeleteFileOrFolderController; +use Domain\UploadRequest\Controllers\GetFolderTreeForUploadRequestController; use Tests\Domain\UploadRequest\RenameFileOrFolderController; use Domain\UploadRequest\Controllers\GetUploadRequestController; use Domain\UploadRequest\Controllers\CreateUploadRequestController; @@ -17,6 +18,8 @@ Route::patch('/{uploadRequest}/rename/{id}', RenameFileOrFolderController::class Route::post('/{uploadRequest}/create-folder', CreateFolderController::class); Route::post('/{uploadRequest}/remove', DeleteFileOrFolderController::class); +Route::get('/{uploadRequest}/navigation', GetFolderTreeForUploadRequestController::class); + Route::group(['middleware' => ['auth:sanctum']], function () { Route::post('/', CreateUploadRequestController::class); }); diff --git a/src/App/Console/Commands/SetupDevEnvironment.php b/src/App/Console/Commands/SetupDevEnvironment.php index dd5abab5..fcf9b6e8 100644 --- a/src/App/Console/Commands/SetupDevEnvironment.php +++ b/src/App/Console/Commands/SetupDevEnvironment.php @@ -188,7 +188,7 @@ class SetupDevEnvironment extends Command ->first(); // 1. - $shared_folder = Folder::factory(Folder::class) + $shared_folder = Folder::factory() ->create([ 'user_id' => $user->id, 'author' => 'user', @@ -215,7 +215,7 @@ class SetupDevEnvironment extends Command 'expire_in' => null, ]); - $peters_files = Folder::factory(Folder::class) + $peters_files = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $shared_folder->id, @@ -224,7 +224,7 @@ class SetupDevEnvironment extends Command ]); // 2. - $random_pics = Folder::factory(Folder::class) + $random_pics = Folder::factory() ->create([ 'user_id' => $user->id, 'author' => 'user', @@ -240,7 +240,7 @@ class SetupDevEnvironment extends Command 'created_at' => now()->subMinutes(1), ]); - $nature = Folder::factory(Folder::class) + $nature = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $random_pics->id, @@ -256,7 +256,7 @@ class SetupDevEnvironment extends Command ], ]); - $apartments = Folder::factory(Folder::class) + $apartments = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $random_pics->id, @@ -273,7 +273,7 @@ class SetupDevEnvironment extends Command ]); // 3. - $playable_media = Folder::factory(Folder::class) + $playable_media = Folder::factory() ->create([ 'user_id' => $user->id, 'author' => 'user', @@ -281,7 +281,7 @@ class SetupDevEnvironment extends Command 'created_at' => now()->subMinutes(2), ]); - $video = Folder::factory(Folder::class) + $video = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $playable_media->id, @@ -289,7 +289,7 @@ class SetupDevEnvironment extends Command 'name' => 'Video', ]); - $audio = Folder::factory(Folder::class) + $audio = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $playable_media->id, @@ -298,7 +298,7 @@ class SetupDevEnvironment extends Command ]); // 4. - $multi_level = Folder::factory(Folder::class) + $multi_level = Folder::factory() ->create([ 'user_id' => $user->id, 'author' => 'user', @@ -306,7 +306,7 @@ class SetupDevEnvironment extends Command 'created_at' => now()->subMinutes(3), ]); - $first_level = Folder::factory(Folder::class) + $first_level = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $multi_level->id, @@ -314,7 +314,7 @@ class SetupDevEnvironment extends Command 'name' => 'First Level', ]); - $second_level = Folder::factory(Folder::class) + $second_level = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $first_level->id, @@ -322,7 +322,7 @@ class SetupDevEnvironment extends Command 'name' => 'Second Level', ]); - Folder::factory(Folder::class) + Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $second_level->id, @@ -331,7 +331,7 @@ class SetupDevEnvironment extends Command ]); // 5. - $documents = Folder::factory(Folder::class) + $documents = Folder::factory() ->create([ 'user_id' => $user->id, 'author' => 'user', @@ -351,7 +351,7 @@ class SetupDevEnvironment extends Command ]); // 6. - $videohive = Folder::factory(Folder::class) + $videohive = Folder::factory() ->create([ 'user_id' => $user->id, 'author' => 'user', diff --git a/src/Domain/UploadRequest/Controllers/GetFolderTreeForUploadRequestController.php b/src/Domain/UploadRequest/Controllers/GetFolderTreeForUploadRequestController.php new file mode 100644 index 00000000..2adffb80 --- /dev/null +++ b/src/Domain/UploadRequest/Controllers/GetFolderTreeForUploadRequestController.php @@ -0,0 +1,35 @@ +status !== 'active') { + return response('Gone', 410); + } + + // Get folders + $folders = Folder::with('folders:id,parent_id,name') + ->whereParentId($uploadRequest->id) + ->whereUserId($uploadRequest->user_id) + ->sortable() + ->get(['id', 'parent_id', 'id', 'name']); + + return [ + [ + 'name' => 'Upload Request', // Todo: translate + 'location' => 'upload-request', + 'folders' => $folders, + 'isMovable' => true, + 'isOpen' => true, + ], + ]; + } +} \ No newline at end of file diff --git a/tests/App/Users/PersonalAccessTokenTest.php b/tests/App/Users/PersonalAccessTokenTest.php index 62f8f7fb..1a5ec7b9 100644 --- a/tests/App/Users/PersonalAccessTokenTest.php +++ b/tests/App/Users/PersonalAccessTokenTest.php @@ -88,7 +88,7 @@ class PersonalAccessTokenTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); diff --git a/tests/Domain/Admin/AdminTest.php b/tests/Domain/Admin/AdminTest.php index 270610b2..6e2b8324 100644 --- a/tests/Domain/Admin/AdminTest.php +++ b/tests/Domain/Admin/AdminTest.php @@ -294,7 +294,7 @@ class AdminTest extends TestCase Sanctum::actingAs($user); // Create folders - $folders = Folder::factory(Folder::class) + $folders = Folder::factory() ->count(2) ->create(['user_id' => $user->id]); diff --git a/tests/Domain/Browsing/BrowseTest.php b/tests/Domain/Browsing/BrowseTest.php index 66905f62..81b03890 100644 --- a/tests/Domain/Browsing/BrowseTest.php +++ b/tests/Domain/Browsing/BrowseTest.php @@ -23,14 +23,14 @@ class BrowseTest extends TestCase ->hasSettings() ->create(); - $folder_level_1 = Folder::factory(Folder::class) + $folder_level_1 = Folder::factory() ->create([ 'name' => 'level 1', 'author' => 'user', 'user_id' => $user->id, ]); - $folder_level_2 = Folder::factory(Folder::class) + $folder_level_2 = Folder::factory() ->create([ 'name' => 'level 2', 'parent_id' => $folder_level_1->id, @@ -38,7 +38,7 @@ class BrowseTest extends TestCase 'user_id' => $user->id, ]); - $folder_level_3 = Folder::factory(Folder::class) + $folder_level_3 = Folder::factory() ->create([ 'name' => 'level 3', 'parent_id' => $folder_level_2->id, @@ -46,7 +46,7 @@ class BrowseTest extends TestCase 'user_id' => $user->id, ]); - $folder_level_2_sibling = Folder::factory(Folder::class) + $folder_level_2_sibling = Folder::factory() ->create([ 'name' => 'level 2 Sibling', 'parent_id' => $folder_level_1->id, @@ -138,13 +138,13 @@ class BrowseTest extends TestCase ->hasSettings() ->create(); - $root = Folder::factory(Folder::class) + $root = Folder::factory() ->create([ 'name' => 'root', 'user_id' => $user->id, ]); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'parent_id' => $root->id, 'name' => 'Documents', @@ -187,7 +187,7 @@ class BrowseTest extends TestCase ->hasSettings() ->create(); - $root = Folder::factory(Folder::class) + $root = Folder::factory() ->create([ 'name' => 'root', 'user_id' => $user->id, @@ -240,7 +240,7 @@ class BrowseTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'parent_id' => null, 'name' => 'root', @@ -291,7 +291,7 @@ class BrowseTest extends TestCase Sanctum::actingAs($user); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); diff --git a/tests/Domain/Files/ContentAccessTest.php b/tests/Domain/Files/ContentAccessTest.php index 1a94844a..99d8d2c8 100644 --- a/tests/Domain/Files/ContentAccessTest.php +++ b/tests/Domain/Files/ContentAccessTest.php @@ -170,7 +170,7 @@ class ContentAccessTest extends TestCase */ public function guest_try_to_get_private_user_folder() { - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create(); $this->getJson("/api/browse/folders/$folder->id") diff --git a/tests/Domain/Files/FileTest.php b/tests/Domain/Files/FileTest.php index 675cd016..ca4a50d7 100644 --- a/tests/Domain/Files/FileTest.php +++ b/tests/Domain/Files/FileTest.php @@ -207,7 +207,7 @@ class FileTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); diff --git a/tests/Domain/Folders/FavouriteFolderTest.php b/tests/Domain/Folders/FavouriteFolderTest.php index 7f9d2ed2..1151f964 100644 --- a/tests/Domain/Folders/FavouriteFolderTest.php +++ b/tests/Domain/Folders/FavouriteFolderTest.php @@ -12,7 +12,7 @@ class FavouriteFolderTest extends TestCase */ public function it_add_folder_to_favourites() { - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create(); $user = User::factory() @@ -38,7 +38,7 @@ class FavouriteFolderTest extends TestCase */ public function it_remove_folder_from_favourites() { - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create(); $user = User::factory() diff --git a/tests/Domain/Folders/FolderTest.php b/tests/Domain/Folders/FolderTest.php index 2a8e9330..b58213fc 100644 --- a/tests/Domain/Folders/FolderTest.php +++ b/tests/Domain/Folders/FolderTest.php @@ -16,7 +16,7 @@ class FolderTest extends TestCase */ public function it_test_folder_factory() { - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create(); $this->assertDatabaseHas('folders', [ @@ -57,7 +57,7 @@ class FolderTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); @@ -87,7 +87,7 @@ class FolderTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); @@ -126,7 +126,7 @@ class FolderTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); @@ -160,12 +160,12 @@ class FolderTest extends TestCase ->hasSettings() ->create(); - $root = Folder::factory(Folder::class) + $root = Folder::factory() ->create([ 'user_id' => $user->id, ]); - $children = Folder::factory(Folder::class) + $children = Folder::factory() ->create([ 'user_id' => $user->id, ]); @@ -197,12 +197,12 @@ class FolderTest extends TestCase ->hasSettings() ->create(); - $folder_1 = Folder::factory(Folder::class) + $folder_1 = Folder::factory() ->create([ 'user_id' => $user->id, ]); - $folder_2 = Folder::factory(Folder::class) + $folder_2 = Folder::factory() ->create([ 'user_id' => $user->id, ]); @@ -248,12 +248,12 @@ class FolderTest extends TestCase ->hasSettings() ->create(); - $folder_1 = Folder::factory(Folder::class) + $folder_1 = Folder::factory() ->create([ 'user_id' => $user->id, ]); - $folder_2 = Folder::factory(Folder::class) + $folder_2 = Folder::factory() ->create([ 'user_id' => $user->id, ]); @@ -293,12 +293,12 @@ class FolderTest extends TestCase ->hasSettings() ->create(); - $folder_root = Folder::factory(Folder::class) + $folder_root = Folder::factory() ->create([ 'user_id' => $user->id, ]); - $folder_children = Folder::factory(Folder::class) + $folder_children = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $folder_root->id, @@ -354,12 +354,12 @@ class FolderTest extends TestCase Sanctum::actingAs($user); - $folder_root = Folder::factory(Folder::class) + $folder_root = Folder::factory() ->create([ 'user_id' => $user->id, ]); - $folder_children = Folder::factory(Folder::class) + $folder_children = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $folder_root->id, diff --git a/tests/Domain/Homepage/HomepageTest.php b/tests/Domain/Homepage/HomepageTest.php index 0eac15e9..a6687d84 100644 --- a/tests/Domain/Homepage/HomepageTest.php +++ b/tests/Domain/Homepage/HomepageTest.php @@ -54,7 +54,7 @@ class HomepageTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, 'name' => 'Folder Title', diff --git a/tests/Domain/Sharing/UserShareTest.php b/tests/Domain/Sharing/UserShareTest.php index fbf9c0e3..d5f95a19 100644 --- a/tests/Domain/Sharing/UserShareTest.php +++ b/tests/Domain/Sharing/UserShareTest.php @@ -69,7 +69,7 @@ class UserShareTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create(['user_id' => $user->id]); $this @@ -103,7 +103,7 @@ class UserShareTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create(['user_id' => $user->id]); $this @@ -143,7 +143,7 @@ class UserShareTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create(['user_id' => $user->id]); $this @@ -171,7 +171,7 @@ class UserShareTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create(['user_id' => $user->id]); $this @@ -199,7 +199,7 @@ class UserShareTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create(['user_id' => $user->id]); Sanctum::actingAs($user); @@ -230,7 +230,7 @@ class UserShareTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create(['user_id' => $user->id]); Sanctum::actingAs($user); diff --git a/tests/Domain/Sharing/VisitorBrowseTest.php b/tests/Domain/Sharing/VisitorBrowseTest.php index 1dda11bb..04db6df7 100644 --- a/tests/Domain/Sharing/VisitorBrowseTest.php +++ b/tests/Domain/Sharing/VisitorBrowseTest.php @@ -139,7 +139,7 @@ class VisitorBrowseTest extends TestCase ->hasSettings() ->create(); - $root = Folder::factory(Folder::class) + $root = Folder::factory() ->create([ 'name' => 'root', 'user_id' => $user->id, @@ -154,7 +154,7 @@ class VisitorBrowseTest extends TestCase 'permission' => 'editor', ]); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'parent_id' => $root->id, 'name' => 'Documents', @@ -217,7 +217,7 @@ class VisitorBrowseTest extends TestCase $user = User::factory() ->create(); - $folder_level_1 = Folder::factory(Folder::class) + $folder_level_1 = Folder::factory() ->create([ 'name' => 'level 1', 'author' => 'user', @@ -234,7 +234,7 @@ class VisitorBrowseTest extends TestCase 'password' => bcrypt('secret'), ]); - $folder_level_2 = Folder::factory(Folder::class) + $folder_level_2 = Folder::factory() ->create([ 'name' => 'level 2', 'parent_id' => $folder_level_1->id, @@ -242,7 +242,7 @@ class VisitorBrowseTest extends TestCase 'user_id' => $user->id, ]); - $folder_level_3 = Folder::factory(Folder::class) + $folder_level_3 = Folder::factory() ->create([ 'name' => 'level 3', 'parent_id' => $folder_level_2->id, @@ -250,7 +250,7 @@ class VisitorBrowseTest extends TestCase 'user_id' => $user->id, ]); - $folder_level_2_sibling = Folder::factory(Folder::class) + $folder_level_2_sibling = Folder::factory() ->create([ 'name' => 'level 2 Sibling', 'parent_id' => $folder_level_1->id, @@ -325,7 +325,7 @@ class VisitorBrowseTest extends TestCase // check private or public share record collect([true, false]) ->each(function ($is_protected) { - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create(); $share = Share::factory() @@ -379,7 +379,7 @@ class VisitorBrowseTest extends TestCase // check private or public share record collect([true, false]) ->each(function ($is_protected) { - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create(); $share = Share::factory() diff --git a/tests/Domain/Sharing/VisitorManipulatingTest.php b/tests/Domain/Sharing/VisitorManipulatingTest.php index 5a154389..49382753 100644 --- a/tests/Domain/Sharing/VisitorManipulatingTest.php +++ b/tests/Domain/Sharing/VisitorManipulatingTest.php @@ -23,7 +23,7 @@ class VisitorManipulatingTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); @@ -93,12 +93,12 @@ class VisitorManipulatingTest extends TestCase ->hasSettings() ->create(); - $root = Folder::factory(Folder::class) + $root = Folder::factory() ->create([ 'user_id' => $user->id, ]); - $children = Folder::factory(Folder::class) + $children = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $root->id, @@ -163,7 +163,7 @@ class VisitorManipulatingTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); @@ -227,7 +227,7 @@ class VisitorManipulatingTest extends TestCase $user = User::factory() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); @@ -303,7 +303,7 @@ class VisitorManipulatingTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, 'author' => 'user', @@ -374,12 +374,12 @@ class VisitorManipulatingTest extends TestCase $user = User::factory() ->create(); - $root = Folder::factory(Folder::class) + $root = Folder::factory() ->create([ 'user_id' => $user->id, ]); - $children = Folder::factory(Folder::class) + $children = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $root->id, @@ -447,18 +447,18 @@ class VisitorManipulatingTest extends TestCase $user = User::factory() ->create(); - $root = Folder::factory(Folder::class) + $root = Folder::factory() ->create([ 'user_id' => $user->id, ]); - $brother = Folder::factory(Folder::class) + $brother = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $root->id, ]); - $sister = Folder::factory(Folder::class) + $sister = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $root->id, diff --git a/tests/Domain/Spotlight/SearchTest.php b/tests/Domain/Spotlight/SearchTest.php index 183f4ef1..c636af64 100644 --- a/tests/Domain/Spotlight/SearchTest.php +++ b/tests/Domain/Spotlight/SearchTest.php @@ -58,7 +58,7 @@ class SearchTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'name' => 'Documents', 'user_id' => $user->id, diff --git a/tests/Domain/Teams/TeamFileAccessTest.php b/tests/Domain/Teams/TeamFileAccessTest.php index 1f563a64..a23e9d52 100644 --- a/tests/Domain/Teams/TeamFileAccessTest.php +++ b/tests/Domain/Teams/TeamFileAccessTest.php @@ -19,7 +19,7 @@ class TeamFileAccessTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); @@ -67,7 +67,7 @@ class TeamFileAccessTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); diff --git a/tests/Domain/Traffic/TrafficTest.php b/tests/Domain/Traffic/TrafficTest.php index d7bc58a3..cebcb9a0 100644 --- a/tests/Domain/Traffic/TrafficTest.php +++ b/tests/Domain/Traffic/TrafficTest.php @@ -100,7 +100,7 @@ class TrafficTest extends TestCase */ public function editor_upload_file_into_shared_folder() { - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $this->user->id, 'author' => 'user', diff --git a/tests/Domain/Trash/TrashTest.php b/tests/Domain/Trash/TrashTest.php index 067568fc..a691c5a3 100644 --- a/tests/Domain/Trash/TrashTest.php +++ b/tests/Domain/Trash/TrashTest.php @@ -25,7 +25,7 @@ class TrashTest extends TestCase 'deleted_at' => now(), ]; - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create($attributes); $file = File::factory() @@ -66,7 +66,7 @@ class TrashTest extends TestCase Sanctum::actingAs($user); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); diff --git a/tests/Domain/UploadRequest/UploadRequestBrowsingTest.php b/tests/Domain/UploadRequest/UploadRequestBrowsingTest.php new file mode 100644 index 00000000..c7756f7a --- /dev/null +++ b/tests/Domain/UploadRequest/UploadRequestBrowsingTest.php @@ -0,0 +1,80 @@ +hasSettings() + ->create(); + + $uploadRequest = UploadRequest::factory() + ->create([ + 'status' => 'active', + 'user_id' => $user->id, + ]); + + Folder::factory() + ->create([ + 'id' => $uploadRequest->id, + 'name' => 'Upload request', + 'user_id' => $user->id, + ]); + + $folder_level_1 = Folder::factory() + ->create([ + 'parent_id' => $uploadRequest->id, + 'name' => 'level 1', + 'user_id' => $user->id, + ]); + + $folder_level_2 = Folder::factory() + ->create([ + 'name' => 'level 2', + 'parent_id' => $folder_level_1->id, + 'user_id' => $user->id, + ]); + + $this + ->actingAs($user) + ->getJson("/api/upload-request/$uploadRequest->id/navigation") + ->assertStatus(200) + ->assertExactJson([ + [ + 'location' => 'upload-request', + 'name' => 'Upload Request', + 'folders' => [ + [ + 'id' => $folder_level_1->id, + 'parent_id' => $uploadRequest->id, + 'name' => 'level 1', + 'items' => 1, + 'trashed_items' => 1, + 'folders' => [ + [ + 'id' => $folder_level_2->id, + 'parent_id' => $folder_level_1->id, + 'name' => 'level 2', + 'items' => 0, + 'trashed_items' => 0, + 'folders' => [], + ], + ], + ], + ], + 'isMovable' => true, + 'isOpen' => true, + ], + ]); + } +} \ No newline at end of file diff --git a/tests/Domain/Zip/SharedZippingTest.php b/tests/Domain/Zip/SharedZippingTest.php index c4a315ee..72163acf 100644 --- a/tests/Domain/Zip/SharedZippingTest.php +++ b/tests/Domain/Zip/SharedZippingTest.php @@ -23,12 +23,12 @@ class SharedZippingTest extends TestCase $user = User::factory() ->create(); - $sharedFolder = Folder::factory(Folder::class) + $sharedFolder = Folder::factory() ->create([ 'user_id' => $user->id, ]); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $sharedFolder->id, @@ -115,7 +115,7 @@ class SharedZippingTest extends TestCase $user = User::factory() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); @@ -178,12 +178,12 @@ class SharedZippingTest extends TestCase $user = User::factory() ->create(); - $root = Folder::factory(Folder::class) + $root = Folder::factory() ->create([ 'user_id' => $user->id, ]); - $children = Folder::factory(Folder::class) + $children = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $root->id, @@ -246,7 +246,7 @@ class SharedZippingTest extends TestCase $user = User::factory() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); diff --git a/tests/Domain/Zip/UserZippingTest.php b/tests/Domain/Zip/UserZippingTest.php index 422cd60f..9f42014a 100644 --- a/tests/Domain/Zip/UserZippingTest.php +++ b/tests/Domain/Zip/UserZippingTest.php @@ -21,7 +21,7 @@ class UserZippingTest extends TestCase Sanctum::actingAs($user); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); @@ -76,7 +76,7 @@ class UserZippingTest extends TestCase Sanctum::actingAs($user); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); diff --git a/tests/Support/Gate/GateTest.php b/tests/Support/Gate/GateTest.php index 757df326..46ceacc4 100644 --- a/tests/Support/Gate/GateTest.php +++ b/tests/Support/Gate/GateTest.php @@ -19,7 +19,7 @@ class GateTest extends TestCase ->hasSettings() ->create(); - $folder = Folder::factory(Folder::class) + $folder = Folder::factory() ->create([ 'user_id' => $user->id, ]); @@ -52,12 +52,12 @@ class GateTest extends TestCase ->hasSettings() ->create(); - $root = Folder::factory(Folder::class) + $root = Folder::factory() ->create([ 'user_id' => $user->id, ]); - $children = Folder::factory(Folder::class) + $children = Folder::factory() ->create([ 'user_id' => $user->id, 'parent_id' => $root->id, @@ -123,20 +123,20 @@ class GateTest extends TestCase ->hasSettings() ->create(); - $teamFolder = Folder::factory(Folder::class) + $teamFolder = Folder::factory() ->create([ 'user_id' => $owner->id, 'team_folder' => 1, 'name' => 'Team Folder', ]); - $parent = Folder::factory(Folder::class) + $parent = Folder::factory() ->create([ 'user_id' => $owner->id, 'parent_id' => $teamFolder->id, ]); - $children = Folder::factory(Folder::class) + $children = Folder::factory() ->create([ 'user_id' => $owner->id, 'parent_id' => $parent->id, @@ -174,20 +174,20 @@ class GateTest extends TestCase $member = User::factory() ->create(); - $teamFolder = Folder::factory(Folder::class) + $teamFolder = Folder::factory() ->create([ 'user_id' => $owner->id, 'team_folder' => 1, 'name' => 'Team Folder', ]); - $parent = Folder::factory(Folder::class) + $parent = Folder::factory() ->create([ 'user_id' => $owner->id, 'parent_id' => $teamFolder->id, ]); - $children = Folder::factory(Folder::class) + $children = Folder::factory() ->create([ 'user_id' => $owner->id, 'parent_id' => $parent->id, @@ -229,7 +229,7 @@ class GateTest extends TestCase ->hasSettings() ->create(); - $teamFolder = Folder::factory(Folder::class) + $teamFolder = Folder::factory() ->create([ 'user_id' => $owner->id, 'team_folder' => 1,