From d55f5c3b41085d94df51ba18b076c08656702f38 Mon Sep 17 00:00:00 2001 From: Peter Papp Date: Wed, 21 Jul 2021 17:20:19 +0200 Subject: [PATCH] controller refactoring part 21 --- routes/share.php | 28 ++-- .../Controllers/UploadFileController.php | 7 +- ...=> VisitorGetSingleFileInfoController.php} | 2 +- ...r.php => VisitorUploadFilesController.php} | 10 +- .../Controllers/CreateFolderController.php | 17 +- .../Controllers/FavouriteController.php | 9 +- ....php => VisitorCreateFolderController.php} | 11 +- .../RenameFileOrFolderController.php | 10 +- .../VisitorDeleteFileOrFolderController.php | 59 +++++++ .../VisitorMoveFileOrFolderController.php | 64 ++++++++ .../VisitorRenameFileOrFolderController.php | 72 ++++++++ .../ManipulateShareItemsController.php | 155 ------------------ ...rAuthenticateProtectedShareController.php} | 2 +- src/Support/Demo/Actions/DemoService.php | 114 ------------- .../Demo/Actions/FakeCreateFolderAction.php | 32 ++++ .../Actions/FakeRenameFileOrFolderAction.php | 44 +++++ .../Demo/Actions/FakeUploadFileAction.php | 41 +++++ tests/TestCase.php | 2 +- 18 files changed, 360 insertions(+), 319 deletions(-) rename src/Domain/Files/Controllers/{VisitorGetSingleFileResourceController.php => VisitorGetSingleFileInfoController.php} (94%) rename src/Domain/Files/Controllers/{EditorUploadFilesController.php => VisitorUploadFilesController.php} (85%) rename src/Domain/Folders/Controllers/{EditorCreateFolderController.php => VisitorCreateFolderController.php} (83%) create mode 100644 src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php create mode 100644 src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php create mode 100644 src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php delete mode 100644 src/Domain/Sharing/Controllers/ManipulateShareItemsController.php rename src/Domain/Sharing/Controllers/{AuthenticateProtectedSharedItemController.php => VisitorAuthenticateProtectedShareController.php} (93%) delete mode 100644 src/Support/Demo/Actions/DemoService.php create mode 100644 src/Support/Demo/Actions/FakeCreateFolderAction.php create mode 100644 src/Support/Demo/Actions/FakeRenameFileOrFolderAction.php create mode 100644 src/Support/Demo/Actions/FakeUploadFileAction.php diff --git a/routes/share.php b/routes/share.php index 488026ee..c3e143e0 100644 --- a/routes/share.php +++ b/routes/share.php @@ -1,41 +1,43 @@ 'editor'], function () { - Route::post('/create-folder/{shared}', EditorCreateFolderController::class); - Route::post('/upload/{shared}', EditorUploadFilesController::class); + Route::post('/create-folder/{shared}', VisitorCreateFolderController::class); + Route::post('/upload/{shared}', VisitorUploadFilesController::class); - Route::patch('/rename/{id}/{shared}', [ManipulateShareItemsController::class, 'rename_item']); - Route::post('/remove/{shared}', [ManipulateShareItemsController::class, 'delete_item']); - Route::post('/move/{shared}', [ManipulateShareItemsController::class, 'move']); + Route::patch('/rename/{id}/{shared}', VisitorRenameFileOrFolderController::class); + Route::post('/remove/{shared}', VisitorDeleteFileOrFolderController::class); + Route::post('/move/{shared}', VisitorMoveFileOrFolderController::class); }); // Zip shared items Route::group(['prefix' => 'zip'], function () { - Route::post('/files/{shared}', EditorZipFilesController::class); Route::get('/folder/{id}/{shared}', EditorZipFolderController::class); + Route::post('/files/{shared}', EditorZipFilesController::class); }); // Browse share content Route::group(['prefix' => 'browse'], function () { - Route::post('/authenticate/{shared}', AuthenticateProtectedSharedItemController::class); + Route::post('/authenticate/{shared}', VisitorAuthenticateProtectedShareController::class); Route::get('/folders/{id}/{shared}', VisitorBrowseFolderContentController::class); Route::get('/navigation/{shared}', VisitorNavigationFolderTreeController::class); Route::get('/search/{shared}', VisitorSearchFilesAndFoldersController::class); - Route::get('/file/{shared}', VisitorGetSingleFileResourceController::class); + Route::get('/file/{shared}', VisitorGetSingleFileInfoController::class); Route::get('/share/{shared}', [ShareController::class, 'show']); }); diff --git a/src/Domain/Files/Controllers/UploadFileController.php b/src/Domain/Files/Controllers/UploadFileController.php index ac072b7a..e22a384d 100644 --- a/src/Domain/Files/Controllers/UploadFileController.php +++ b/src/Domain/Files/Controllers/UploadFileController.php @@ -5,6 +5,7 @@ use Domain\Files\Models\File; use App\Http\Controllers\Controller; use Domain\Files\Requests\UploadRequest; use Domain\Files\Actions\UploadFileAction; +use Support\Demo\Actions\FakeUploadFileAction; class UploadFileController extends Controller { @@ -14,9 +15,11 @@ class UploadFileController extends Controller public function __invoke( UploadRequest $request, UploadFileAction $uploadFiles, - ): File { + FakeUploadFileAction $fakeUploadFile, + ): File|array { + if (is_demo_account('howdy@hi5ve.digital')) { - return $this->demo->upload($request); + return ($fakeUploadFile)($request); } return ($uploadFiles)($request); diff --git a/src/Domain/Files/Controllers/VisitorGetSingleFileResourceController.php b/src/Domain/Files/Controllers/VisitorGetSingleFileInfoController.php similarity index 94% rename from src/Domain/Files/Controllers/VisitorGetSingleFileResourceController.php rename to src/Domain/Files/Controllers/VisitorGetSingleFileInfoController.php index f951b568..8a9fb487 100644 --- a/src/Domain/Files/Controllers/VisitorGetSingleFileResourceController.php +++ b/src/Domain/Files/Controllers/VisitorGetSingleFileInfoController.php @@ -10,7 +10,7 @@ use Domain\Files\Resources\FileResource; /** * Get shared file record */ -class VisitorGetSingleFileResourceController +class VisitorGetSingleFileInfoController { public function __construct( public HelperService $helper, diff --git a/src/Domain/Files/Controllers/EditorUploadFilesController.php b/src/Domain/Files/Controllers/VisitorUploadFilesController.php similarity index 85% rename from src/Domain/Files/Controllers/EditorUploadFilesController.php rename to src/Domain/Files/Controllers/VisitorUploadFilesController.php index d7aaabdb..63bb949a 100644 --- a/src/Domain/Files/Controllers/EditorUploadFilesController.php +++ b/src/Domain/Files/Controllers/VisitorUploadFilesController.php @@ -3,6 +3,7 @@ namespace Domain\Files\Controllers; use Illuminate\Http\Response; use Domain\Sharing\Models\Share; +use Support\Demo\Actions\FakeUploadFileAction; use Support\Services\HelperService; use App\Http\Controllers\Controller; use Support\Demo\Actions\DemoService; @@ -12,21 +13,20 @@ use Domain\Files\Actions\UploadFileAction; /** * guest user upload file into shared folder */ -class EditorUploadFilesController extends Controller +class VisitorUploadFilesController extends Controller { public function __construct( public HelperService $helper, - public DemoService $demo, - ) { - } + ) {} public function __invoke( + FakeUploadFileAction $fakeUploadFile, UploadFileAction $uploadFile, UploadRequest $request, Share $shared, ): Response | array { if (is_demo_account($shared->user->email)) { - return $this->demo->upload($request); + return ($fakeUploadFile)($request); } // Check ability to access protected share record diff --git a/src/Domain/Folders/Controllers/CreateFolderController.php b/src/Domain/Folders/Controllers/CreateFolderController.php index 8729717e..37de9d01 100644 --- a/src/Domain/Folders/Controllers/CreateFolderController.php +++ b/src/Domain/Folders/Controllers/CreateFolderController.php @@ -1,34 +1,31 @@ demo->create_folder($request); + if (is_demo_account(Auth::user()->email)) { + return ($fakeCreateFolder)($request); } $folder = ($createFolder)($request); - // Create new folder return response($folder, 201); } } diff --git a/src/Domain/Folders/Controllers/FavouriteController.php b/src/Domain/Folders/Controllers/FavouriteController.php index 5416774c..a863201b 100644 --- a/src/Domain/Folders/Controllers/FavouriteController.php +++ b/src/Domain/Folders/Controllers/FavouriteController.php @@ -5,14 +5,9 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use App\Http\Controllers\Controller; use Illuminate\Support\Facades\Auth; -use Support\Demo\Actions\DemoService; class FavouriteController extends Controller { - public function __construct( - public DemoService $demo, - ) { - } /** * Add folder to user favourites @@ -24,7 +19,7 @@ class FavouriteController extends Controller foreach ($request->input('folders') as $id) { if (is_demo_account($user->email)) { - return $this->demo->favourites($user); + return $user->favouriteFolders->makeHidden(['pivot']); } // Add folder to user favourites @@ -45,7 +40,7 @@ class FavouriteController extends Controller $user = Auth::user(); if (is_demo_account($user->email)) { - return $this->demo->favourites($user); + return $user->favouriteFolders->makeHidden(['pivot']); } // Remove folder from user favourites diff --git a/src/Domain/Folders/Controllers/EditorCreateFolderController.php b/src/Domain/Folders/Controllers/VisitorCreateFolderController.php similarity index 83% rename from src/Domain/Folders/Controllers/EditorCreateFolderController.php rename to src/Domain/Folders/Controllers/VisitorCreateFolderController.php index f2840585..28233a9c 100644 --- a/src/Domain/Folders/Controllers/EditorCreateFolderController.php +++ b/src/Domain/Folders/Controllers/VisitorCreateFolderController.php @@ -3,30 +3,29 @@ namespace Domain\Folders\Controllers; use Illuminate\Http\Response; use Domain\Sharing\Models\Share; +use Support\Demo\Actions\FakeCreateFolderAction; use Support\Services\HelperService; use App\Http\Controllers\Controller; -use Support\Demo\Actions\DemoService; use Domain\Folders\Actions\CreateFolderAction; use Domain\Folders\Requests\CreateFolderRequest; /** * Create new folder for guest user with edit permission */ -class EditorCreateFolderController extends Controller +class VisitorCreateFolderController extends Controller { public function __construct( public HelperService $helper, - public DemoService $demo, - ) { - } + ) {} public function __invoke( + FakeCreateFolderAction $fakeCreateFolderAction, CreateFolderAction $createFolder, CreateFolderRequest $request, Share $shared, ): Response | array { if (is_demo_account($shared->user->email)) { - return $this->demo->create_folder($request); + return ($fakeCreateFolderAction)($request); } // Check ability to access protected share record diff --git a/src/Domain/Items/Controllers/RenameFileOrFolderController.php b/src/Domain/Items/Controllers/RenameFileOrFolderController.php index cf9a5df4..a94f79bf 100644 --- a/src/Domain/Items/Controllers/RenameFileOrFolderController.php +++ b/src/Domain/Items/Controllers/RenameFileOrFolderController.php @@ -10,6 +10,7 @@ use Domain\Folders\Actions\UpdateFolderPropertyAction; use Domain\Items\Actions\RenameFileOrFolderAction; use Domain\Items\Requests\RenameItemRequest; use Illuminate\Database\Eloquent\Model; +use Support\Demo\Actions\FakeRenameFileOrFolderAction; class RenameFileOrFolderController extends Controller { @@ -20,11 +21,12 @@ class RenameFileOrFolderController extends Controller RenameItemRequest $request, string $id, RenameFileOrFolderAction $renameFileOrFolder, - UpdateFolderPropertyAction $updateFolderProperty - ): Model { + UpdateFolderPropertyAction $updateFolderProperty, + FakeRenameFileOrFolderAction $fakeRenameFileOrFolder, + ): Model|array { - if (is_demo_account(Auth::user()?->email)) { - return $this->demo->rename_item($request, $id); + if (is_demo_account(Auth::user()->email)) { + return ($fakeRenameFileOrFolder)($request, $id); } // If request contain icon or color, then change it diff --git a/src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php b/src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php new file mode 100644 index 00000000..4717a0be --- /dev/null +++ b/src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php @@ -0,0 +1,59 @@ +user->email), 204, 'Done.' + ); + + // Check ability to access protected share record + $this->helper->check_protected_share_record($shared); + + // Check shared permission + if (is_visitor($shared)) { + abort(403); + } + + foreach ($request->input('items') as $file) { + // Get file|folder item + $item = get_item($file['type'], $file['id']); + + // Check access to requested item + if ($file['type'] === 'folder') { + $this->helper->check_item_access($item->id, $shared); + } else { + $this->helper->check_item_access($item->folder_id, $shared); + } + + // Delete item + ($this->deleteFileOrFolder)($file, $file['id'], $shared); + } + + return response('Done', 204); + } +} \ No newline at end of file diff --git a/src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php b/src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php new file mode 100644 index 00000000..ee84fd7c --- /dev/null +++ b/src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php @@ -0,0 +1,64 @@ +user->email), 204, 'Done.' + ); + + // Check ability to access protected share record + $this->helper->check_protected_share_record($shared); + + // Check shared permission + if (is_visitor($shared)) { + abort(403); + } + + foreach ($request->input('items') as $item) { + if ($item['type'] === 'folder') { + $this->helper->check_item_access([ + $request->input('to_id'), $item['id'], + ], $shared); + } + + if ($item['type'] !== 'folder') { + $file = File::where('id', $item['id']) + ->where('user_id', $shared->user_id) + ->firstOrFail(); + + $this->helper->check_item_access([ + $request->input('to_id'), $file->folder_id, + ], $shared); + } + } + + ($this->moveFileOrFolder)($request, $request->to_id); + + return response('Done!', 204); + } +} \ No newline at end of file diff --git a/src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php b/src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php new file mode 100644 index 00000000..71b60db6 --- /dev/null +++ b/src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php @@ -0,0 +1,72 @@ +user->email)) { + return ($this->fakeRenameFileOrFolder)($request, $id); + } + + // Check ability to access protected share record + $this->helper->check_protected_share_record($shared); + + // Check shared permission + if (is_visitor($shared)) { + abort(403); + } + + // Get file|folder item + $item = get_item($request->input('type'), $id); + + // Check access to requested item + if ($request->input('type') === 'folder') { + $this->helper->check_item_access($item->id, $shared); + } else { + $this->helper->check_item_access($item->folder_id, $shared); + } + + // If request have a change folder icon values set the folder icon + if ($request->input('type') === 'folder' && $request->filled('icon')) { + ($this->updateFolderProperty)($request, $id); + } + + // Rename item + $item = ($this->renameFileOrFolder)($request, $id); + + // Set public url + if ($item->type !== 'folder') { + $item->setPublicUrl($shared->token); + } + + return response($item, 201); + } +} \ No newline at end of file diff --git a/src/Domain/Sharing/Controllers/ManipulateShareItemsController.php b/src/Domain/Sharing/Controllers/ManipulateShareItemsController.php deleted file mode 100644 index 15bc3872..00000000 --- a/src/Domain/Sharing/Controllers/ManipulateShareItemsController.php +++ /dev/null @@ -1,155 +0,0 @@ -user->email)) { - return $this->demo->rename_item($request, $id); - } - - // Check ability to access protected share record - $this->helper->check_protected_share_record($shared); - - // Check shared permission - if (is_visitor($shared)) { - abort(403); - } - - // Get file|folder item - $item = get_item($request->type, $id); - - // Check access to requested item - if ($request->type === 'folder') { - $this->helper->check_item_access($item->id, $shared); - } else { - $this->helper->check_item_access($item->folder_id, $shared); - } - - // If request have a change folder icon values set the folder icon - if ($request->type === 'folder' && $request->filled('icon')) { - $this->filemanager->edit_folder_properties($request, $id); - } - - // Rename item - $item = $this->filemanager->rename_item($request, $id, $shared); - - // Set public url - if ($item->type !== 'folder') { - $item->setPublicUrl($shared->token); - } - - return response($item, 201); - } - - /** - * Delete item for guest user with edit permission - * - * @param DeleteItemRequest $request - * @param Share $shared - * @return ResponseFactory|\Illuminate\Http\Response - * @throws \Exception - */ - public function delete_item(DeleteItemRequest $request, Share $shared) - { - abort_if(is_demo_account($shared->user->email), 204, 'Done.'); - - // Check ability to access protected share record - $this->helper->check_protected_share_record($shared); - - // Check shared permission - if (is_visitor($shared)) { - abort(403); - } - - foreach ($request->items as $file) { - // Get file|folder item - $item = get_item($file['type'], $file['id']); - - // Check access to requested item - if ($file['type'] === 'folder') { - $this->helper->check_item_access($item->id, $shared); - } else { - $this->helper->check_item_access($item->folder_id, $shared); - } - - // Delete item - $this->filemanager->delete_item($file, $file['id'], $shared); - } - - return response('Done', 204); - } - - /** - * Move item for guest user with edit permission - * - * @param MoveItemRequest $request - * @param Share $shared - * @return ResponseFactory|\Illuminate\Http\Response - */ - public function move(MoveItemRequest $request, Share $shared) - { - abort_if(is_demo_account($shared->user->email), 204, 'Done.'); - - // Check ability to access protected share record - $this->helper->check_protected_share_record($shared); - - // Check shared permission - if (is_visitor($shared)) { - abort(403); - } - - foreach ($request->items as $item) { - if ($item['type'] === 'folder') { - $this->helper->check_item_access([ - $request->to_id, $item['id'], - ], $shared); - } - - if ($item['type'] !== 'folder') { - $file = File::where('id', $item['id']) - ->where('user_id', $shared->user_id) - ->firstOrFail(); - - $this->helper->check_item_access([ - $request->to_id, $file->folder_id, - ], $shared); - } - } - - $this->filemanager->move($request, $request->to_id); - - return response('Done!', 204); - } -} diff --git a/src/Domain/Sharing/Controllers/AuthenticateProtectedSharedItemController.php b/src/Domain/Sharing/Controllers/VisitorAuthenticateProtectedShareController.php similarity index 93% rename from src/Domain/Sharing/Controllers/AuthenticateProtectedSharedItemController.php rename to src/Domain/Sharing/Controllers/VisitorAuthenticateProtectedShareController.php index 8306d47f..3b006b39 100644 --- a/src/Domain/Sharing/Controllers/AuthenticateProtectedSharedItemController.php +++ b/src/Domain/Sharing/Controllers/VisitorAuthenticateProtectedShareController.php @@ -9,7 +9,7 @@ use Illuminate\Support\Facades\Hash; use Domain\Sharing\Resources\ShareResource; use Domain\Sharing\Requests\AuthenticateShareRequest; -class AuthenticateProtectedSharedItemController extends Controller +class VisitorAuthenticateProtectedShareController extends Controller { /** * Check Password for protected item diff --git a/src/Support/Demo/Actions/DemoService.php b/src/Support/Demo/Actions/DemoService.php deleted file mode 100644 index 74b5f505..00000000 --- a/src/Support/Demo/Actions/DemoService.php +++ /dev/null @@ -1,114 +0,0 @@ - 1, - 'id' => Str::uuid(), - 'parent_id' => random_int(1000, 9999), - 'name' => $request->name, - 'type' => 'folder', - 'author' => $request->user() ? 'user' : 'visitor', - 'items' => '0', - 'color' => isset($request->icon['color']) ? $request->icon['color'] : null, - 'emoji' => isset($request->icon['emoji']) ? $request->icon['emoji'] : null, - 'updated_at' => now()->format('j M Y \a\t H:i'), - 'created_at' => now()->format('j M Y \a\t H:i'), - ]; - } - - /** - * Rename item name - * - * @param RenameItemRequest $request - * @param $id - * @return mixed - */ - public function rename_item($request, $id) - { - // Get item - if ($request->type === 'folder') { - $item = Folder::where('id', $id) - ->where('user_id', 1) - ->first(); - } else { - $item = File::where('id', $id) - ->where('user_id', 1) - ->first(); - } - - if ($item) { - $item->name = $request->name; - $item->emoji = $request->icon['emoji'] ?? null; - $item->color = $request->icon['color'] ?? null; - - return $item; - } - - return [ - 'id' => $request->id, - 'name' => $request->name, - 'type' => $request->type, - ]; - } - - /** - * Upload file - * - * @param $request - * @return array - * @throws \Exception - */ - public function upload($request) - { - // File - $file = $request->file('file'); - $filename = Str::random() . '-' . str_replace(' ', '', $file->getClientOriginalName()); - $thumbnail = null; - $filesize = $file->getSize(); - $filetype = get_file_type($file->getMimeType()); - - return [ - 'id' => Str::uuid(), - 'folder_id' => $request->parent_id, - 'thumbnail' => 'data:' . $request->file('file')->getMimeType() . ';base64, ' . base64_encode(file_get_contents($request->file('file'))), - 'name' => $file->getClientOriginalName(), - 'basename' => $filename, - 'mimetype' => $file->getClientOriginalExtension(), - 'filesize' => Metric::bytes($filesize)->format(), - 'type' => $filetype, - 'file_url' => 'https://vuefilemanager.hi5ve.digital/assets/vue-file-manager-preview.jpg', - 'author' => $request->user() ? 'user' : 'visitor', - 'created_at' => now()->format('j M Y \a\t H:i'), - 'updated_at' => now()->format('j M Y \a\t H:i'), - ]; - } - - /** - * Return 204 status - * - * @param $user - * @return ResponseFactory|\Illuminate\Http\Response - */ - public function favourites($user) - { - return $user->favouriteFolders->makeHidden(['pivot']); - } -} diff --git a/src/Support/Demo/Actions/FakeCreateFolderAction.php b/src/Support/Demo/Actions/FakeCreateFolderAction.php new file mode 100644 index 00000000..16bf30d1 --- /dev/null +++ b/src/Support/Demo/Actions/FakeCreateFolderAction.php @@ -0,0 +1,32 @@ + 1, + 'id' => Str::uuid(), + 'parent_id' => random_int(1000, 9999), + 'name' => $request->input('name'), + 'type' => 'folder', + 'author' => $request->user() ? 'user' : 'visitor', + 'items' => '0', + 'color' => $request->input('icon.color') ?? null, + 'emoji' => $request->input('icon.emoji') ?? null, + 'updated_at' => now()->format(__t('time')), + 'created_at' => now()->format(__t('time')), + ]; + } +} \ No newline at end of file diff --git a/src/Support/Demo/Actions/FakeRenameFileOrFolderAction.php b/src/Support/Demo/Actions/FakeRenameFileOrFolderAction.php new file mode 100644 index 00000000..38c5fd7d --- /dev/null +++ b/src/Support/Demo/Actions/FakeRenameFileOrFolderAction.php @@ -0,0 +1,44 @@ +input('type') === 'folder') { + $item = Folder::where('id', $id) + ->first(); + } else { + $item = File::where('id', $id) + ->first(); + } + + if ($item) { + $item->name = $request->input('name'); + $item->emoji = $request->input('icon.emoji') ?? null; + $item->color = $request->input('icon.color') ?? null; + + return $item; + } + + return [ + 'id' => $request->input('id'), + 'name' => $request->input('name'), + 'type' => $request->input('type'), + ]; + } +} \ No newline at end of file diff --git a/src/Support/Demo/Actions/FakeUploadFileAction.php b/src/Support/Demo/Actions/FakeUploadFileAction.php new file mode 100644 index 00000000..6f6c8640 --- /dev/null +++ b/src/Support/Demo/Actions/FakeUploadFileAction.php @@ -0,0 +1,41 @@ +file('file'); + $filename = Str::random() . '-' . str_replace(' ', '', $file->getClientOriginalName()); + $thumbnail = 'data:' . $request->file('file')->getMimeType() . ';base64, ' . base64_encode(file_get_contents($request->file('file'))); + + $fileType = get_file_type($file->getMimeType()); + $fileSize = Metric::bytes($file->getSize())->format(); + + return [ + 'id' => Str::uuid(), + 'folder_id' => $request->input('parent_id'), + 'thumbnail' => $thumbnail, + 'name' => $file->getClientOriginalName(), + 'basename' => $filename, + 'mimetype' => $file->getClientOriginalExtension(), + 'file_url' => 'https://vuefilemanager.hi5ve.digital/assets/vue-file-manager-preview.jpg', + 'author' => $request->user() ? 'user' : 'visitor', + 'created_at' => now()->format(__t('time')), + 'updated_at' => now()->format(__t('time')), + 'type' => $fileType, + 'filesize' => $fileSize, + ]; + } +} \ No newline at end of file diff --git a/tests/TestCase.php b/tests/TestCase.php index 320848c9..5b75c457 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -25,6 +25,6 @@ abstract class TestCase extends BaseTestCase resolve(SetupService::class)->create_directories(); - $this->withoutExceptionHandling(); + //$this->withoutExceptionHandling(); } }