refactor user in upload controllers

This commit is contained in:
Čarodej
2022-04-21 16:57:38 +02:00
parent 8be0ae2a62
commit 409ab8c03f
7 changed files with 19 additions and 13 deletions

View File

@@ -1,9 +1,9 @@
<?php
namespace Domain\Files\Actions;
use App\Users\Models\User;
use Illuminate\Support\Str;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\Storage;
use Domain\Files\Requests\UploadRequest;
use Domain\Traffic\Actions\RecordUploadAction;
@@ -25,7 +25,7 @@ class ProcessFileAction
*/
public function __invoke(
UploadRequest $request,
?string $userId,
User $user,
string $chunkPath,
) {
// Get local disk instance
@@ -44,11 +44,6 @@ class ProcessFileAction
abort(413);
}
// Get user
$user = $request->filled('parent_id')
? Folder::find($request->input('parent_id'))->getLatestParent()->user
: auth()->user();
// Check if user has enough space to upload file
if (! $user->canUpload($size)) {
// Delete file from chunk directory
@@ -86,7 +81,7 @@ class ProcessFileAction
'basename' => $name,
'filesize' => $size,
'user_id' => $user->id,
'creator_id' => auth()->id(),
'creator_id' => auth()->check() ? auth()->id() : $user->id,
]);
// Store file exif data