Merge remote-tracking branch 'origin/remote-upload-merge'

# Conflicts:
#	public/mix-manifest.json

src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php

@@ -4,15 +4,16 @@ namespace Domain\UploadRequest\Controllers;
 use DB;
 use Domain\Folders\Models\Folder;
 use Domain\Files\Resources\FileResource;
-use Domain\Files\Actions\UploadFileAction;
+use Domain\Files\Actions\ProcessFileAction;
 use Domain\UploadRequest\Models\UploadRequest;
-use App\Users\Exceptions\InvalidUserActionException;
+use Domain\Files\Actions\StoreFileChunksAction;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 
 class UploadFilesForUploadRequestController
 {
     public function __construct(
-        private UploadFileAction $uploadFile,
+        private ProcessFileAction $processFie,
+        private StoreFileChunksAction $storeFileChunks,
     ) {
     }
 
@@ -29,14 +30,18 @@ class UploadFilesForUploadRequestController
             $this->createFolder($uploadRequest);
         }
 
-        try {
-            // Set default parent_id for uploaded file
-            if (is_null($request->input('parent_id'))) {
-                $request->merge(['parent_id' => $uploadRequest->id]);
-            }
+        // Set default parent_id for uploaded file
+        if (is_null($request->input('parent_id'))) {
+            $request->merge(['parent_id' => $uploadRequest->id]);
+        }
 
-            // Upload file
-            $file = ($this->uploadFile)($request, $uploadRequest->user_id);
+        // Store file chunks
+        $chunkPath = ($this->storeFileChunks)($request);
+
+        // Proceed after last chunk
+        if ($request->boolean('is_last')) {
+            // Process file
+            $file = ($this->processFie)($request, $uploadRequest->user, $chunkPath);
 
             // Set public access url
             $file->setUploadRequestPublicUrl($uploadRequest->id);
@@ -44,13 +49,7 @@ class UploadFilesForUploadRequestController
             // Set timestamp for auto filling
             cache()->set("auto-filling.$uploadRequest->id", now()->toString());
 
-            // Return new uploaded file
             return response(new FileResource($file), 201);
-        } catch (InvalidUserActionException $e) {
-            return response([
-                'type'    => 'error',
-                'message' => $e->getMessage(),
-            ], 401);
         }
     }
 

src/Domain/UploadRequest/Controllers/UploadFilesRemotelyForUploadRequestController.php

@@ -0,0 +1,68 @@
+<?php
+namespace Domain\UploadRequest\Controllers;
+
+use DB;
+use Domain\Folders\Models\Folder;
+use Domain\Files\Requests\RemoteUploadRequest;
+use Domain\UploadRequest\Models\UploadRequest;
+use Domain\Files\Actions\GetContentFromExternalSource;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
+
+class UploadFilesRemotelyForUploadRequestController
+{
+    public function __construct(
+        private GetContentFromExternalSource $getContentFromExternalSource,
+    ) {
+    }
+
+    /**
+     * @throws FileNotFoundException
+     */
+    public function __invoke(RemoteUploadRequest $request, UploadRequest $uploadRequest)
+    {
+        // Get upload request root folder query
+        $folder = Folder::where('id', $uploadRequest->id);
+
+        // Create folder if not exist
+        if ($folder->doesntExist()) {
+            $this->createFolder($uploadRequest);
+        }
+
+        // Set default parent_id for uploaded file
+        if (is_null($request->input('parent_id'))) {
+            $request->merge(['parent_id' => $uploadRequest->id]);
+        }
+
+        // Execute job for get content from url and save
+        ($this->getContentFromExternalSource)($request->all(), $uploadRequest->user);
+
+        // Set timestamp for auto filling
+        cache()->set("auto-filling.$uploadRequest->id", now()->toString());
+
+        return response('Files were successfully added to the upload queue', 201);
+    }
+
+    /**
+     * Create root Upload Request folder
+     */
+    private function createFolder(UploadRequest $uploadRequest): void
+    {
+        // Format timestamp
+        $timestamp = format_date($uploadRequest->created_at, 'd. M. Y');
+
+        // Create folder
+        DB::table('folders')->insert([
+            'id'         => $uploadRequest->id,
+            'parent_id'  => $uploadRequest->folder_id ?? null,
+            'user_id'    => $uploadRequest->user_id,
+            'name'       => $uploadRequest->name ?? __t('upload_request_default_folder', ['timestamp' => $timestamp]),
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]);
+
+        // Update upload request status
+        $uploadRequest->update([
+            'status' => 'filling',
+        ]);
+    }
+}