From 2e61cee49c2a747fa77ea2ad9504d73fdfeb88c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Tue, 3 May 2022 08:10:50 +0200
Subject: [PATCH] remote upload api update 2

---
 .../RemoteUploadFileController.php            |  4 +--
 ...ilesRemotelyForUploadRequestController.php | 34 ++++++++++++-------
 .../VisitorRemoteUploadFileController.php     | 29 +++++++++++-----
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php b/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php
index 678ae13a..711d5613 100644
--- a/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php
+++ b/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php
@@ -37,7 +37,7 @@ class RemoteUploadFileController extends Controller
         if (isNotBroadcasting()) {
             ($this->getContentFromExternalSource)($request->all(), $user);
 
-            return response()->json($successMessage);
+            return response()->json($successMessage, 201);
         }
 
         // Add links to the upload queue
@@ -48,6 +48,6 @@ class RemoteUploadFileController extends Controller
         return response()->json([
             'type'    => 'success',
             'message' => 'Files were successfully added to the upload queue.',
-        ]);
+        ], 201);
     }
 }
diff --git a/src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php b/src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php
index b585cc10..4e5037cc 100644
--- a/src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php
+++ b/src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php
@@ -15,11 +15,13 @@ class UploadFilesRemotelyForUploadRequestController
     ) {
     }
 
-    /**
-     * @throws FileNotFoundException
-     */
     public function __invoke(RemoteUploadRequest $request, UploadRequest $uploadRequest)
     {
+        $successMessage = [
+            'type'    => 'success',
+            'message' => 'Files was successfully uploaded.',
+        ];
+
         // Get upload request root folder query
         $folder = Folder::where('id', $uploadRequest->id);
 
@@ -33,19 +35,25 @@ class UploadFilesRemotelyForUploadRequestController
             $request->merge(['parent_id' => $uploadRequest->id]);
         }
 
-        // Get content from external sources
-        if (isBroadcasting()) {
-            ($this->getContentFromExternalSource)
-                ->onQueue()
-                ->execute($request->all(), $uploadRequest->user);
-        } else {
-            ($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);
+        // If it isn't broadcasting, download files immediately in the request
+        if (isNotBroadcasting()) {
+            ($this->getContentFromExternalSource)($request->all(), $uploadRequest->user);
+
+            return response()->json($successMessage, 201);
+        }
+
+        // Add links to the upload queue
+        ($this->getContentFromExternalSource)
+            ->onQueue()
+            ->execute($request->all(), $uploadRequest->user);
+
+        return response()->json([
+            'type'    => 'success',
+            'message' => 'Files were successfully added to the upload queue.',
+        ], 201);
     }
 
     /**
diff --git a/src/Domain/RemoteUpload/Controllers/VisitorRemoteUploadFileController.php b/src/Domain/RemoteUpload/Controllers/VisitorRemoteUploadFileController.php
index 6db75769..bb113e04 100644
--- a/src/Domain/RemoteUpload/Controllers/VisitorRemoteUploadFileController.php
+++ b/src/Domain/RemoteUpload/Controllers/VisitorRemoteUploadFileController.php
@@ -1,7 +1,7 @@
 <?php
 namespace Domain\RemoteUpload\Controllers;
 
-use Illuminate\Http\Response;
+use Illuminate\Http\JsonResponse;
 use Domain\Sharing\Models\Share;
 use App\Http\Controllers\Controller;
 use Domain\RemoteUpload\Requests\RemoteUploadRequest;
@@ -18,8 +18,13 @@ class VisitorRemoteUploadFileController extends Controller
     ) {
     }
 
-    public function __invoke(RemoteUploadRequest $request, ?Share $shared = null): Response|array
+    public function __invoke(RemoteUploadRequest $request, ?Share $shared = null): JsonResponse
     {
+        $successMessage = [
+            'type'    => 'success',
+            'message' => 'Files was successfully uploaded.',
+        ];
+
         // Check ability to access protected share record
         ($this->protectShareRecord)($shared);
 
@@ -31,15 +36,21 @@ class VisitorRemoteUploadFileController extends Controller
         // Check access to requested directory
         ($this->verifyAccessToItem)($request->input('parent_id'), $shared);
 
-        // Get content from external sources
-        if (isBroadcasting()) {
-            ($this->getContentFromExternalSource)
-                ->onQueue()
-                ->execute($request->all(), $shared->user);
-        } else {
+        // If it isn't broadcasting, download files immediately in the request
+        if (isNotBroadcasting()) {
             ($this->getContentFromExternalSource)($request->all(), $shared->user);
+
+            return response()->json($successMessage, 201);
         }
 
-        return response('Files were successfully added to the upload queue', 201);
+        // Add links to the upload queue
+        ($this->getContentFromExternalSource)
+            ->onQueue()
+            ->execute($request->all(), $shared->user);
+
+        return response()->json([
+            'type'    => 'success',
+            'message' => 'Files were successfully added to the upload queue.',
+        ], 201);
     }
 }