nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-24 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

controller refactoring part 2

Browse Source
This commit is contained in:
Peter Papp
2021-07-20 09:50:23 +02:00
parent d6db2f3a7c
commit 20a6404d8d
19 changed files with 256 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Domain/Browsing/Controllers/BrowseLatestFilesController.php
+1 -1
View File
@@ -10,7 +10,7 @@ class BrowseLatestFilesController
public function __invoke(): Collection
{
$user = User::with([
'latestUploads' => fn ($query) => $query->sortable(['created_at' => 'desc'])
'latestUploads' => fn ($query) => $query->sortable(['created_at' => 'desc']),
])
->where('id', Auth::id())
->first();
src/Domain/Folders/Controllers/FavouriteController.php
+11 -20
View File
@@ -2,15 +2,13 @@
namespace Domain\Folders\Controllers;
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
{
/**
* FavouriteController constructor.
*/
public function __construct(
public DemoService $demo,
) {
@@ -18,19 +16,14 @@ class FavouriteController extends Controller
/**
* Add folder to user favourites
*
* @param Request $request
* @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
* todo: pridat validator ako AddToFavouritesRequest
*/
public function store(Request $request)
public function store(Request $request): Response
{
// todo: pridat validator ako AddToFavouritesRequest
$user = Auth::user();
foreach ($request->folders as $id) {
// Get user & folder
$user = Auth::user();
if (is_demo($user->id)) {
foreach ($request->input('folders') as $id) {
if (is_demo_account($user->email)) {
return $this->demo->favourites($user);
}
@@ -46,21 +39,19 @@ class FavouriteController extends Controller
/**
* Remove folder from user favourites
*
* @param $id
* @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
*/
public function destroy($id)
public function destroy(string $id): Response
{
// Get user
$user = Auth::user();
if (is_demo($user->id)) {
if (is_demo_account($user->email)) {
return $this->demo->favourites($user);
}
// Remove folder from user favourites
$user->favouriteFolders()->detach($id);
$user
->favouriteFolders()
->detach($id);
// Return updated favourites
return response($user->favouriteFolders, 204);
src/Domain/Sharing/Actions/SendLinkToEmailAction.php
+20
View File
@@ -0,0 +1,20 @@
<?php
namespace Domain\Sharing\Actions;
use Illuminate\Support\Facades\Notification;
use Domain\Sharing\Notifications\SharedSendViaEmail;
class SendLinkToEmailAction
{
public function __invoke(
array $emails,
string $token,
): void {
foreach ($emails as $email) {
Notification::route('mail', $email)
->notify(
new SharedSendViaEmail($token)
);
}
}
}
src/Domain/Sharing/Controllers/ShareController.php
+40 -79
View File
@@ -1,61 +1,54 @@
<?php
namespace Domain\Sharing\Controllers;
use Validator;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Domain\Zipping\Models\Zip;
use Domain\Sharing\Models\Share;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Domain\Sharing\Resources\ShareResource;
use Illuminate\Support\Facades\Notification;
use Domain\Sharing\Requests\CreateShareRequest;
use Domain\Sharing\Requests\UpdateShareRequest;
use Illuminate\Contracts\Routing\ResponseFactory;
use Domain\Sharing\Notifications\SharedSendViaEmail;
use Domain\Sharing\Actions\SendLinkToEmailAction;
class ShareController extends Controller
{
/**
* Get shared record
*
* @param Share $shared
* @return ShareResource
*/
public function show(Share $shared)
{
return new ShareResource(
$shared
);
public function show(
Share $shared,
): ShareResource {
return new ShareResource($shared);
}
/**
* Generate file share link
*
* @param CreateShareRequest $request
* @param $id
* @return ShareResource
*/
public function store(CreateShareRequest $request, $id)
{
// Create shared options
public function store(
CreateShareRequest $request,
SendLinkToEmailAction $sendLinkToEmailAction,
): ShareResource {
$shared = Share::create([
'password' => $request->has('password') ? bcrypt($request->password) : null,
'type' => $request->type === 'folder' ? 'folder' : 'file',
'is_protected' => $request->isPassword,
'permission' => $request->permission ?? null,
'item_id' => $id,
'expire_in' => $request->expiration ?? null,
'password' => $request->has('password')
? bcrypt($request->input('password'))
: null,
'type' => $request->input('type') === 'folder' ? 'folder' : 'file',
'is_protected' => $request->input('isPassword'),
'permission' => $request->input('permission') ?? null,
'expire_in' => $request->input('expiration') ?? null,
'item_id' => $request->input('id'),
'user_id' => Auth::id(),
]);
// Send shared link via email
if ($request->has('emails')) {
foreach ($request->emails as $email) {
Notification::route('mail', $email)->notify(
new SharedSendViaEmail($shared->token)
);
}
($sendLinkToEmailAction)(
$request->input('emails'),
$shared->token
);
}
// Return created shared record
@@ -64,24 +57,24 @@ class ShareController extends Controller
/**
* Update sharing
*
* @param UpdateShareRequest $request
* @param $token
* @return ShareResource
*/
public function update(UpdateShareRequest $request, $token)
{
public function update(
UpdateShareRequest $request,
string $id,
): ShareResource {
// Get sharing record
$shared = Share::where('token', $token)
$shared = Share::where('id', $id)
->where('user_id', Auth::id())
->firstOrFail();
// Update sharing record
$shared->update([
'permission' => $request->permission,
'is_protected' => $request->protected,
'expire_in' => $request->expiration,
'password' => $request->password ? bcrypt($request->password) : $shared->password,
'permission' => $request->input('permission'),
'is_protected' => $request->input('protected'),
'expire_in' => $request->input('expiration'),
'password' => $request->input('password')
? bcrypt($request->input('password'))
: $shared->password,
]);
// Return shared record
@@ -90,20 +83,18 @@ class ShareController extends Controller
/**
* Delete sharing item
*
* @param Request $request
* @return ResponseFactory|\Illuminate\Http\Response
*/
public function destroy(Request $request)
{
foreach ($request->tokens as $token) {
// Get sharing record
public function destroy(
Request $request,
): Response {
foreach ($request->input('tokens') as $token) {
// Delete share record
Share::where('token', $token)
->where('user_id', Auth::id())
->firstOrFail()
->delete();
// Get zip record
// Get zip record if exist
$zip = Zip::where('shared_token', $token)
->where('user_id', Auth::id())
->first();
@@ -115,34 +106,4 @@ class ShareController extends Controller
return response('Done!', 204);
}
/**
* Send shared link via email to recipients
*
* @param $token
* @param $request
*/
public function send_to_emails_recipients(Request $request, $token)
{
// TODO: pridat validation request
// Make validation of array of emails
$validator = Validator::make($request->all(), [
'emails.*' => 'required|email',
]);
// Return error
if ($validator->fails()) {
abort(400, 'Bad email input');
}
// Send shared link via email
if ($request->has('emails')) {
foreach ($request->emails as $email) {
Notification::route('mail', $email)
->notify(new SharedSendViaEmail($token));
}
}
return response('Done!', 204);
}
}
src/Domain/Sharing/Controllers/ShareViaEmailController.php
+23
View File
@@ -0,0 +1,23 @@
<?php
namespace Domain\Sharing\Controllers;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Domain\Sharing\Actions\SendLinkToEmailAction;
class ShareViaEmailController extends Controller
{
public function __invoke(
SendLinkToEmailAction $sendLinkToEmailAction,
Request $request,
string $token,
): Response {
($sendLinkToEmailAction)(
$request->input('emails'),
$token
);
return response('Done!', 204);
}
}
src/Domain/Sharing/Models/Share.php
+1
View File
@@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* @method static whereNotNull(string $string)
* @method static where(string $string, string $token)
*/
class Share extends Model
{
src/Domain/Trash/Controllers/DumpTrashController.php
+48
View File
@@ -0,0 +1,48 @@
<?php
namespace Domain\Trash\Controllers;
use Domain\Files\Models\File;
use Illuminate\Http\Response;
use Domain\Folders\Models\Folder;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Storage;
class DumpTrashController extends Controller
{
public function __invoke(): Response
{
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done!');
$user_id = Auth::id();
// Get files and folders
$folders = Folder::onlyTrashed()
->where('user_id', $user_id)
->get();
$files = File::onlyTrashed()
->where('user_id', $user_id)
->get();
// Force delete folder
$folders->each->forceDelete();
// Force delete files
foreach ($files as $file) {
// Delete file
Storage::delete("/files/$user_id/{$file->basename}");
// Delete thumbnail if exist
if ($file->thumbnail) {
Storage::delete("/files/$user_id/{$file->getRawOriginal('thumbnail')}");
}
// Delete file permanently
$file->forceDelete();
}
// Return response
return response('Done!', 204);
}
}
src/Domain/Trash/Controllers/TrashController.php → src/Domain/Trash/Controllers/RestoreTrashContentController.php
+6 -59
View File
@@ -3,33 +3,19 @@ namespace Domain\Trash\Controllers;
use Illuminate\Http\Request;
use Domain\Files\Models\File;
use Illuminate\Http\Response;
use Domain\Folders\Models\Folder;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Support\Demo\Actions\DemoService;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Validator;
use Illuminate\Contracts\Routing\ResponseFactory;
class TrashController extends Controller
class RestoreTrashContentController extends Controller
{
/**
* TrashController constructor.
*/
public function __construct(
public DemoService $demo,
) {
}
public function __invoke(
Request $request
): Response {
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
/**
* Restore item from trash
*
* @param Request $request
* @return ResponseFactory|\Illuminate\Http\Response
*/
public function restore(Request $request)
{
// Validate request
// TODO: zrefaktorovat validator do requestu
$validator = Validator::make($request->input('items'), [
'*.type' => 'required|string',
@@ -44,8 +30,6 @@ class TrashController extends Controller
// Get user id
$user_id = Auth::id();
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
foreach ($request->input('items') as $restore) {
// Get folder
if ($restore['type'] === 'folder') {
@@ -81,41 +65,4 @@ class TrashController extends Controller
// Return response
return response('Done!', 204);
}
/**
* Empty user trash
*
* @return ResponseFactory|\Illuminate\Http\Response
*/
public function dump()
{
// Get user id
$user_id = Auth::id();
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
// Get files and folders
$folders = Folder::onlyTrashed()->where('user_id', $user_id)->get();
$files = File::onlyTrashed()->where('user_id', $user_id)->get();
// Force delete folder
$folders->each->forceDelete();
// Force delete files
foreach ($files as $file) {
// Delete file
Storage::delete("/files/$user_id/{$file->basename}");
// Delete thumbnail if exist
if ($file->thumbnail) {
Storage::delete("/files/$user_id/{$file->getRawOriginal('thumbnail')}");
}
// Delete file permanently
$file->forceDelete();
}
// Return response
return response('Done!', 204);
}
}
src/Domain/Zipping/Models/Zip.php
+3
View File
@@ -8,6 +8,9 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* @method static where(string $string, mixed $token)
*/
class Zip extends Model
{
use HasFactory;