Merge branch 'master' into api

# Conflicts:
#	.env.testing
#	public/mix-manifest.json
#	src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php
This commit is contained in:
Čarodej
2022-05-11 09:00:42 +02:00
83 changed files with 803 additions and 472 deletions

View File

@@ -2,6 +2,8 @@
namespace Domain\UploadRequest\Controllers;
use DB;
use Storage;
use Illuminate\Support\Str;
use Domain\Folders\Models\Folder;
use Domain\Files\Resources\FileResource;
use Domain\Files\Actions\ProcessFileAction;
@@ -40,8 +42,14 @@ class UploadFilesForUploadRequestController
// Proceed after last chunk
if ($request->boolean('is_last')) {
// Get file name
$name = Str::uuid() . '.' . $request->input('extension');
// Move file to user directory
Storage::disk('local')->move($chunkPath, "files/{$uploadRequest->user->id}/$name");
// Process file
$file = ($this->processFie)($request, $uploadRequest->user, $chunkPath);
$file = ($this->processFie)($request, $uploadRequest->user, $name);
// Set public access url
$file->setUploadRequestPublicUrl($uploadRequest->id);